From 5ffc66cd69e1cda087056da25ab25548dacb1d32 Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Tue, 5 May 2015 00:37:23 +0200 Subject: Add a novnc container running the novnc-proxy. All VNC-specific configuration bits are moved from nova-api-base to nova-compute and the new nova-novncproxy and nova-consoleauth containers. The compose specification has been updated to reflect this. A future patch will make the desired backend configurable (spice/vnc). Change-Id: I8b64abf125fd1ecd7d3463515e3717dd9bd60420 Blueprint: novnc-container --- tools/genenv | 12 ++++++++++++ tools/kolla | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/genenv b/tools/genenv index 3fbb55e63..ecd648e5a 100755 --- a/tools/genenv +++ b/tools/genenv @@ -40,6 +40,8 @@ NOVA_API_LOG_FILE= NOVA_CONDUCTOR_LOG_FILE= NOVA_SCHEDULER_LOG_FILE= NOVA_COMPUTE_LOG_FILE= +NOVA_CONSOLEAUTH_LOG_FILE= +NOVA_NOVNCPROXY_LOG_FILE= NEUTRON_SERVER_LOG_FILE= NEUTRON_L3_AGENT_LOG_FILE= NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE= @@ -83,6 +85,10 @@ NOVA_PUBLIC_INTERFACE=$MY_DEV NOVA_FLAT_INTERFACE=eth1 ENABLED_APIS=ec2,osapi_compute,metadata METADATA_HOST=$HOST_IP +NOVA_NOVNC_PROXY_PORT=6080 +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 @@ -127,6 +133,8 @@ NOVA_API_LOG_FILE=$NOVA_API_LOG_FILE NOVA_CONDUCTOR_LOG_FILE=$NOVA_CONDUCTOR_LOG_FILE 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 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 @@ -166,6 +174,10 @@ NOVA_EC2_API_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST NOVA_EC2_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST NOVA_KEYSTONE_PASSWORD=$NOVA_KEYSTONE_PASSWORD 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 diff --git a/tools/kolla b/tools/kolla index 26bf10ae9..805a5cca2 100755 --- a/tools/kolla +++ b/tools/kolla @@ -28,7 +28,7 @@ function process_all { process mariadb process keystone process glance-api-registry - process nova-api-conductor-scheduler + process nova-api-conductor-scheduler-consoleauth-novncproxy if [[ "${NETWORK_MANAGER}" == "nova" ]] ; then process nova-compute-network else -- cgit v1.2.3