diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 10:34:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 10:34:58 +0000 |
| commit | aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30 (patch) | |
| tree | a131cd99311e41a6656773095e8bf02561a6b856 /docker/nova | |
| parent | 762b24cc1a29f6ba803ee2045d41f98d6adbed05 (diff) | |
| parent | 160f1cc0116bf93cfceffeb0149e525ba08eed3f (diff) | |
| download | kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.tar.gz kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.zip | |
Merge "remove set_configs"
Diffstat (limited to 'docker/nova')
| -rwxr-xr-x | docker/nova/nova-api/start.sh | 5 | ||||
| -rwxr-xr-x | docker/nova/nova-compute/start.sh | 5 | ||||
| -rwxr-xr-x | docker/nova/nova-conductor/start.sh | 5 | ||||
| -rwxr-xr-x | docker/nova/nova-consoleauth/start.sh | 5 | ||||
| -rwxr-xr-x | docker/nova/nova-libvirt/start.sh | 5 | ||||
| -rwxr-xr-x | docker/nova/nova-network/start.sh | 4 | ||||
| -rwxr-xr-x | docker/nova/nova-novncproxy/start.sh | 5 | ||||
| -rwxr-xr-x | docker/nova/nova-scheduler/start.sh | 5 |
8 files changed, 0 insertions, 39 deletions
diff --git a/docker/nova/nova-api/start.sh b/docker/nova/nova-api/start.sh index c61c37feb..6461777ca 100755 --- a/docker/nova/nova-api/start.sh +++ b/docker/nova/nova-api/start.sh @@ -4,10 +4,6 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -# 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. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then @@ -15,5 +11,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -echo "Running command: ${CMD}" exec $CMD diff --git a/docker/nova/nova-compute/start.sh b/docker/nova/nova-compute/start.sh index 6191ce851..a083e7bac 100755 --- a/docker/nova/nova-compute/start.sh +++ b/docker/nova/nova-compute/start.sh @@ -4,9 +4,4 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -# Generate run command -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) - -echo "Running command: ${CMD}" exec $CMD diff --git a/docker/nova/nova-conductor/start.sh b/docker/nova/nova-conductor/start.sh index 6191ce851..a083e7bac 100755 --- a/docker/nova/nova-conductor/start.sh +++ b/docker/nova/nova-conductor/start.sh @@ -4,9 +4,4 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -# Generate run command -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) - -echo "Running command: ${CMD}" exec $CMD diff --git a/docker/nova/nova-consoleauth/start.sh b/docker/nova/nova-consoleauth/start.sh index 6191ce851..a083e7bac 100755 --- a/docker/nova/nova-consoleauth/start.sh +++ b/docker/nova/nova-consoleauth/start.sh @@ -4,9 +4,4 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -# Generate run command -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) - -echo "Running command: ${CMD}" exec $CMD diff --git a/docker/nova/nova-libvirt/start.sh b/docker/nova/nova-libvirt/start.sh index 6191ce851..a083e7bac 100755 --- a/docker/nova/nova-libvirt/start.sh +++ b/docker/nova/nova-libvirt/start.sh @@ -4,9 +4,4 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -# Generate run command -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) - -echo "Running command: ${CMD}" exec $CMD diff --git a/docker/nova/nova-network/start.sh b/docker/nova/nova-network/start.sh index 2f8254b89..a083e7bac 100755 --- a/docker/nova/nova-network/start.sh +++ b/docker/nova/nova-network/start.sh @@ -4,8 +4,4 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) - -echo "Running command: ${CMD}" exec $CMD diff --git a/docker/nova/nova-novncproxy/start.sh b/docker/nova/nova-novncproxy/start.sh index 6191ce851..a083e7bac 100755 --- a/docker/nova/nova-novncproxy/start.sh +++ b/docker/nova/nova-novncproxy/start.sh @@ -4,9 +4,4 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -# Generate run command -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) - -echo "Running command: ${CMD}" exec $CMD diff --git a/docker/nova/nova-scheduler/start.sh b/docker/nova/nova-scheduler/start.sh index 6191ce851..a083e7bac 100755 --- a/docker/nova/nova-scheduler/start.sh +++ b/docker/nova/nova-scheduler/start.sh @@ -4,9 +4,4 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -# Generate run command -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) - -echo "Running command: ${CMD}" exec $CMD |