tripleo

docker-puppet.py breaks per-node uuid hieradata

Bug #1761624 reported by Steve Baker
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
tripleo
Fix Released
High
David Peacock
tripleo stein-1

Bug Description

The file /etc/puppet/hieradata/docker.json is included by setting the fact 'uuid' to docker. This breaks the per-node customization mechanism which we support:

https://docs.openstack.org/tripleo-docs/latest/install/advanced_deployment/node_specific_hieradata.html

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to tripleo-heat-templates (master)

Fix proposed to branch: master
Review: https://review.openstack.org/559182

Changed in tripleo:
status: Triaged → In Progress
Alex Schultz (alex-schultz)
Changed in tripleo:
milestone: rocky-1 → rocky-2
Emilien Macchi (emilienm)
Changed in tripleo:
milestone: rocky-2 → rocky-3
Emilien Macchi (emilienm)
Changed in tripleo:
milestone: rocky-3 → rocky-rc1
Alex Schultz (alex-schultz)
Changed in tripleo:
milestone: rocky-rc1 → stein-1
Revision history for this message
David Peacock (davidjpeacock) wrote :

@sbaker: I was looking into this bug which led me to https://review.openstack.org/#/c/559182/ - looks like it stalled a while ago and CI logs have expired. I kicked off a recheck - is there anything I can do with it or is it irrelevant now?

OpenStack Infra (hudson-openstack)
Changed in tripleo:
assignee: Steve Baker (steve-stevebaker) → David Peacock (davidjpeacock)
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix proposed to puppet-tripleo (master)

Related fix proposed to branch: master
Review: https://review.openstack.org/605478

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix merged to puppet-tripleo (master)

Reviewed: https://review.openstack.org/605478
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=2c7e877e581153ddc17dfd976b0779b3ccebf315
Submitter: Zuul
Branch: master

commit 2c7e877e581153ddc17dfd976b0779b3ccebf315
Author: David J Peacock <email address hidden>
Date: Wed Sep 26 12:24:34 2018 -0400

    adding deployment_type fact in support

    We have added a deployment_type fact to indicate when puppet is being
    executed within a container.

    Change-Id: I5270778a7c4da2c383cf98c746b77c9b210e9ba0
    Related-Bug: #1761624
    Needed-By: https://review.openstack.org/#/c/559182/

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to tripleo-heat-templates (master)

Reviewed: https://review.openstack.org/559182
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=6bbc3b51dfa6c9ea744dbb7b6212db7c56e8d827
Submitter: Zuul
Branch: master

commit 6bbc3b51dfa6c9ea744dbb7b6212db7c56e8d827
Author: Steve Baker <email address hidden>
Date: Fri Apr 6 11:05:33 2018 +1200

    docker-puppet.py: used dedicated hiera entry, not uuid

    Currently it is not possible to do per-node customization inside
    docker-puppet.py because it overrides the fact 'uuid'.

    This change adds a dedicated docker_puppet entry in hiera.yaml so that
    docker-puppet.py needs to do nothing special for
    /etc/puppet/hieradata/docker_puppet.json to be included in the hiera
    merge.

    Change-Id: Icf37dcd63e0152ee15e9f0079b45e31a4f8d9fbb
    Depends-On: https://review.openstack.org/#/c/605478/
    Closes-Bug: #1761624

Changed in tripleo:
status: In Progress → Fix Released
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix proposed to puppet-tripleo (stable/rocky)

Related fix proposed to branch: stable/rocky
Review: https://review.openstack.org/607631

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix proposed to puppet-tripleo (stable/queens)

Related fix proposed to branch: stable/queens
Review: https://review.openstack.org/607635

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to tripleo-heat-templates (stable/rocky)

Fix proposed to branch: stable/rocky
Review: https://review.openstack.org/607639

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to tripleo-heat-templates (stable/queens)

Fix proposed to branch: stable/queens
Review: https://review.openstack.org/607647

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix merged to puppet-tripleo (stable/rocky)

Reviewed: https://review.openstack.org/607631
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=501f10c48508f7e178a78617ca4be4b47a9f52fb
Submitter: Zuul
Branch: stable/rocky

