openstack/tripleo-common
Code Issues Proposed changes

Remove instack-undercloud from image building

Browse Source 
This change removes instack-undercloud from the image building process
by leveraging the newer elements that have been moved from
instack-undercloud into tripleo-puppet-elements

Change-Id: I9e9ccdf4371dcc5b399b9b83b0f4dafb7a428feb
Depends-On: I1de0b6421ef455ef58c0146da7fe52c35682b395
Related-Blueprint: remove-instack-undercloud
This commit is contained in:
Alex Schultz 2018-08-27 10:16:08 -06:00 committed by Emilien Macchi
parent 699d5002cc
commit 29051e81d4
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
image-yaml/overcloud-hardened-images-uefi.yaml
View File

@ -6,7 +6,7 @@ disk_images:
- dhcp-all-interfaces
- openvswitch
- overcloud-agent
- overcloud-full
- overcloud-base
- overcloud-controller
- overcloud-compute
- overcloud-ceph-storage
@ -17,7 +17,7 @@ disk_images:
- dynamic-login
- iptables
- enable-packages-install
- pip-and-virtualenv-override
- override-pip-and-virtualenv
- dracut-regenerate
- remove-machine-id
- remove-resolvconf

4
image-yaml/overcloud-hardened-images.yaml
View File

@ -6,7 +6,7 @@ disk_images:
- dhcp-all-interfaces
- openvswitch
- overcloud-agent
- overcloud-full
- overcloud-base
- overcloud-controller
- overcloud-compute
- overcloud-ceph-storage
@ -17,7 +17,7 @@ disk_images:
- dynamic-login
- iptables
- enable-packages-install
- pip-and-virtualenv-override
- override-pip-and-virtualenv
- dracut-regenerate
- remove-machine-id
- remove-resolvconf

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

@ -7,7 +7,7 @@ disk_images:
- dhcp-all-interfaces
- openvswitch
- overcloud-agent
- overcloud-full
- overcloud-base
- overcloud-controller
- overcloud-compute
- overcloud-ceph-storage
@ -18,7 +18,7 @@ disk_images:
- dynamic-login
- iptables
- enable-packages-install
- pip-and-virtualenv-override
- override-pip-and-virtualenv
- dracut-regenerate
- remove-machine-id
- remove-resolvconf
@ -52,7 +52,7 @@ disk_images:
- element-manifest
- network-gateway
- enable-packages-install
- pip-and-virtualenv-override
- override-pip-and-virtualenv
packages:
- python-hardware-detect
options:

2
image-yaml/overcloud-realtime-compute.yaml
View File

@ -15,7 +15,7 @@ disk_images:
- dynamic-login
- iptables
- enable-packages-install
- pip-and-virtualenv-override
- override-pip-and-virtualenv
- dracut-regenerate
- remove-machine-id
- remove-resolvconf

1
tripleo_common/image/image_builder.py
View File

@ -81,7 +81,6 @@ class DibImageBuilder(ImageBuilder):
if elements_path is None:
env['ELEMENTS_PATH'] = os.pathsep.join([
"/usr/share/tripleo-puppet-elements",
"/usr/share/instack-undercloud",
'/usr/share/tripleo-image-elements',
])
os.environ.update(env)