From 9970519b4ed752b4a33e6125d1d09d51b75b8c5b Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Thu, 2 Jul 2015 14:24:33 +0200 Subject: Add config-internal/config-external to Nova-controller containers Partially Implements: Blueprint standard-start Change-Id: I40a863161bee779a944e9388a1ad7d5d0e7adba7 --- .../nova-conductor/config-external.sh | 10 +++++++ .../nova-conductor/config-internal.sh | 26 ++++++++++++++++++ .../common/nova-controller/nova-conductor/start.sh | 32 +++++++++------------- 3 files changed, 49 insertions(+), 19 deletions(-) create mode 100755 docker/common/nova-controller/nova-conductor/config-external.sh create mode 100755 docker/common/nova-controller/nova-conductor/config-internal.sh (limited to 'docker/common/nova-controller/nova-conductor') diff --git a/docker/common/nova-controller/nova-conductor/config-external.sh b/docker/common/nova-controller/nova-conductor/config-external.sh new file mode 100755 index 000000000..ea3b123ec --- /dev/null +++ b/docker/common/nova-controller/nova-conductor/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/nova-conductor/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-conductor/config-internal.sh b/docker/common/nova-controller/nova-conductor/config-internal.sh new file mode 100755 index 000000000..3bba8cf3a --- /dev/null +++ b/docker/common/nova-controller/nova-conductor/config-internal.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +set -e + +. /opt/kolla/config-nova.sh + +check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD \ + INIT_NOVA_DB +fail_unless_db + +cfg=/etc/nova/nova.conf + +# configure logging +crudini --set $cfg DEFAULT log_file "${NOVA_CONDUCTOR_LOG_FILE}" + +if [ "${INIT_NOVA_DB}" == "true" ]; then + mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <