aboutsummaryrefslogtreecommitdiff
path: root/docker/common/nova/nova-api
diff options
context:
space:
mode:
authorSwapnil Kulkarni <me@coolsvap.net>2015-07-15 10:32:21 +0000
committerSwapnil Kulkarni <me@coolsvap.net>2015-07-16 11:37:40 +0000
commit51b7915ae8094fe149ff1752be01d6ff29fed15e (patch)
treed96b1ee8b7898f7ea22006990cc8f2a9572aa45e /docker/common/nova/nova-api
parent5c8561b1d71cf9d20dc533a1cf369cd9dbaeadb5 (diff)
downloadkolla-51b7915ae8094fe149ff1752be01d6ff29fed15e.tar.gz
kolla-51b7915ae8094fe149ff1752be01d6ff29fed15e.zip
Updated directory structure to make it consistent
Closes-Bug: #1474774 Change-Id: Id61d777a8b741c800e0d034e3ee889c11bcf5fbc
Diffstat (limited to 'docker/common/nova/nova-api')
-rwxr-xr-xdocker/common/nova/nova-api/check.sh17
-rwxr-xr-xdocker/common/nova/nova-api/config-external.sh10
-rwxr-xr-xdocker/common/nova/nova-api/config-internal.sh46
-rwxr-xr-xdocker/common/nova/nova-api/start.sh20
4 files changed, 93 insertions, 0 deletions
diff --git a/docker/common/nova/nova-api/check.sh b/docker/common/nova/nova-api/check.sh
new file mode 100755
index 000000000..b250682d8
--- /dev/null
+++ b/docker/common/nova/nova-api/check.sh
@@ -0,0 +1,17 @@
+#!/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
+
diff --git a/docker/common/nova/nova-api/config-external.sh b/docker/common/nova/nova-api/config-external.sh
new file mode 100755
index 000000000..d0859893d
--- /dev/null
+++ b/docker/common/nova/nova-api/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-api/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/nova-api/config-internal.sh b/docker/common/nova/nova-api/config-internal.sh
new file mode 100755
index 000000000..7928370a4
--- /dev/null
+++ b/docker/common/nova/nova-api/config-internal.sh
@@ -0,0 +1,46 @@
+#!/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
diff --git a/docker/common/nova/nova-api/start.sh b/docker/common/nova/nova-api/start.sh
new file mode 100755
index 000000000..0d7ffca9b
--- /dev/null
+++ b/docker/common/nova/nova-api/start.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/nova-api"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Config-internal script exec out of this function, it does not return here.
+set_configs
+
+# 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
+ su -s /bin/sh -c "nova-manage db sync" nova
+ exit 0
+fi
+
+exec $CMD $ARGS