From 813a7382be66058086c78c0c05602f7ae963b9ac Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 24 Mar 2021 10:47:03 +1300 Subject: [PATCH] Don't install dhcp-all-interfaces for redhat 8 onwards This element was needed for centos-7 and earlier because by default only the first interface had dhcp enabled. This is no longer the case with centos-8, every interface has dhcp enabled. Additionally this element is causing issues in some environments. This change removes the element from all *-8 images since it no longer serves a useful purpose and is causing problems in some cases. Change-Id: I2cc79caeabd9d1b85f54320a83e5f36a64003303 (cherry picked from commit af9329599bec35e241db8466ec172e7d498ad6ea) (cherry picked from commit a575fd8d639e4e37819e5bc1d7352902119df996) --- image-yaml/overcloud-hardened-images-centos7.yaml | 1 + image-yaml/overcloud-hardened-images-python3.yaml | 1 - image-yaml/overcloud-hardened-images-rhel7.yaml | 2 ++ image-yaml/overcloud-hardened-images-uefi-centos7.yaml | 1 + image-yaml/overcloud-hardened-images-uefi-python3.yaml | 1 - image-yaml/overcloud-hardened-images-uefi-rhel7.yaml | 2 ++ image-yaml/overcloud-hardened-images-uefi.yaml | 1 - image-yaml/overcloud-hardened-images.yaml | 1 - image-yaml/overcloud-images-centos7.yaml | 1 + image-yaml/overcloud-images-ceph.yaml | 1 - image-yaml/overcloud-images-python3.yaml | 1 - image-yaml/overcloud-images-rhel7.yaml | 2 ++ image-yaml/overcloud-images.yaml | 1 - image-yaml/overcloud-realtime-compute-centos7.yaml | 1 + image-yaml/overcloud-realtime-compute-python3.yaml | 1 - image-yaml/overcloud-realtime-compute-rhel7.yaml | 2 ++ image-yaml/overcloud-realtime-compute.yaml | 1 - 17 files changed, 12 insertions(+), 9 deletions(-) diff --git a/image-yaml/overcloud-hardened-images-centos7.yaml b/image-yaml/overcloud-hardened-images-centos7.yaml index 23d3415c7..7b2c7c138 100644 --- a/image-yaml/overcloud-hardened-images-centos7.yaml +++ b/image-yaml/overcloud-hardened-images-centos7.yaml @@ -4,6 +4,7 @@ disk_images: type: qcow2 distro: centos7 elements: + - dhcp-all-interfaces - selinux-permissive packages: - yum-plugin-priorities diff --git a/image-yaml/overcloud-hardened-images-python3.yaml b/image-yaml/overcloud-hardened-images-python3.yaml index 10188945b..3fc7cd66c 100644 --- a/image-yaml/overcloud-hardened-images-python3.yaml +++ b/image-yaml/overcloud-hardened-images-python3.yaml @@ -3,7 +3,6 @@ disk_images: imagename: overcloud-hardened-full type: qcow2 elements: - - dhcp-all-interfaces - openvswitch - overcloud-agent - overcloud-base diff --git a/image-yaml/overcloud-hardened-images-rhel7.yaml b/image-yaml/overcloud-hardened-images-rhel7.yaml index 3e5e93b70..9f2aaecd1 100644 --- a/image-yaml/overcloud-hardened-images-rhel7.yaml +++ b/image-yaml/overcloud-hardened-images-rhel7.yaml @@ -3,5 +3,7 @@ disk_images: imagename: overcloud-hardened-full type: qcow2 distro: rhel + elements: + - dhcp-all-interfaces environment: DIB_RELEASE: '7' diff --git a/image-yaml/overcloud-hardened-images-uefi-centos7.yaml b/image-yaml/overcloud-hardened-images-uefi-centos7.yaml index 60e23b576..a610e3560 100644 --- a/image-yaml/overcloud-hardened-images-uefi-centos7.yaml +++ b/image-yaml/overcloud-hardened-images-uefi-centos7.yaml @@ -4,6 +4,7 @@ disk_images: type: qcow2 distro: centos7 elements: + - dhcp-all-interfaces - selinux-permissive packages: - yum-plugin-priorities diff --git a/image-yaml/overcloud-hardened-images-uefi-python3.yaml b/image-yaml/overcloud-hardened-images-uefi-python3.yaml index 451a188e0..92bf59408 100644 --- a/image-yaml/overcloud-hardened-images-uefi-python3.yaml +++ b/image-yaml/overcloud-hardened-images-uefi-python3.yaml @@ -3,7 +3,6 @@ disk_images: imagename: overcloud-hardened-uefi-full type: qcow2 elements: - - dhcp-all-interfaces - openvswitch - overcloud-agent - overcloud-base diff --git a/image-yaml/overcloud-hardened-images-uefi-rhel7.yaml b/image-yaml/overcloud-hardened-images-uefi-rhel7.yaml index 5fff3ca15..1c06b543d 100644 --- a/image-yaml/overcloud-hardened-images-uefi-rhel7.yaml +++ b/image-yaml/overcloud-hardened-images-uefi-rhel7.yaml @@ -3,6 +3,8 @@ disk_images: imagename: overcloud-hardened-uefi-full type: qcow2 distro: rhel + elements: + - dhcp-all-interfaces environment: DIB_RELEASE: '7' diff --git a/image-yaml/overcloud-hardened-images-uefi.yaml b/image-yaml/overcloud-hardened-images-uefi.yaml index dc6e61862..dffa60d8b 100644 --- a/image-yaml/overcloud-hardened-images-uefi.yaml +++ b/image-yaml/overcloud-hardened-images-uefi.yaml @@ -3,7 +3,6 @@ disk_images: imagename: overcloud-hardened-uefi-full type: qcow2 elements: - - dhcp-all-interfaces - openvswitch - overcloud-agent - overcloud-base diff --git a/image-yaml/overcloud-hardened-images.yaml b/image-yaml/overcloud-hardened-images.yaml index cbbeedbd8..8a8450b90 100644 --- a/image-yaml/overcloud-hardened-images.yaml +++ b/image-yaml/overcloud-hardened-images.yaml @@ -3,7 +3,6 @@ disk_images: imagename: overcloud-hardened-full type: qcow2 elements: - - dhcp-all-interfaces - openvswitch - overcloud-agent - overcloud-base diff --git a/image-yaml/overcloud-images-centos7.yaml b/image-yaml/overcloud-images-centos7.yaml index 64b31d418..90915402a 100644 --- a/image-yaml/overcloud-images-centos7.yaml +++ b/image-yaml/overcloud-images-centos7.yaml @@ -16,6 +16,7 @@ disk_images: type: qcow2 distro: centos7 elements: + - dhcp-all-interfaces - selinux-permissive packages: - yum-plugin-priorities diff --git a/image-yaml/overcloud-images-ceph.yaml b/image-yaml/overcloud-images-ceph.yaml index 6fcdf76ba..87254ca9e 100644 --- a/image-yaml/overcloud-images-ceph.yaml +++ b/image-yaml/overcloud-images-ceph.yaml @@ -4,7 +4,6 @@ disk_images: type: qcow2 elements: - baremetal - - dhcp-all-interfaces - overcloud-agent - overcloud-base - overcloud-ceph-storage diff --git a/image-yaml/overcloud-images-python3.yaml b/image-yaml/overcloud-images-python3.yaml index e2b19a3a1..bfa84054c 100644 --- a/image-yaml/overcloud-images-python3.yaml +++ b/image-yaml/overcloud-images-python3.yaml @@ -4,7 +4,6 @@ disk_images: type: qcow2 elements: - baremetal - - dhcp-all-interfaces - openvswitch - overcloud-agent - overcloud-base diff --git a/image-yaml/overcloud-images-rhel7.yaml b/image-yaml/overcloud-images-rhel7.yaml index 59e5ad6b1..e34d539aa 100644 --- a/image-yaml/overcloud-images-rhel7.yaml +++ b/image-yaml/overcloud-images-rhel7.yaml @@ -3,6 +3,8 @@ disk_images: imagename: overcloud-full type: qcow2 distro: rhel7 + elements: + - dhcp-all-interfaces environment: FS_TYPE: xfs options: diff --git a/image-yaml/overcloud-images.yaml b/image-yaml/overcloud-images.yaml index 7f3dde5f5..459b854e7 100644 --- a/image-yaml/overcloud-images.yaml +++ b/image-yaml/overcloud-images.yaml @@ -4,7 +4,6 @@ disk_images: type: qcow2 elements: - baremetal - - dhcp-all-interfaces - openvswitch - overcloud-agent - overcloud-base diff --git a/image-yaml/overcloud-realtime-compute-centos7.yaml b/image-yaml/overcloud-realtime-compute-centos7.yaml index 2c5386642..a9d99ec2c 100644 --- a/image-yaml/overcloud-realtime-compute-centos7.yaml +++ b/image-yaml/overcloud-realtime-compute-centos7.yaml @@ -4,6 +4,7 @@ disk_images: type: qcow2 distro: centos7 elements: + - dhcp-all-interfaces - selinux-permissive packages: - yum-plugin-priorities diff --git a/image-yaml/overcloud-realtime-compute-python3.yaml b/image-yaml/overcloud-realtime-compute-python3.yaml index 4d3789fdd..9aaed9d1f 100644 --- a/image-yaml/overcloud-realtime-compute-python3.yaml +++ b/image-yaml/overcloud-realtime-compute-python3.yaml @@ -4,7 +4,6 @@ disk_images: type: qcow2 elements: - baremetal - - dhcp-all-interfaces - openvswitch - overcloud-agent - overcloud-compute diff --git a/image-yaml/overcloud-realtime-compute-rhel7.yaml b/image-yaml/overcloud-realtime-compute-rhel7.yaml index 6c5f1ea8c..c2b8432b4 100644 --- a/image-yaml/overcloud-realtime-compute-rhel7.yaml +++ b/image-yaml/overcloud-realtime-compute-rhel7.yaml @@ -3,3 +3,5 @@ disk_images: imagename: overcloud-realtime-compute type: qcow2 distro: rhel7 + elements: + - dhcp-all-interfaces diff --git a/image-yaml/overcloud-realtime-compute.yaml b/image-yaml/overcloud-realtime-compute.yaml index f6a3c2124..cbbbed264 100644 --- a/image-yaml/overcloud-realtime-compute.yaml +++ b/image-yaml/overcloud-realtime-compute.yaml @@ -4,7 +4,6 @@ disk_images: type: qcow2 elements: - baremetal - - dhcp-all-interfaces - openvswitch - overcloud-agent - overcloud-compute