diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-05-12 12:11:40 -0700 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-05-12 12:11:40 -0700 |
| commit | fa51eb4b5377e4725c0438fbfe85cdacdab8b3fe (patch) | |
| tree | 3e29ea324d4bfe4be6f372d25df36c0dd78d4071 /tools | |
| parent | 57990a94aeac87e2ba5e25848215dcd4a0dbb9e3 (diff) | |
| download | kolla-fa51eb4b5377e4725c0438fbfe85cdacdab8b3fe.tar.gz kolla-fa51eb4b5377e4725c0438fbfe85cdacdab8b3fe.zip | |
Fixes Nova NoVNC
Previously, vnc was not completely working properly because
nova.conf config flags were not properly implemented in t he correct
containers.
This patch moves the nova.conf config flags for vnc to the proper
containers. Additionally, the patch modifies the proxy client ip
param to be consistent with the param within nova.conf and adds
all the novnc params to docs.
Change-Id: I1944baca64ccd113bbca582784b08f90dc0eff69
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/genenv | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/genenv b/tools/genenv index 483c792dd..3b0c4d2b8 100755 --- a/tools/genenv +++ b/tools/genenv @@ -86,9 +86,10 @@ NOVA_FLAT_INTERFACE=eth1 ENABLED_APIS=ec2,osapi_compute,metadata METADATA_HOST=$HOST_IP NOVA_NOVNC_PROXY_PORT=6080 +NOVA_VNCSERVER_LISTEN_ADDRESS=$HOST_IP +NOVA_VNCSERVER_PROXYCLIENT_ADDRESS=$HOST_IP NOVA_NOVNC_PROXY_SERVICE_HOST=0.0.0.0 NOVA_NOVNC_BASE_ADDRESS=${PUBLIC_IP} -NOVA_NOVNC_PROXYCLIENT_IP=${PUBLIC_IP} # Neutron NEUTRON_DB_NAME=neutron @@ -142,6 +143,8 @@ NOVA_SCHEDULER_LOG_FILE=$NOVA_SCHEDULER_LOG_FILE NOVA_COMPUTE_LOG_FILE=$NOVA_COMPUTE_LOG_FILE NOVA_CONSOLEAUTH_LOG_FILE=$NOVA_CONSOLEAUTH_LOG_FILE NOVA_NOVNCPROXY_LOG_FILE=$NOVA_NOVNCPROXY_LOG_FILE +NOVA_VNCSERVER_PROXYCLIENT_ADDRESS=$NOVA_VNCSERVER_PROXYCLIENT_ADDRESS +NOVA_VNCSERVER_LISTEN_ADDRESS=$NOVA_VNCSERVER_LISTEN_ADDRESS NEUTRON_SERVER_LOG_FILE=$NEUTRON_SERVER_LOG_FILE NEUTRON_L3_AGENT_LOG_FILE=$NEUTRON_L3_AGENT_LOG_FILE NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE=$NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE @@ -185,7 +188,6 @@ NOVA_KEYSTONE_USER=$NOVA_KEYSTONE_USER NOVA_NOVNC_PROXY_SERVICE_HOST=$NOVA_NOVNC_PROXY_SERVICE_HOST NOVA_NOVNC_PROXY_PORT=$NOVA_NOVNC_PROXY_PORT NOVA_NOVNC_BASE_ADDRESS=${NOVA_NOVNC_BASE_ADDRESS} -NOVA_NOVNC_PROXYCLIENT_IP=${NOVA_NOVNC_PROXYCLIENT_IP} NEUTRON_SHARED_SECRET=$NEUTRON_SHARED_SECRET NEUTRON_DB_NAME=$NEUTRON_DB_NAME NEUTRON_DB_USER=$NEUTRON_DB_USER |