6 files changed, 6 insertions, 134 deletions
diff --git a/docker/centos/binary/nova-controller/nova-api/check.sh b/docker/centos/binary/nova-controller/nova-api/check.sh
index b250682d8..2a047038e 100755..120000
--- a/docker/centos/binary/nova-controller/nova-api/check.sh
+++ b/docker/centos/binary/nova-controller/nova-api/check.sh
@@ -1,17 +1 @@
-#!/bin/bash
-
-RES=0
-
-. /openrc
-if ! keystone token-get > /dev/null; then
-    echo "ERROR: keystone token-get failed" >&2
-    RES=1
-else
-    if ! nova list > /dev/null; then
-        echo "ERROR: nova list failed" >&2
-        RES=1
-    fi
-fi
-
-exit $RES
-
+../../../../common/nova-controller/nova-api/check.sh
+\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/start.sh b/docker/centos/binary/nova-controller/nova-api/start.sh
index 7928370a4..7613d713a 100755..120000
--- a/docker/centos/binary/nova-controller/nova-api/start.sh
+++ b/docker/centos/binary/nova-controller/nova-api/start.sh
@@ -1,46 +1 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/config-nova.sh
-
-check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
-                    NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \
-                    ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \
-                    NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME
-fail_unless_os_service_running keystone
-fail_unless_db $NOVA_DB_NAME
-
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
-
-cfg=/etc/nova/nova.conf
-
-# configure logging
-crudini --set $cfg DEFAULT log_file "${NOVA_API_LOG_FILE}"
-
-crux user-create --update \
-    -n "${NOVA_KEYSTONE_USER}" \
-    -p "${NOVA_KEYSTONE_PASSWORD}" \
-    -t "${ADMIN_TENANT_NAME}" \
-    -r admin
-
-crux endpoint-create --remove-all \
-    -n ec2 -t ec2 \
-    -I "http://${NOVA_EC2_API_SERVICE_HOST}:8773/services/Cloud" \
-    -P "http://${PUBLIC_IP}:8773/services/Cloud" \
-    -A "http://${NOVA_EC2_API_SERVICE_HOST}:8773/services/Admin"
-
-crux endpoint-create --remove-all \
-    -n nova -t compute \
-    -I "http://${NOVA_API_SERVICE_HOST}:8774/v2/\$(tenant_id)s" \
-    -P "http://${PUBLIC_IP}:8774/v2/\$(tenant_id)s" \
-    -A "http://${NOVA_API_SERVICE_HOST}:8774/v2/\$(tenant_id)s"
-
-crux endpoint-create --remove-all \
-    -n novav3 -t computev3 \
-    -I "http://${NOVA_API_SERVICE_HOST}:8774/v3" \
-    -P "http://${PUBLIC_IP}:8774/v3" \
-    -A "http://${NOVA_API_SERVICE_HOST}:8774/v3"
-
-exec /usr/bin/nova-api --config-file /etc/nova/nova.conf
+../../../../common/nova-controller/nova-api/start.sh
+\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-conductor/start.sh b/docker/centos/binary/nova-controller/nova-conductor/start.sh
index 575e7ff6c..2b0dc28f8 100755..120000
--- a/docker/centos/binary/nova-controller/nova-conductor/start.sh
+++ b/docker/centos/binary/nova-controller/nova-conductor/start.sh
@@ -1,23 +1 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/config-nova.sh
-
-check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD
-fail_unless_db
-
-cfg=/etc/nova/nova.conf
-
-# configure logging
-crudini --set $cfg DEFAULT log_file "${NOVA_CONDUCTOR_LOG_FILE}"
-
-mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
-CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME};
-GRANT ALL PRIVILEGES ON ${NOVA_DB_NAME}.* TO
-	'${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}'
-EOF
-
-nova-manage db sync
-
-exec /usr/bin/nova-conductor --config-file /etc/nova/nova.conf
+../../../../common/nova-controller/nova-conductor/start.sh
+\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/start.sh b/docker/centos/binary/nova-controller/nova-consoleauth/start.sh
index a1b0864ac..0821b3c38 100755..120000
--- a/docker/centos/binary/nova-controller/nova-consoleauth/start.sh
+++ b/docker/centos/binary/nova-controller/nova-consoleauth/start.sh
@@ -1,11 +1 @@
-#!/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
+../../../../common/nova-controller/nova-consoleauth/start.sh
+\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/start.sh b/docker/centos/binary/nova-controller/nova-novncproxy/start.sh
index 9edafbca3..80b6459a4 100755..120000
--- a/docker/centos/binary/nova-controller/nova-novncproxy/start.sh
+++ b/docker/centos/binary/nova-controller/nova-novncproxy/start.sh
@@ -1,22 +1 @@
-#!/bin/bash
-set -e
-. /opt/kolla/kolla-common.sh
-
-cfg=/etc/nova/nova.conf
-
-check_required_vars PUBLIC_IP NOVA_NOVNC_PROXY_SERVICE_HOST NOVA_NOVNC_PROXY_PORT \
-                    NOVA_NOVNC_BASE_ADDRESS NOVA_VNCSERVER_LISTEN_ADDRESS \
-                    NOVA_VNCSERVER_PROXYCLIENT_ADDRESS
-
-crudini --set $cfg DEFAULT log_file "${NOVA_NOVNCPROXY_LOG_FILE}"
-
-# Listen on all interfaces on port $NOVA_NOVNC_PROXY_PORT for incoming novnc
-# requests.
-# The base_url is given to clients to connect to, like Horizon, so this could
-# very well be fancy DNS name.
-echo Configuring VNC...
-crudini --set $cfg DEFAULT vncserver_listen "${NOVA_VNCSERVER_LISTEN_ADDRESS}"
-crudini --set $cfg DEFAULT vncserver_proxyclient_address "${NOVA_VNCSERVER_PROXYCLIENT_ADDRESS}"
-
-echo Starting nova-novncproxy
-exec /usr/bin/nova-novncproxy
+../../../../common/nova-controller/nova-novncproxy/start.sh
+\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/start.sh b/docker/centos/binary/nova-controller/nova-scheduler/start.sh
index 504c049ed..a72115139 100755..120000
--- a/docker/centos/binary/nova-controller/nova-scheduler/start.sh
+++ b/docker/centos/binary/nova-controller/nova-scheduler/start.sh
@@ -1,15 +1 @@
-#!/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
+../../../../common/nova-controller/nova-scheduler/start.sh
+\ No newline at end of file