openstack/tripleo-common
Code Issues Proposed changes

Replace agent elements with package python-heat-agent-puppet

Browse Source 
This change replaces the overcloud image build elements
heat-config-puppet, heat-config-script with the package based
equivalent python-heat-agent-puppet.

python-heat-agent-puppet depends on python-heat-agent which does the
setup of os-collect-config, os-refresh-config, os-apply-config for
heat bootstrap, and also installs the script hook.

This vastly improves the in-place upgrade story since it will work
like any other package upgrade.

Originally in I84c4fb2b222e7d196061b4684acdd89391fde7f4, this patch
is for the new tripleo-build-images in tripleo-common.

Change-Id: I3a399caeab5e35f409f162205291f2dfaa2566d3
This commit is contained in:
Brad P. Crochet 2016-09-13 12:02:53 -04:00
parent 1b09e77383
commit 86d071c1ac
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
image-yaml/overcloud-images.yaml
View File

@ -4,7 +4,7 @@ disk_images:
arch: amd64
type: qcow2
elements:
- hosts baremetal dhcp-all-interfaces os-collect-config overcloud-full overcloud-controller overcloud-compute overcloud-ceph-storage heat-config-puppet heat-config-script puppet-modules hiera os-net-config stable-interface-names grub2 element-manifest network-gateway dynamic-login enable-packages-install pip-and-virtualenv-override
- hosts baremetal dhcp-all-interfaces os-collect-config overcloud-full overcloud-controller overcloud-compute overcloud-ceph-storage puppet-modules hiera os-net-config stable-interface-names grub2 element-manifest network-gateway dynamic-login enable-packages-install pip-and-virtualenv-override
packages:
- python-psutil
- python-debtcollector
@ -16,6 +16,7 @@ disk_images:
- python-networking-bigswitch
- openstack-neutron-bigswitch-lldp
- openstack-neutron-bigswitch-agent
- python-heat-agent-puppet
options:
- "--min-tmpfs 5"
-

2
tripleo_common/image/image_builder.py
View File

@ -55,8 +55,6 @@ class DibImageBuilder(ImageBuilder):
"/usr/share/tripleo-puppet-elements",
"/usr/share/instack-undercloud",
'/usr/share/tripleo-image-elements',
'/usr/share/openstack-heat-templates/'
'software-config/elements',
])
os.environ.update(env)