diff options
| author | Harm Weites <harm@weites.com> | 2015-07-02 19:49:11 +0200 |
|---|---|---|
| committer | Harm Weites <harm@weites.com> | 2015-07-03 08:39:43 +0200 |
| commit | 0de08336754cbff67d320fcf5d68ad97243f96ec (patch) | |
| tree | 8d1439bc07098ee823b83c8765af55c9d1415989 /docker/common/nova-compute/nova-network | |
| parent | 3a4500c1220f11aa01faabf3ae4e74b6697861c0 (diff) | |
| download | kolla-0de08336754cbff67d320fcf5d68ad97243f96ec.tar.gz kolla-0de08336754cbff67d320fcf5d68ad97243f96ec.zip | |
Add config-internal/config-external to Nova-compute containers
Partially Implements: Blueprint standard-start
Change-Id: Ia219015f18d788d0c01c0bffee6b475bb07291a9
Diffstat (limited to 'docker/common/nova-compute/nova-network')
3 files changed, 27 insertions, 4 deletions
diff --git a/docker/common/nova-compute/nova-network/config-external.sh b/docker/common/nova-compute/nova-network/config-external.sh new file mode 100755 index 000000000..7c1d6bb37 --- /dev/null +++ b/docker/common/nova-compute/nova-network/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/nova-network/nova.conf" +TARGET="/etc/nova/nova.conf" +OWNER="nova" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker/common/nova-compute/nova-network/config-internal.sh b/docker/common/nova-compute/nova-network/config-internal.sh new file mode 100755 index 000000000..92381b720 --- /dev/null +++ b/docker/common/nova-compute/nova-network/config-internal.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +. /opt/kolla/config-nova-network.sh + +# Start nova-network +exec /usr/bin/nova-network --config-file /etc/nova/nova.conf diff --git a/docker/common/nova-compute/nova-network/start.sh b/docker/common/nova-compute/nova-network/start.sh index 92381b720..b6faa8215 100755 --- a/docker/common/nova-compute/nova-network/start.sh +++ b/docker/common/nova-compute/nova-network/start.sh @@ -1,8 +1,13 @@ #!/bin/bash +set -o errexit -set -e +CMD="/usr/bin/nova-network" +ARGS="" -. /opt/kolla/config-nova-network.sh +# Loading common functions. +source /opt/kolla/kolla-common.sh -# Start nova-network -exec /usr/bin/nova-network --config-file /etc/nova/nova.conf +# Config-internal script exec out of this function, it does not return here. +set_configs + +exec $CMD $ARGS |