From 2c23f2d445fb6208b2fe1423845efd29b8e0408d Mon Sep 17 00:00:00 2001 From: Ryan Hallisey Date: Thu, 17 Sep 2015 13:03:52 -0400 Subject: Replace config-external with a JSON file for Neutron (thin) This is only for the Neutron thin containers. The Neutron agents are still in a fat container. I'll replace in another patch. Change-Id: I8533af52bfa3f268aa8ffb1c16ae49f5a300da27 Partially-Implements: blueprint replace-config-external --- docker/neutron/neutron-linuxbridge-agent/start.sh | 10 ++++------ docker/neutron/neutron-openvswitch-agent/start.sh | 10 ++++------ docker/neutron/neutron-server/start.sh | 10 ++++------ 3 files changed, 12 insertions(+), 18 deletions(-) (limited to 'docker') diff --git a/docker/neutron/neutron-linuxbridge-agent/start.sh b/docker/neutron/neutron-linuxbridge-agent/start.sh index ab47f2dfb..f02472648 100755 --- a/docker/neutron/neutron-linuxbridge-agent/start.sh +++ b/docker/neutron/neutron-linuxbridge-agent/start.sh @@ -1,14 +1,12 @@ #!/bin/bash set -o errexit -CMD="/usr/bin/neutron-linuxbridge-agent" -ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini" - # Loading common functions. source /opt/kolla/kolla-common.sh source /opt/kolla/config-sudoers.sh -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) -exec $CMD $ARGS +exec $CMD diff --git a/docker/neutron/neutron-openvswitch-agent/start.sh b/docker/neutron/neutron-openvswitch-agent/start.sh index 6d62ff65d..f02472648 100755 --- a/docker/neutron/neutron-openvswitch-agent/start.sh +++ b/docker/neutron/neutron-openvswitch-agent/start.sh @@ -1,14 +1,12 @@ #!/bin/bash set -o errexit -CMD="/usr/bin/neutron-openvswitch-agent" -ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini" - # Loading common functions. source /opt/kolla/kolla-common.sh source /opt/kolla/config-sudoers.sh -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) -exec $CMD $ARGS +exec $CMD diff --git a/docker/neutron/neutron-server/start.sh b/docker/neutron/neutron-server/start.sh index 51c4c2a3d..c6ae197d4 100755 --- a/docker/neutron/neutron-server/start.sh +++ b/docker/neutron/neutron-server/start.sh @@ -1,14 +1,12 @@ #!/bin/bash set -o errexit -CMD="/usr/bin/neutron-server" -ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini" - # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. @@ -17,4 +15,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -exec $CMD $ARGS +exec $CMD -- cgit v1.2.3