simple-init: default to NetworkManager for CentOS and Fedora

NetworkManager with simple-init has proven to be stable in OpenStack
infra, switch to it by default for CentOS and Fedora.  For CentOS 8
and Fedora, add a check to make it the only option.  Thus only CenOS 7
remains optionally using the legacy scripts; this is likely not used
anywhere (infra is really the primary user, where NetworkManager is
already used); we can likely remove this variable (and hence path) in
a future cleanup.

In the setup, remove rhel7 element which was never really tested.
Reorganise the fallthrough to call out the default paths as doing
nothing.

Change-Id: Ic996956da4b85f7d95179b8df9881d5f52c091af
This commit is contained in:
Ian Wienand 2019-10-03 00:19:19 +00:00
parent 027092d407
commit cbe1a0fc6b
4 changed files with 23 additions and 8 deletions

View File

@ -223,8 +223,6 @@
base_element: centos-minimal base_element: centos-minimal
release: '7' release: '7'
mirror: "http://{{ zuul_site_mirror_fqdn }}/centos" mirror: "http://{{ zuul_site_mirror_fqdn }}/centos"
env-vars:
DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
- job: - job:
name: dib-nodepool-functional-openstack-fedora-29-src name: dib-nodepool-functional-openstack-fedora-29-src
@ -238,8 +236,6 @@
nodepool_diskimage: nodepool_diskimage:
base_element: fedora-minimal base_element: fedora-minimal
release: '29' release: '29'
env-vars:
DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
- job: - job:
name: dib-nodepool-functional-openstack-fedora-30-src name: dib-nodepool-functional-openstack-fedora-30-src
@ -253,8 +249,6 @@
nodepool_diskimage: nodepool_diskimage:
base_element: fedora-minimal base_element: fedora-minimal
release: '30' release: '30'
env-vars:
DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
- job: - job:
name: dib-nodepool-functional-openstack-ubuntu-trusty-src name: dib-nodepool-functional-openstack-ubuntu-trusty-src

View File

@ -1 +1,12 @@
if [[ ${DISTRO_NAME} =~ (centos|fedora) ]]; then
export DIB_SIMPLE_INIT_NETWORKMANAGER=${DIB_SIMPLE_INIT_NETWORKMANAGER:-1}
else
export DIB_SIMPLE_INIT_NETWORKMANAGER=${DIB_SIMPLE_INIT_NETWORKMANAGER:-0} export DIB_SIMPLE_INIT_NETWORKMANAGER=${DIB_SIMPLE_INIT_NETWORKMANAGER:-0}
fi
if [[ ${DISTRO_NAME} == "centos" && $DIB_RELEASE -ge 8 ]] || [[ ${DISTRO_NAME} == "fedora" ]]; then
if [[ $DIB_SIMPLE_INIT_NETWORKMANAGER == 0 ]]; then
echo "simple-init only supports NetworkManager mode on Fedora and CentOS 8"
exit 1
fi
fi

View File

@ -12,7 +12,7 @@ case "$DIB_INIT_SYSTEM" in
exit 0 exit 0
;; ;;
systemd) systemd)
if [[ ${DISTRO_NAME} =~ (centos|rhel7|fedora) ]]; then if [[ ${DISTRO_NAME} == centos && ${DIB_RELEASE} -eq 7 ]]; then
if [[ ${DIB_SIMPLE_INIT_NETWORKMANAGER} != 1 ]]; then if [[ ${DIB_SIMPLE_INIT_NETWORKMANAGER} != 1 ]]; then
# NOTE(pabelanger): Glean requires network.service for # NOTE(pabelanger): Glean requires network.service for
# these platforms when not using networkmanager # these platforms when not using networkmanager
@ -22,6 +22,10 @@ case "$DIB_INIT_SYSTEM" in
# on suse, this is named wicked.service, but it's the same # on suse, this is named wicked.service, but it's the same
# as network.service. # as network.service.
systemctl enable wicked.service systemctl enable wicked.service
else
# NOTE(ianw): it might be better to whitelist platforms in
# the future, but for now assume it will "just work"
continue
fi fi
;; ;;
openrc) openrc)

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The ``simple-init`` element will now default to using NetworkManager
for CentOS and Fedora platforms. For CentOS 8 and Fedora, the
``DIB_SIMPLE_INIT_NETWORKMANAGER=0`` option is no longer supported.