sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "yum-minimal: do not configure eth0 & eth1 for DHCP automatically"

Browse Source
This commit is contained in:
Jenkins 2015-12-22 20:08:59 +00:00 committed by Gerrit Code Review
commit 441069bc17
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/centos-minimal/README.rst
View File

@ -12,3 +12,10 @@ flag to disk-image-create when using this element.
The `DIB_OFFLINE` or more specific `DIB_YUMCHROOT_USE_CACHE` The `DIB_OFFLINE` or more specific `DIB_YUMCHROOT_USE_CACHE`
variables can be set to prefer the use of a pre-cached root filesystem variables can be set to prefer the use of a pre-cached root filesystem
tarball. tarball.
By default, `DIB_YUM_MINIMAL_CREATE_INTERFACES` is set to enable the
creation of `/etc/sysconfig/network-scripts/ifcfg-eth[0|1]` scripts to
enable DHCP on the `eth0` & `eth1` interfaces. If you do not have
these interfaces, or if you are using something else to setup the
network such as cloud-init, glean or network-manager, you would want
to set this to `0`.

4
elements/centos-minimal/environment.d/10-centos-distro-name.bash
View File

@ -1,2 +1,6 @@
export DISTRO_NAME=centos export DISTRO_NAME=centos
export DIB_RELEASE=${DIB_RELEASE:-7} export DIB_RELEASE=${DIB_RELEASE:-7}
# by default, enable DHCP configuration of eth0 & eth1 in network
# scripts. See yum-minimal for full details
export DIB_YUM_MINIMAL_CREATE_INTERFACES=${DIB_YUM_MINIMAL_CREATE_INTERFACES:-1}

4
elements/yum-minimal/README.rst
View File

@ -12,3 +12,7 @@ Ubuntu and Debian. Nothing additional is needed on Fedora or CentOS.
The `DIB_OFFLINE` or more specific `DIB_YUMCHROOT_USE_CACHE` The `DIB_OFFLINE` or more specific `DIB_YUMCHROOT_USE_CACHE`
variables can be set to prefer the use of a pre-cached root filesystem variables can be set to prefer the use of a pre-cached root filesystem
tarball. tarball.
If you wish to have DHCP networking setup for eth0 & eth1 via
/etc/sysconfig/network-config scripts/ifcfg-eth[0|1], set the
environment variable `DIB_YUM_MINIMAL_CREATE_INTERFACES` to `1`.

7
elements/yum-minimal/install.d/10-base-networking
View File

@ -28,6 +28,12 @@ NETWORKING_IPV6=yes
NOZEROCONF=yes NOZEROCONF=yes
EOF EOF
# If you want eth0 and eth1 created as DHCP based interfaces, enable
# this. You don't want this if systemd is going to call the
# interfaces on the real system something else, or if you're using a
# network-manager like cloud-init, glean or network-manager that will
# handle the interfaces dynamically.
if [[ "${DIB_YUM_MINIMAL_CREATE_INTERFACES:-0}" -eq "1" ]]; then
for interface in eth0 eth1; do for interface in eth0 eth1; do
cat << EOF | tee /etc/sysconfig/network-scripts/ifcfg-$interface > /dev/null cat << EOF | tee /etc/sysconfig/network-scripts/ifcfg-$interface > /dev/null
DEVICE=$interface DEVICE=$interface
@ -35,3 +41,4 @@ BOOTPROTO=dhcp
ONBOOT=on ONBOOT=on
EOF EOF
done done
fi