diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-24 17:52:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-24 17:52:39 +0000 |
| commit | 6b5e691c86fc2c9077ac9aae835e6a07fddd8e42 (patch) | |
| tree | 1ca0f5e71ea98b8fef4866acb20c9777d2a73ad1 /docker/nova-controller/nova-consoleauth | |
| parent | ac97b74052cf3d928ae0a77728bd3bfbc8641eed (diff) | |
| parent | 13062e23e86b5d86020949754540460cb5b0b4fe (diff) | |
| download | kolla-6b5e691c86fc2c9077ac9aae835e6a07fddd8e42.tar.gz kolla-6b5e691c86fc2c9077ac9aae835e6a07fddd8e42.zip | |
Merge "Restructure builds to allow more flexibility"
Diffstat (limited to 'docker/nova-controller/nova-consoleauth')
| -rw-r--r-- | docker/nova-controller/nova-consoleauth/Dockerfile | 8 | ||||
| l--------- | docker/nova-controller/nova-consoleauth/build | 1 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-consoleauth/start.sh | 11 |
3 files changed, 0 insertions, 20 deletions
diff --git a/docker/nova-controller/nova-consoleauth/Dockerfile b/docker/nova-controller/nova-consoleauth/Dockerfile deleted file mode 100644 index 576c91b5a..000000000 --- a/docker/nova-controller/nova-consoleauth/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-nova-console && yum clean all - -ADD start.sh /start.sh - -CMD ["/start.sh"] diff --git a/docker/nova-controller/nova-consoleauth/build b/docker/nova-controller/nova-consoleauth/build deleted file mode 120000 index 43944faa0..000000000 --- a/docker/nova-controller/nova-consoleauth/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/nova-controller/nova-consoleauth/start.sh b/docker/nova-controller/nova-consoleauth/start.sh deleted file mode 100755 index a1b0864ac..000000000 --- a/docker/nova-controller/nova-consoleauth/start.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/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 |