Browse code
Remove VNC server listen addresses seeting to IPv4 from base job
'devstack' job set the VNC listen addresses 'VNCSERVER_LISTEN' and
'VNCSERVER_PROXYCLIENT_ADDRESS' IPv4 which makes 'devstack-ipv6' job
to either unset those or set for IPv6 values.
Let's remove the setting of those in base job and let lib/nova
set based on configured ip version from job.
'devstack-ipv6' base job will be used to define the IPv6-only jobs
on Tempest and project side gate.
Change-Id: Iea469128b15298aee61245e702d20603c8d376fb
Story: #2005477
Task: #35923
Ghanshyam Mann authored on 2019/07/24 19:31:27Showing 2 changed files
| ... | ... |
@@ -382,8 +382,6 @@ |
| 382 | 382 |
SWIFT_HASH: 1234123412341234 |
| 383 | 383 |
DEBUG_LIBVIRT_COREDUMPS: true |
| 384 | 384 |
NOVA_VNC_ENABLED: true |
| 385 |
- VNCSERVER_LISTEN: 0.0.0.0 |
|
| 386 |
- VNCSERVER_PROXYCLIENT_ADDRESS: $HOST_IP |
|
| 387 | 385 |
devstack_local_conf: |
| 388 | 386 |
post-config: |
| 389 | 387 |
$NEUTRON_CONF: |
| ... | ... |
@@ -479,8 +477,6 @@ |
| 479 | 479 |
GLANCE_HOSTPORT: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}:9292"
|
| 480 | 480 |
Q_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
|
| 481 | 481 |
NOVA_VNC_ENABLED: true |
| 482 |
- VNCSERVER_LISTEN: 0.0.0.0 |
|
| 483 |
- VNCSERVER_PROXYCLIENT_ADDRESS: $HOST_IP |
|
| 484 | 482 |
|
| 485 | 483 |
- job: |
| 486 | 484 |
name: devstack-ipv6 |
| ... | ... |
@@ -601,8 +601,8 @@ function configure_console_compute {
|
| 601 | 601 |
if is_service_enabled n-novnc || is_service_enabled n-xvnc || [ "$NOVA_VNC_ENABLED" != False ]; then |
| 602 | 602 |
# Address on which instance vncservers will listen on compute hosts. |
| 603 | 603 |
# For multi-host, this should be the management ip of the compute host. |
| 604 |
- VNCSERVER_LISTEN=${VNCSERVER_LISTEN=$NOVA_SERVICE_LOCAL_HOST}
|
|
| 605 |
- VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=$NOVA_SERVICE_LOCAL_HOST}
|
|
| 604 |
+ VNCSERVER_LISTEN=${VNCSERVER_LISTEN:-$NOVA_SERVICE_LOCAL_HOST}
|
|
| 605 |
+ VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS:-$NOVA_SERVICE_LOCAL_HOST}
|
|
| 606 | 606 |
iniset $NOVA_CPU_CONF vnc server_listen "$VNCSERVER_LISTEN" |
| 607 | 607 |
iniset $NOVA_CPU_CONF vnc server_proxyclient_address "$VNCSERVER_PROXYCLIENT_ADDRESS" |
| 608 | 608 |
else |