diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-03 07:15:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-03 07:15:30 +0000 |
| commit | 5dafe4e77959f96094842082d9bd69e626c3560a (patch) | |
| tree | c794ce914b51d820e2f31c0adb29a091f460c55d /docker/common/nova-controller/nova-scheduler | |
| parent | 0dbf3e2e1186ede177aa053ebc8c738d996d50ff (diff) | |
| parent | 9970519b4ed752b4a33e6125d1d09d51b75b8c5b (diff) | |
| download | kolla-5dafe4e77959f96094842082d9bd69e626c3560a.tar.gz kolla-5dafe4e77959f96094842082d9bd69e626c3560a.zip | |
Merge "Add config-internal/config-external to Nova-controller containers"
Diffstat (limited to 'docker/common/nova-controller/nova-scheduler')
3 files changed, 33 insertions, 10 deletions
diff --git a/docker/common/nova-controller/nova-scheduler/config-external.sh b/docker/common/nova-controller/nova-scheduler/config-external.sh new file mode 100755 index 000000000..3df0f9b7b --- /dev/null +++ b/docker/common/nova-controller/nova-scheduler/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/nova-scheduler/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-controller/nova-scheduler/config-internal.sh b/docker/common/nova-controller/nova-scheduler/config-internal.sh new file mode 100755 index 000000000..504c049ed --- /dev/null +++ b/docker/common/nova-controller/nova-scheduler/config-internal.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +. /opt/kolla/config-nova.sh + +check_required_vars NOVA_DB_NAME +fail_unless_db $NOVA_DB_NAME + +cfg=/etc/nova/nova.conf + +# configure logging +crudini --set $cfg DEFAULT log_file "${NOVA_SCHEDULER_LOG_FILE}" + +exec /usr/bin/nova-scheduler --config-file /etc/nova/nova.conf diff --git a/docker/common/nova-controller/nova-scheduler/start.sh b/docker/common/nova-controller/nova-scheduler/start.sh index 504c049ed..a578b95a6 100755 --- a/docker/common/nova-controller/nova-scheduler/start.sh +++ b/docker/common/nova-controller/nova-scheduler/start.sh @@ -1,15 +1,13 @@ #!/bin/bash +set -o errexit -set -e +CMD="/usr/bin/nova-scheduler" +ARGS="" -. /opt/kolla/config-nova.sh +# Loading common functions. +source /opt/kolla/kolla-common.sh -check_required_vars NOVA_DB_NAME -fail_unless_db $NOVA_DB_NAME +# Config-internal script exec out of this function, it does not return here. +set_configs -cfg=/etc/nova/nova.conf - -# configure logging -crudini --set $cfg DEFAULT log_file "${NOVA_SCHEDULER_LOG_FILE}" - -exec /usr/bin/nova-scheduler --config-file /etc/nova/nova.conf +exec $CMD $ARGS |
