aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-controller/nova-api
diff options
context:
space:
mode:
Diffstat (limited to 'docker/nova-controller/nova-api')
-rw-r--r--docker/nova-controller/nova-api/Dockerfile10
l---------docker/nova-controller/nova-api/build1
-rwxr-xr-xdocker/nova-controller/nova-api/check.sh17
-rwxr-xr-xdocker/nova-controller/nova-api/start.sh46
4 files changed, 0 insertions, 74 deletions
diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/nova-controller/nova-api/Dockerfile
deleted file mode 100644
index 7abd32087..000000000
--- a/docker/nova-controller/nova-api/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
- openstack-nova-api && yum clean all
-
-ADD ./start.sh /start.sh
-ADD ./check.sh /check.sh
-
-CMD ["/start.sh"]
diff --git a/docker/nova-controller/nova-api/build b/docker/nova-controller/nova-api/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/nova-controller/nova-api/check.sh b/docker/nova-controller/nova-api/check.sh
deleted file mode 100755
index b250682d8..000000000
--- a/docker/nova-controller/nova-api/check.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh
deleted file mode 100755
index 7928370a4..000000000
--- a/docker/nova-controller/nova-api/start.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/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