Remove standard container prep as it has moved

With https://review.openstack.org/354097 the container prep and
network config for eth0 into the cache preparation.

This patch therefore removes the duplicated prep.

Change-Id: If9abcff780fbf97b83b6f46704088adead30e910
Depends-On: Ia8c0bb759b5df29f1b3a5e11230040ffc6e97362
This commit is contained in:
Jesse Pretorius 2016-08-11 11:31:33 -05:00
parent ec1a9c7ce4
commit 56792db4db
4 changed files with 0 additions and 66 deletions

View File

@ -107,7 +107,6 @@
lxc_container:
name: "{{ inventory_hostname }}"
container_command: |
{{ lxc_container_map.prep_commands }}
{{ lxc_container_commands }}
delegate_to: "{{ physical_host }}"
tags:

View File

@ -21,14 +21,6 @@ lxc_container_interface: |
DELAY=0
### end generated network for [ {{ item.value.interface }} ] ###
# Default interface file
lxc_container_default_interfaces: |
DEVICE=eth0
BOOTPROTO=dhcp
ONBOOT=yes
NM_CONTROLLED=no
TYPE=Ethernet
lxc_container_default_route_interfaces:
route_file: "/etc/sysconfig/network-scripts/route-{{ item.value.interface }}"
route_setup: |
@ -43,14 +35,3 @@ lxc_container_map:
distro: centos
arch: amd64
release: 7
prep_commands: |
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

View File

@ -28,17 +28,6 @@ lxc_container_interface: |
{% endif %}
### end generated network for [ {{ item.value.interface }} ] ###
# Default interface file
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
# Notice this is already resolved in the debian interface file
lxc_container_default_route_interfaces:
route_file: "/dev/null"
@ -51,15 +40,3 @@ lxc_container_map:
distro: ubuntu
arch: "{{ lxc_architecture_mapping.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
release: trusty
prep_commands: |
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

View File

@ -28,17 +28,6 @@ lxc_container_interface: |
{% endif %}
### end generated network for [ {{ item.value.interface }} ] ###
# Default interface file
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
# Notice this is already resolved in the debian interface file
lxc_container_default_route_interfaces:
route_file: "/dev/null"
@ -51,15 +40,3 @@ lxc_container_map:
distro: ubuntu
arch: "{{ lxc_architecture_mapping.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
release: xenial
prep_commands: |
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