diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-03 07:15:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-03 07:15:30 +0000 |
| commit | 5dafe4e77959f96094842082d9bd69e626c3560a (patch) | |
| tree | c794ce914b51d820e2f31c0adb29a091f460c55d /docker/common/nova-controller/nova-novncproxy | |
| parent | 0dbf3e2e1186ede177aa053ebc8c738d996d50ff (diff) | |
| parent | 9970519b4ed752b4a33e6125d1d09d51b75b8c5b (diff) | |
| download | kolla-5dafe4e77959f96094842082d9bd69e626c3560a.tar.gz kolla-5dafe4e77959f96094842082d9bd69e626c3560a.zip | |
Merge "Add config-internal/config-external to Nova-controller containers"
Diffstat (limited to 'docker/common/nova-controller/nova-novncproxy')
3 files changed, 40 insertions, 17 deletions
diff --git a/docker/common/nova-controller/nova-novncproxy/config-external.sh b/docker/common/nova-controller/nova-novncproxy/config-external.sh new file mode 100755 index 000000000..fdc33a5bd --- /dev/null +++ b/docker/common/nova-controller/nova-novncproxy/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/nova-novncproxy/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-controller/nova-novncproxy/config-internal.sh b/docker/common/nova-controller/nova-novncproxy/config-internal.sh new file mode 100755 index 000000000..9edafbca3 --- /dev/null +++ b/docker/common/nova-controller/nova-novncproxy/config-internal.sh @@ -0,0 +1,22 @@ +#!/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 diff --git a/docker/common/nova-controller/nova-novncproxy/start.sh b/docker/common/nova-controller/nova-novncproxy/start.sh index 9edafbca3..aec5ce759 100755 --- a/docker/common/nova-controller/nova-novncproxy/start.sh +++ b/docker/common/nova-controller/nova-novncproxy/start.sh @@ -1,22 +1,13 @@ #!/bin/bash -set -e -. /opt/kolla/kolla-common.sh +set -o errexit -cfg=/etc/nova/nova.conf +CMD="/usr/bin/nova-novncproxy" +ARGS="" -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 +# Loading common functions. +source /opt/kolla/kolla-common.sh -crudini --set $cfg DEFAULT log_file "${NOVA_NOVNCPROXY_LOG_FILE}" +# Config-internal script exec out of this function, it does not return here. +set_configs -# 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 +exec $CMD $ARGS |