commit 501f10c48508f7e178a78617ca4be4b47a9f52fb
Author: David J Peacock <email address hidden>
Date: Wed Sep 26 12:24:34 2018 -0400

    adding deployment_type fact in support

    We have added a deployment_type fact to indicate when puppet is being
    executed within a container.

    Change-Id: I5270778a7c4da2c383cf98c746b77c9b210e9ba0
    Related-Bug: #1761624
    (cherry picked from commit 2c7e877e581153ddc17dfd976b0779b3ccebf315)

tags: added: in-stable-rocky
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix merged to puppet-tripleo (stable/queens)

Reviewed: https://review.openstack.org/607635
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=9f0aa72d94ea429f24b8824ac052971dad5fc5af
Submitter: Zuul
Branch: stable/queens

commit 9f0aa72d94ea429f24b8824ac052971dad5fc5af
Author: David J Peacock <email address hidden>
Date: Wed Sep 26 12:24:34 2018 -0400

    adding deployment_type fact in support

    We have added a deployment_type fact to indicate when puppet is being
    executed within a container.

    Change-Id: I5270778a7c4da2c383cf98c746b77c9b210e9ba0
    Related-Bug: #1761624
    Needed-By: https://review.openstack.org/#/c/559182/
    (cherry picked from commit 2c7e877e581153ddc17dfd976b0779b3ccebf315)

tags: added: in-stable-queens
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to tripleo-heat-templates (stable/rocky)

Reviewed: https://review.openstack.org/607639
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=091cd60d069af2cd7eb3eb4b56cba733a4c66f86
Submitter: Zuul
Branch: stable/rocky

commit 091cd60d069af2cd7eb3eb4b56cba733a4c66f86
Author: Steve Baker <email address hidden>
Date: Fri Apr 6 11:05:33 2018 +1200

    docker-puppet.py: used dedicated hiera entry, not uuid

    Currently it is not possible to do per-node customization inside
    docker-puppet.py because it overrides the fact 'uuid'.

    This change adds a dedicated docker_puppet entry in hiera.yaml so that
    docker-puppet.py needs to do nothing special for
    /etc/puppet/hieradata/docker_puppet.json to be included in the hiera
    merge.

    Conflicts:
     docker/docker-puppet.py
    Change-Id: Icf37dcd63e0152ee15e9f0079b45e31a4f8d9fbb
    Depends-On: https://review.openstack.org/#/c/607631/
    Closes-Bug: #1761624
    (cherry picked from commit 6bbc3b51dfa6c9ea744dbb7b6212db7c56e8d827)

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to tripleo-heat-templates (stable/queens)

Reviewed: https://review.openstack.org/607647
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=e39c57b02ca593f6bf7313aa13ff5fbacbae8536
Submitter: Zuul
Branch: stable/queens

commit e39c57b02ca593f6bf7313aa13ff5fbacbae8536
Author: Steve Baker <email address hidden>
Date: Fri Apr 6 11:05:33 2018 +1200

    docker-puppet.py: used dedicated hiera entry, not uuid

    Currently it is not possible to do per-node customization inside
    docker-puppet.py because it overrides the fact 'uuid'.

    This change adds a dedicated docker_puppet entry in hiera.yaml so that
    docker-puppet.py needs to do nothing special for
    /etc/puppet/hieradata/docker_puppet.json to be included in the hiera
    merge.

    Conflicts:
            docker/docker-puppet.py
    Change-Id: Icf37dcd63e0152ee15e9f0079b45e31a4f8d9fbb
    Depends-On: https://review.openstack.org/#/c/607635/
    Closes-Bug: #1761624
    (cherry picked from commit 6bbc3b51dfa6c9ea744dbb7b6212db7c56e8d827)

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix included in openstack/tripleo-heat-templates 10.0.0

This issue was fixed in the openstack/tripleo-heat-templates 10.0.0 release.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix included in openstack/tripleo-heat-templates 8.1.0

This issue was fixed in the openstack/tripleo-heat-templates 8.1.0 release.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix included in openstack/tripleo-heat-templates 9.1.0

This issue was fixed in the openstack/tripleo-heat-templates 9.1.0 release.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to tripleo-heat-templates (stable/pike)

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/633506

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on tripleo-heat-templates (stable/pike)

Change abandoned by Emilien Macchi (<email address hidden>) on branch: stable/pike
Review: https://review.openstack.org/633506

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.