openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Remove heat_docker_agent/run-os-net-config"

This commit is contained in:
Jenkins 2016-12-21 12:52:30 +00:00 committed by Gerrit Code Review
parent 44f7a1de75 b170a6772d
commit 4f64b9059f
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat_docker_agent/Dockerfile
View File

@ -13,14 +13,6 @@ ADD 50-heat-config-docker-cmd /usr/libexec/os-refresh-config/configure.d/50-heat
ADD configure_container.sh /tmp/
RUN /tmp/configure_container.sh && rm /tmp/configure_container.sh
# This is a script which:
# - Copies the existing network interface configs from the host to the agent.
# - Configures os-net-config
# - Runs os-net-config in the agent.
#
# All of this is triggered from the heat templates.
ADD run-os-net-config /usr/local/bin/
# create volumes to share the host directories
VOLUME [ "/var/lib/cloud"]
VOLUME [ "/var/lib/heat-cfntools" ]

12
heat_docker_agent/run-os-net-config
View File

@ -1,12 +0,0 @@
#!/bin/bash
set -eux
# Be sure to copy existing interface configs from the host so that we can properly
# ifdown them before bringing up new config.
cp /host/etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/network-scripts/
NET_CONFIG=$(os-apply-config --key os_net_config --type raw --key-default '')
if [ -n "$NET_CONFIG" ]; then
os-net-config -c /etc/os-net-config/config.json -v
fi