diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:14:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:14:24 +0000 |
| commit | a1a3b55a06ac6effa94563b10b5adf5950392df2 (patch) | |
| tree | 3a9308df1afdf015db8c8a7635299bf4236ce708 /docker/common/nova/nova-consoleauth | |
| parent | bb03d5f6bffa1d6f8195d7a1b0561c2026c95963 (diff) | |
| parent | d6cdd9da20ca3337af9ec7bc3abc04221627c236 (diff) | |
| download | kolla-a1a3b55a06ac6effa94563b10b5adf5950392df2.tar.gz kolla-a1a3b55a06ac6effa94563b10b5adf5950392df2.zip | |
Merge "Remove config-internal for nova"
Diffstat (limited to 'docker/common/nova/nova-consoleauth')
| -rwxr-xr-x | docker/common/nova/nova-consoleauth/config-internal.sh | 11 | ||||
| -rwxr-xr-x | docker/common/nova/nova-consoleauth/start.sh | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/docker/common/nova/nova-consoleauth/config-internal.sh b/docker/common/nova/nova-consoleauth/config-internal.sh deleted file mode 100755 index a1b0864ac..000000000 --- a/docker/common/nova/nova-consoleauth/config-internal.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e - -. /opt/kolla/config-nova.sh - -cfg=/etc/nova/nova.conf - -crudini --set $cfg DEFAULT log_file "${NOVA_CONSOLEAUTH_LOG_FILE}" - -echo Starting nova-consoleauth -exec /usr/bin/nova-consoleauth diff --git a/docker/common/nova/nova-consoleauth/start.sh b/docker/common/nova/nova-consoleauth/start.sh index 88f1b7a6b..1abccde19 100755 --- a/docker/common/nova/nova-consoleauth/start.sh +++ b/docker/common/nova/nova-consoleauth/start.sh @@ -7,7 +7,7 @@ ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS |
