Browse code
Use the renamed vnc options
As the following commit has renamed the two vnc options; let's
use the new options in devstack:
https://review.openstack.org/#/c/498387/
Change-Id: Id125666814ea9bb8a22b579aee0f6bc1c65ade80
jianghua wang authored on 2017/09/21 23:16:06Showing 2 changed files
| ... | ... |
@@ -520,8 +520,8 @@ function create_nova_conf {
|
| 520 | 520 |
# For multi-host, this should be the management ip of the compute host. |
| 521 | 521 |
VNCSERVER_LISTEN=${VNCSERVER_LISTEN=$NOVA_SERVICE_LOCAL_HOST}
|
| 522 | 522 |
VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=$NOVA_SERVICE_LOCAL_HOST}
|
| 523 |
- iniset $NOVA_CONF vnc vncserver_listen "$VNCSERVER_LISTEN" |
|
| 524 |
- iniset $NOVA_CONF vnc vncserver_proxyclient_address "$VNCSERVER_PROXYCLIENT_ADDRESS" |
|
| 523 |
+ iniset $NOVA_CONF vnc server_listen "$VNCSERVER_LISTEN" |
|
| 524 |
+ iniset $NOVA_CONF vnc server_proxyclient_address "$VNCSERVER_PROXYCLIENT_ADDRESS" |
|
| 525 | 525 |
iniset $NOVA_CONF vnc novncproxy_host "$NOVA_SERVICE_LISTEN_ADDRESS" |
| 526 | 526 |
iniset $NOVA_CONF vnc xvpvncproxy_host "$NOVA_SERVICE_LISTEN_ADDRESS" |
| 527 | 527 |
else |
| ... | ... |
@@ -71,8 +71,8 @@ function configure_nova_hypervisor {
|
| 71 | 71 |
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system" |
| 72 | 72 |
iniset $NOVA_CONF libvirt images_type "ploop" |
| 73 | 73 |
iniset $NOVA_CONF DEFAULT force_raw_images "False" |
| 74 |
- iniset $NOVA_CONF vnc vncserver_proxyclient_address $HOST_IP |
|
| 75 |
- iniset $NOVA_CONF vnc vncserver_listen $HOST_IP |
|
| 74 |
+ iniset $NOVA_CONF vnc server_proxyclient_address $HOST_IP |
|
| 75 |
+ iniset $NOVA_CONF vnc server_listen $HOST_IP |
|
| 76 | 76 |
iniset $NOVA_CONF vnc keymap |
| 77 | 77 |
elif [[ "$NOVA_BACKEND" == "LVM" ]]; then |
| 78 | 78 |
iniset $NOVA_CONF libvirt images_type "lvm" |