Extend container prep to include default network interface
This patch implements the preparation commands from the lxc-container-create role as this preparation is required to be done for all containers and is not unique for each container. Change-Id: Ia8c0bb759b5df29f1b3a5e11230040ffc6e97362
This commit is contained in:
parent
319e37c8f5
commit
d66cedcc15
@ -54,6 +54,15 @@ lxc_cache_map:
|
|||||||
/usr/bin/rpm -ivh /tmp/epel-release-latest-7.noarch.rpm || true
|
/usr/bin/rpm -ivh /tmp/epel-release-latest-7.noarch.rpm || true
|
||||||
yum clean all
|
yum clean all
|
||||||
mkdir -p /var/backup
|
mkdir -p /var/backup
|
||||||
|
if [ -f "/usr/lib/systemd/system/poweroff.target" ];then
|
||||||
|
ln -sf /usr/lib/systemd/system/poweroff.target /etc/systemd/system/sigpwr.target || true
|
||||||
|
fi
|
||||||
|
ln -s /dev/null /etc/systemd/system/systemd-udevd.service || true
|
||||||
|
ln -s /dev/null /etc/systemd/system/systemd-udevd-control.socket || true
|
||||||
|
ln -s /dev/null /etc/systemd/system/systemd-udevd-kernel.socket || true
|
||||||
|
ln -s /dev/null /etc/systemd/system/proc-sys-fs-binfmt_misc.automount || true
|
||||||
|
echo -e '{{ lxc_container_default_interfaces }}' | tee /etc/sysconfig/network-scripts/ifcfg-eth0
|
||||||
|
chage -I -1 -d -1 -m 0 -M 99999 -E -1 root
|
||||||
|
|
||||||
lxc_cache_packages:
|
lxc_cache_packages:
|
||||||
- ca-certificates
|
- ca-certificates
|
||||||
@ -70,3 +79,10 @@ pip_install_options: >
|
|||||||
lxc_cached_network_interfaces:
|
lxc_cached_network_interfaces:
|
||||||
- src: "lxc-net-ifcfg-bridge.cfg.j2"
|
- src: "lxc-net-ifcfg-bridge.cfg.j2"
|
||||||
dest: "/etc/sysconfig/network-scripts/ifcfg-lxcbr0"
|
dest: "/etc/sysconfig/network-scripts/ifcfg-lxcbr0"
|
||||||
|
|
||||||
|
lxc_container_default_interfaces: |
|
||||||
|
DEVICE=eth0
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
ONBOOT=yes
|
||||||
|
NM_CONTROLLED=no
|
||||||
|
TYPE=Ethernet
|
||||||
|
@ -61,6 +61,16 @@ lxc_cache_map:
|
|||||||
userdel --force --remove ubuntu || true
|
userdel --force --remove ubuntu || true
|
||||||
apt-get clean
|
apt-get clean
|
||||||
mkdir -p /var/backup
|
mkdir -p /var/backup
|
||||||
|
if [ -f "/usr/lib/systemd/system/poweroff.target" ];then
|
||||||
|
ln -sf /usr/lib/systemd/system/poweroff.target /etc/systemd/system/sigpwr.target || true
|
||||||
|
fi
|
||||||
|
ln -s /dev/null /etc/systemd/system/systemd-udevd.service || true
|
||||||
|
ln -s /dev/null /etc/systemd/system/systemd-udevd-control.socket || true
|
||||||
|
ln -s /dev/null /etc/systemd/system/systemd-udevd-kernel.socket || true
|
||||||
|
ln -s /dev/null /etc/systemd/system/proc-sys-fs-binfmt_misc.automount || true
|
||||||
|
echo -e '{{ lxc_container_default_interfaces }}' | tee /etc/network/interfaces
|
||||||
|
mkdir -p /etc/network/interfaces.d
|
||||||
|
chage -I -1 -d -1 -m 0 -M 99999 -E -1 root
|
||||||
|
|
||||||
# This forces any modified configurations to remain, and any unmodified configs to be replaced
|
# This forces any modified configurations to remain, and any unmodified configs to be replaced
|
||||||
# ref: http://serverfault.com/questions/259226/automatically-keep-current-version-of-config-files-when-apt-get-install
|
# ref: http://serverfault.com/questions/259226/automatically-keep-current-version-of-config-files-when-apt-get-install
|
||||||
@ -124,4 +134,14 @@ lxc_cached_network_interfaces:
|
|||||||
- src: "lxc-net-bridge.cfg.j2"
|
- src: "lxc-net-bridge.cfg.j2"
|
||||||
dest: "/etc/network/interfaces.d/lxc-net-bridge.cfg"
|
dest: "/etc/network/interfaces.d/lxc-net-bridge.cfg"
|
||||||
|
|
||||||
|
lxc_container_default_interfaces: |
|
||||||
|
# The loopback network interface
|
||||||
|
auto lo
|
||||||
|
iface lo inet loopback
|
||||||
|
# LXC interface, this is ALWAYS assumed to be DHCP.
|
||||||
|
auto eth0
|
||||||
|
iface eth0 inet dhcp
|
||||||
|
# Load any additional configs
|
||||||
|
source /etc/network/interfaces.d/*.cfg
|
||||||
|
|
||||||
lxc_default_release: "trusty-backports"
|
lxc_default_release: "trusty-backports"
|
||||||
|
@ -65,6 +65,16 @@ lxc_cache_map:
|
|||||||
userdel --force --remove ubuntu || true
|
userdel --force --remove ubuntu || true
|
||||||
apt-get clean
|
apt-get clean
|
||||||
mkdir -p /var/backup
|
mkdir -p /var/backup
|
||||||
|
if [ -f "/usr/lib/systemd/system/poweroff.target" ];then
|
||||||
|
ln -sf /usr/lib/systemd/system/poweroff.target /etc/systemd/system/sigpwr.target || true
|
||||||
|
fi
|
||||||
|
ln -s /dev/null /etc/systemd/system/systemd-udevd.service || true
|
||||||
|
ln -s /dev/null /etc/systemd/system/systemd-udevd-control.socket || true
|
||||||
|
ln -s /dev/null /etc/systemd/system/systemd-udevd-kernel.socket || true
|
||||||
|
ln -s /dev/null /etc/systemd/system/proc-sys-fs-binfmt_misc.automount || true
|
||||||
|
echo -e '{{ lxc_container_default_interfaces }}' | tee /etc/network/interfaces
|
||||||
|
mkdir -p /etc/network/interfaces.d
|
||||||
|
chage -I -1 -d -1 -m 0 -M 99999 -E -1 root
|
||||||
|
|
||||||
# This forces any modified configurations to remain, and any unmodified configs to be replaced
|
# This forces any modified configurations to remain, and any unmodified configs to be replaced
|
||||||
# ref: http://serverfault.com/questions/259226/automatically-keep-current-version-of-config-files-when-apt-get-install
|
# ref: http://serverfault.com/questions/259226/automatically-keep-current-version-of-config-files-when-apt-get-install
|
||||||
@ -80,3 +90,13 @@ lxc_cache_packages:
|
|||||||
lxc_cached_network_interfaces:
|
lxc_cached_network_interfaces:
|
||||||
- src: "lxc-net-bridge.cfg.j2"
|
- src: "lxc-net-bridge.cfg.j2"
|
||||||
dest: "/etc/network/interfaces.d/lxc-net-bridge.cfg"
|
dest: "/etc/network/interfaces.d/lxc-net-bridge.cfg"
|
||||||
|
|
||||||
|
lxc_container_default_interfaces: |
|
||||||
|
# The loopback network interface
|
||||||
|
auto lo
|
||||||
|
iface lo inet loopback
|
||||||
|
# LXC interface, this is ALWAYS assumed to be DHCP.
|
||||||
|
auto eth0
|
||||||
|
iface eth0 inet dhcp
|
||||||
|
# Load any additional configs
|
||||||
|
source /etc/network/interfaces.d/*.cfg
|
||||||
|
Loading…
x
Reference in New Issue
Block a user