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 commitaf9329599b
) (cherry picked from commita575fd8d63
)
This commit is contained in:
parent
98e42763dc
commit
813a7382be
|
@ -4,6 +4,7 @@ disk_images:
|
||||||
type: qcow2
|
type: qcow2
|
||||||
distro: centos7
|
distro: centos7
|
||||||
elements:
|
elements:
|
||||||
|
- dhcp-all-interfaces
|
||||||
- selinux-permissive
|
- selinux-permissive
|
||||||
packages:
|
packages:
|
||||||
- yum-plugin-priorities
|
- yum-plugin-priorities
|
||||||
|
|
|
@ -3,7 +3,6 @@ disk_images:
|
||||||
imagename: overcloud-hardened-full
|
imagename: overcloud-hardened-full
|
||||||
type: qcow2
|
type: qcow2
|
||||||
elements:
|
elements:
|
||||||
- dhcp-all-interfaces
|
|
||||||
- openvswitch
|
- openvswitch
|
||||||
- overcloud-agent
|
- overcloud-agent
|
||||||
- overcloud-base
|
- overcloud-base
|
||||||
|
|
|
@ -3,5 +3,7 @@ disk_images:
|
||||||
imagename: overcloud-hardened-full
|
imagename: overcloud-hardened-full
|
||||||
type: qcow2
|
type: qcow2
|
||||||
distro: rhel
|
distro: rhel
|
||||||
|
elements:
|
||||||
|
- dhcp-all-interfaces
|
||||||
environment:
|
environment:
|
||||||
DIB_RELEASE: '7'
|
DIB_RELEASE: '7'
|
||||||
|
|
|
@ -4,6 +4,7 @@ disk_images:
|
||||||
type: qcow2
|
type: qcow2
|
||||||
distro: centos7
|
distro: centos7
|
||||||
elements:
|
elements:
|
||||||
|
- dhcp-all-interfaces
|
||||||
- selinux-permissive
|
- selinux-permissive
|
||||||
packages:
|
packages:
|
||||||
- yum-plugin-priorities
|
- yum-plugin-priorities
|
||||||
|
|
|
@ -3,7 +3,6 @@ disk_images:
|
||||||
imagename: overcloud-hardened-uefi-full
|
imagename: overcloud-hardened-uefi-full
|
||||||
type: qcow2
|
type: qcow2
|
||||||
elements:
|
elements:
|
||||||
- dhcp-all-interfaces
|
|
||||||
- openvswitch
|
- openvswitch
|
||||||
- overcloud-agent
|
- overcloud-agent
|
||||||
- overcloud-base
|
- overcloud-base
|
||||||
|
|
|
@ -3,6 +3,8 @@ disk_images:
|
||||||
imagename: overcloud-hardened-uefi-full
|
imagename: overcloud-hardened-uefi-full
|
||||||
type: qcow2
|
type: qcow2
|
||||||
distro: rhel
|
distro: rhel
|
||||||
|
elements:
|
||||||
|
- dhcp-all-interfaces
|
||||||
environment:
|
environment:
|
||||||
DIB_RELEASE: '7'
|
DIB_RELEASE: '7'
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ disk_images:
|
||||||
imagename: overcloud-hardened-uefi-full
|
imagename: overcloud-hardened-uefi-full
|
||||||
type: qcow2
|
type: qcow2
|
||||||
elements:
|
elements:
|
||||||
- dhcp-all-interfaces
|
|
||||||
- openvswitch
|
- openvswitch
|
||||||
- overcloud-agent
|
- overcloud-agent
|
||||||
- overcloud-base
|
- overcloud-base
|
||||||
|
|
|
@ -3,7 +3,6 @@ disk_images:
|
||||||
imagename: overcloud-hardened-full
|
imagename: overcloud-hardened-full
|
||||||
type: qcow2
|
type: qcow2
|
||||||
elements:
|
elements:
|
||||||
- dhcp-all-interfaces
|
|
||||||
- openvswitch
|
- openvswitch
|
||||||
- overcloud-agent
|
- overcloud-agent
|
||||||
- overcloud-base
|
- overcloud-base
|
||||||
|
|
|
@ -16,6 +16,7 @@ disk_images:
|
||||||
type: qcow2
|
type: qcow2
|
||||||
distro: centos7
|
distro: centos7
|
||||||
elements:
|
elements:
|
||||||
|
- dhcp-all-interfaces
|
||||||
- selinux-permissive
|
- selinux-permissive
|
||||||
packages:
|
packages:
|
||||||
- yum-plugin-priorities
|
- yum-plugin-priorities
|
||||||
|
|
|
@ -4,7 +4,6 @@ disk_images:
|
||||||
type: qcow2
|
type: qcow2
|
||||||
elements:
|
elements:
|
||||||
- baremetal
|
- baremetal
|
||||||
- dhcp-all-interfaces
|
|
||||||
- overcloud-agent
|
- overcloud-agent
|
||||||
- overcloud-base
|
- overcloud-base
|
||||||
- overcloud-ceph-storage
|
- overcloud-ceph-storage
|
||||||
|
|
|
@ -4,7 +4,6 @@ disk_images:
|
||||||
type: qcow2
|
type: qcow2
|
||||||
elements:
|
elements:
|
||||||
- baremetal
|
- baremetal
|
||||||
- dhcp-all-interfaces
|
|
||||||
- openvswitch
|
- openvswitch
|
||||||
- overcloud-agent
|
- overcloud-agent
|
||||||
- overcloud-base
|
- overcloud-base
|
||||||
|
|
|
@ -3,6 +3,8 @@ disk_images:
|
||||||
imagename: overcloud-full
|
imagename: overcloud-full
|
||||||
type: qcow2
|
type: qcow2
|
||||||
distro: rhel7
|
distro: rhel7
|
||||||
|
elements:
|
||||||
|
- dhcp-all-interfaces
|
||||||
environment:
|
environment:
|
||||||
FS_TYPE: xfs
|
FS_TYPE: xfs
|
||||||
options:
|
options:
|
||||||
|
|
|
@ -4,7 +4,6 @@ disk_images:
|
||||||
type: qcow2
|
type: qcow2
|
||||||
elements:
|
elements:
|
||||||
- baremetal
|
- baremetal
|
||||||
- dhcp-all-interfaces
|
|
||||||
- openvswitch
|
- openvswitch
|
||||||
- overcloud-agent
|
- overcloud-agent
|
||||||
- overcloud-base
|
- overcloud-base
|
||||||
|
|
|
@ -4,6 +4,7 @@ disk_images:
|
||||||
type: qcow2
|
type: qcow2
|
||||||
distro: centos7
|
distro: centos7
|
||||||
elements:
|
elements:
|
||||||
|
- dhcp-all-interfaces
|
||||||
- selinux-permissive
|
- selinux-permissive
|
||||||
packages:
|
packages:
|
||||||
- yum-plugin-priorities
|
- yum-plugin-priorities
|
||||||
|
|
|
@ -4,7 +4,6 @@ disk_images:
|
||||||
type: qcow2
|
type: qcow2
|
||||||
elements:
|
elements:
|
||||||
- baremetal
|
- baremetal
|
||||||
- dhcp-all-interfaces
|
|
||||||
- openvswitch
|
- openvswitch
|
||||||
- overcloud-agent
|
- overcloud-agent
|
||||||
- overcloud-compute
|
- overcloud-compute
|
||||||
|
|
|
@ -3,3 +3,5 @@ disk_images:
|
||||||
imagename: overcloud-realtime-compute
|
imagename: overcloud-realtime-compute
|
||||||
type: qcow2
|
type: qcow2
|
||||||
distro: rhel7
|
distro: rhel7
|
||||||
|
elements:
|
||||||
|
- dhcp-all-interfaces
|
||||||
|
|
|
@ -4,7 +4,6 @@ disk_images:
|
||||||
type: qcow2
|
type: qcow2
|
||||||
elements:
|
elements:
|
||||||
- baremetal
|
- baremetal
|
||||||
- dhcp-all-interfaces
|
|
||||||
- openvswitch
|
- openvswitch
|
||||||
- overcloud-agent
|
- overcloud-agent
|
||||||
- overcloud-compute
|
- overcloud-compute
|
||||||
|
|
Loading…
Reference in New Issue