From b0f8708bc52adf26ad362b1fc7d5ac53ee0f07f2 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 7 Sep 2016 09:09:05 +1200 Subject: [PATCH] Replace agent elements with package python-heat-agent-puppet 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. Change-Id: I84c4fb2b222e7d196061b4684acdd89391fde7f4 --- .../tests/v1/overcloud_image/test_overcloud_image.py | 8 ++++---- tripleoclient/v1/overcloud_image.py | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py index ac393e13b..00f968a51 100644 --- a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py +++ b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py @@ -120,13 +120,13 @@ class TestOvercloudImageBuild(TestPluginV1): "overcloud-full.qcow2 rhel7 overcloud-full overcloud-controller " "overcloud-compute overcloud-ceph-storage hosts " "baremetal dhcp-all-interfaces os-collect-config " - "heat-config-puppet heat-config-script puppet-modules hiera " + "puppet-modules hiera " "os-net-config stable-interface-names grub2 " "-p python-psutil,python-debtcollector,plotnetcfg,sos," "python-networking-cisco,python-UcsSdk," "device-mapper-multipath,python-networking-bigswitch," "openstack-neutron-bigswitch-lldp," - "openstack-neutron-bigswitch-agent " + "openstack-neutron-bigswitch-agent,python-heat-agent-puppet " "dynamic-login element-manifest network-gateway epel " "enable-packages-install " "pip-and-virtualenv-override --min-tmpfs 5 2>&1 | " @@ -164,13 +164,13 @@ class TestOvercloudImageBuild(TestPluginV1): "overcloud-full.qcow2 rhel7 overcloud-full overcloud-controller " "overcloud-compute overcloud-ceph-storage hosts " "baremetal dhcp-all-interfaces os-collect-config " - "heat-config-puppet heat-config-script puppet-modules hiera " + "puppet-modules hiera " "os-net-config stable-interface-names grub2 " "-p python-psutil,python-debtcollector,plotnetcfg,sos," "python-networking-cisco,python-UcsSdk," "device-mapper-multipath,python-networking-bigswitch," "openstack-neutron-bigswitch-lldp," - "openstack-neutron-bigswitch-agent " + "openstack-neutron-bigswitch-agent,python-heat-agent-puppet " "dynamic-login element-manifest network-gateway epel " "enable-packages-install " "pip-and-virtualenv-override overcloud-network-midonet " diff --git a/tripleoclient/v1/overcloud_image.py b/tripleoclient/v1/overcloud_image.py index 7fdcc1545..a595a30fe 100644 --- a/tripleoclient/v1/overcloud_image.py +++ b/tripleoclient/v1/overcloud_image.py @@ -176,8 +176,6 @@ class BuildOvercloudImage(command.Command): 'baremetal', 'dhcp-all-interfaces', 'os-collect-config', - 'heat-config-puppet', - 'heat-config-script', 'puppet-modules', 'hiera', 'os-net-config', @@ -186,7 +184,7 @@ class BuildOvercloudImage(command.Command): '-p python-psutil,python-debtcollector,plotnetcfg,sos,' 'python-networking-cisco,python-UcsSdk,device-mapper-multipath,' 'python-networking-bigswitch,openstack-neutron-bigswitch-lldp,' - 'openstack-neutron-bigswitch-agent' + 'openstack-neutron-bigswitch-agent,python-heat-agent-puppet' ] OVERCLOUD_FULL_DIB_EXTRA_ARGS = [ @@ -268,7 +266,6 @@ class BuildOvercloudImage(command.Command): self.TRIPLEOPUPPETELEMENTS, self.INSTACKUNDERCLOUDELEMENTS, '/usr/share/tripleo-image-elements', - '/usr/share/openstack-heat-templates/' 'software-config/elements', ])), help=_("Full elements path, separated by %s") % os.pathsep,