aboutsummaryrefslogtreecommitdiff
path: root/docker/common/nova/nova-novncproxy
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-07 18:07:11 +0000
committerSam Yaple <sam@yaple.net>2015-08-07 19:07:53 +0000
commitd6cdd9da20ca3337af9ec7bc3abc04221627c236 (patch)
tree054273244e0d8c86de695909adefba8edf119d47 /docker/common/nova/nova-novncproxy
parenta5e907a8e91bc4e1d8f563dc79db0ee96c15d380 (diff)
downloadkolla-d6cdd9da20ca3337af9ec7bc3abc04221627c236.tar.gz
kolla-d6cdd9da20ca3337af9ec7bc3abc04221627c236.zip
Remove config-internal for nova
Change-Id: I7dec09e46232f25fd396d1f2f4076f599833f5e5 Partially-implements: blueprint remove-config-internal
Diffstat (limited to 'docker/common/nova/nova-novncproxy')
-rwxr-xr-xdocker/common/nova/nova-novncproxy/config-internal.sh25
-rwxr-xr-xdocker/common/nova/nova-novncproxy/start.sh2
2 files changed, 1 insertions, 26 deletions
diff --git a/docker/common/nova/nova-novncproxy/config-internal.sh b/docker/common/nova/nova-novncproxy/config-internal.sh
deleted file mode 100755
index 6ddea5a76..000000000
--- a/docker/common/nova/nova-novncproxy/config-internal.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -e
-. /opt/kolla/kolla-common.sh
-
-cfg=/etc/nova/nova.conf
-
-check_required_vars NOVA_NOVNC_BASE_ADDRESS \
- NOVA_NOVNC_PROXY_PORT \
- NOVA_NOVNC_PROXY_SERVICE_HOST \
- NOVA_VNCSERVER_LISTEN_ADDRESS \
- NOVA_VNCSERVER_PROXYCLIENT_ADDRESS \
- PUBLIC_IP
-
-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
diff --git a/docker/common/nova/nova-novncproxy/start.sh b/docker/common/nova/nova-novncproxy/start.sh
index aec5ce759..6e59d1253 100755
--- a/docker/common/nova/nova-novncproxy/start.sh
+++ b/docker/common/nova/nova-novncproxy/start.sh
@@ -7,7 +7,7 @@ ARGS=""
# Loading common functions.
source /opt/kolla/kolla-common.sh
-# Config-internal script exec out of this function, it does not return here.
+# Execute config strategy
set_configs
exec $CMD $ARGS