From 6dcfef81fbeb37f42b72181bf547a2ce5859a799 Mon Sep 17 00:00:00 2001 From: Gabriele Cerami Date: Mon, 23 Jan 2017 15:40:52 +0100 Subject: [PATCH] Remove vendor plugins from image build mirroring what is done for master and newton in tripleo-common [1] we are removing vendor plugins from default image build process, because they are proven to be unreliable, difficult to gate and slow to fix. [1] https://review.openstack.org/409809 Change-Id: I52371311d02d987ec198380ec268addd27f36684 Closes-Bug: 1658645 --- .../notes/image-vendor-packages-a0d667e0c7aa1bbd.yaml | 10 ++++++++++ .../tests/v1/overcloud_image/test_overcloud_image.py | 10 ++-------- tripleoclient/v1/overcloud_image.py | 4 +--- 3 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 releasenotes/notes/image-vendor-packages-a0d667e0c7aa1bbd.yaml diff --git a/releasenotes/notes/image-vendor-packages-a0d667e0c7aa1bbd.yaml b/releasenotes/notes/image-vendor-packages-a0d667e0c7aa1bbd.yaml new file mode 100644 index 000000000..8d1dc0deb --- /dev/null +++ b/releasenotes/notes/image-vendor-packages-a0d667e0c7aa1bbd.yaml @@ -0,0 +1,10 @@ +--- +upgrade: + - | + Some packages previously built into the default overcloud-full image to + support vendor integration have been removed due to difficulties related + to CI stability. To add these packages for the vendor support you require + you can either build a custom image containing the packages (see + http://docs.openstack.org/developer/tripleo-docs/basic_deployment/basic_deployment_cli.html#get-images) + or you can use virt-customize (http://libguestfs.org/virt-customize.1.html) + to install the required extra packages in a pre-built overcloud-full image. diff --git a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py index 788d88fff..873397ddd 100644 --- a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py +++ b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py @@ -210,10 +210,7 @@ class TestOvercloudImageBuild(TestPluginV1): "puppet-modules hiera " "os-net-config stable-interface-names grub2 " "-p python-psutil,python-debtcollector,plotnetcfg,sos," - "python-UcsSdk," - "device-mapper-multipath,python-networking-bigswitch," - "openstack-neutron-bigswitch-lldp," - "openstack-neutron-bigswitch-agent,python-heat-agent-puppet," + "device-mapper-multipath,python-heat-agent-puppet," "python-heat-agent-ansible," "python-heat-agent-hiera," "python-heat-agent-apply-config " @@ -258,10 +255,7 @@ class TestOvercloudImageBuild(TestPluginV1): "puppet-modules hiera " "os-net-config stable-interface-names grub2 " "-p python-psutil,python-debtcollector,plotnetcfg,sos," - "python-UcsSdk," - "device-mapper-multipath,python-networking-bigswitch," - "openstack-neutron-bigswitch-lldp," - "openstack-neutron-bigswitch-agent,python-heat-agent-puppet," + "device-mapper-multipath,python-heat-agent-puppet," "python-heat-agent-ansible," "python-heat-agent-hiera," "python-heat-agent-apply-config " diff --git a/tripleoclient/v1/overcloud_image.py b/tripleoclient/v1/overcloud_image.py index dac0698a1..b61241f67 100644 --- a/tripleoclient/v1/overcloud_image.py +++ b/tripleoclient/v1/overcloud_image.py @@ -194,9 +194,7 @@ class BuildOvercloudImage(command.Command): 'stable-interface-names', 'grub2', '-p python-psutil,python-debtcollector,plotnetcfg,sos,' - 'python-UcsSdk,device-mapper-multipath,' - 'python-networking-bigswitch,openstack-neutron-bigswitch-lldp,' - 'openstack-neutron-bigswitch-agent,python-heat-agent-puppet,' + 'device-mapper-multipath,python-heat-agent-puppet,' 'python-heat-agent-ansible,' 'python-heat-agent-hiera,' 'python-heat-agent-apply-config'