aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-controller/nova-novncproxy
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-24 17:52:38 +0000
committerGerrit Code Review <review@openstack.org>2015-05-24 17:52:39 +0000
commit6b5e691c86fc2c9077ac9aae835e6a07fddd8e42 (patch)
tree1ca0f5e71ea98b8fef4866acb20c9777d2a73ad1 /docker/nova-controller/nova-novncproxy
parentac97b74052cf3d928ae0a77728bd3bfbc8641eed (diff)
parent13062e23e86b5d86020949754540460cb5b0b4fe (diff)
downloadkolla-6b5e691c86fc2c9077ac9aae835e6a07fddd8e42.tar.gz
kolla-6b5e691c86fc2c9077ac9aae835e6a07fddd8e42.zip
Merge "Restructure builds to allow more flexibility"
Diffstat (limited to 'docker/nova-controller/nova-novncproxy')
-rw-r--r--docker/nova-controller/nova-novncproxy/Dockerfile10
l---------docker/nova-controller/nova-novncproxy/build1
-rwxr-xr-xdocker/nova-controller/nova-novncproxy/start.sh22
3 files changed, 0 insertions, 33 deletions
diff --git a/docker/nova-controller/nova-novncproxy/Dockerfile b/docker/nova-controller/nova-novncproxy/Dockerfile
deleted file mode 100644
index 682625853..000000000
--- a/docker/nova-controller/nova-novncproxy/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 \
- novnc openstack-nova-novncproxy && \
- yum clean all
-
-ADD start.sh /start.sh
-
-CMD ["/start.sh"]
diff --git a/docker/nova-controller/nova-novncproxy/build b/docker/nova-controller/nova-novncproxy/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-novncproxy/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/nova-controller/nova-novncproxy/start.sh b/docker/nova-controller/nova-novncproxy/start.sh
deleted file mode 100755
index 9edafbca3..000000000
--- a/docker/nova-controller/nova-novncproxy/start.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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