Commit 6b04a0d2 authored by David Johnson's avatar David Johnson

Change some nova vnc option names.

parent 0d957fec
...@@ -263,8 +263,18 @@ if [ $OSVERSION -ge $OSLIBERTY ]; then ...@@ -263,8 +263,18 @@ if [ $OSVERSION -ge $OSLIBERTY ]; then
fi fi
cname=`getfqdn $CONTROLLER` cname=`getfqdn $CONTROLLER`
crudini --set /etc/nova/nova.conf $VNCSECTION vncserver_listen ${MGMTIP} if [ $OSVERSION -lt $OSQUEENS ]; then
crudini --set /etc/nova/nova.conf $VNCSECTION vncserver_proxyclient_address ${MGMTIP} crudini --set /etc/nova/nova.conf $VNCSECTION \
vncserver_listen ${MGMTIP}
crudini --set /etc/nova/nova.conf $VNCSECTION \
vncserver_proxyclient_address ${MGMTIP}
else
crudini --set /etc/nova/nova.conf $VNCSECTION \
server_listen ${MGMTIP}
crudini --set /etc/nova/nova.conf $VNCSECTION \
server_proxyclient_address ${MGMTIP}
fi
# #
# https://bugs.launchpad.net/nova/+bug/1635131 # https://bugs.launchpad.net/nova/+bug/1635131
# #
......
...@@ -1205,9 +1205,13 @@ EOF ...@@ -1205,9 +1205,13 @@ EOF
if [ $OSVERSION -lt $OSLIBERTY ]; then if [ $OSVERSION -lt $OSLIBERTY ]; then
crudini --set /etc/nova/nova.conf DEFAULT vncserver_listen ${MGMTIP} crudini --set /etc/nova/nova.conf DEFAULT vncserver_listen ${MGMTIP}
crudini --set /etc/nova/nova.conf DEFAULT vncserver_proxyclient_address ${MGMTIP} crudini --set /etc/nova/nova.conf DEFAULT vncserver_proxyclient_address ${MGMTIP}
else elif [ $OSVERSION -lt $OSQUEENS ]; then
crudini --set /etc/nova/nova.conf vnc vncserver_listen ${MGMTIP} crudini --set /etc/nova/nova.conf vnc vncserver_listen ${MGMTIP}
crudini --set /etc/nova/nova.conf vnc vncserver_proxyclient_address ${MGMTIP} crudini --set /etc/nova/nova.conf vnc vncserver_proxyclient_address ${MGMTIP}
else
crudini --set /etc/nova/nova.conf vnc enabled true
crudini --set /etc/nova/nova.conf vnc server_listen ${MGMTIP}
crudini --set /etc/nova/nova.conf vnc server_proxyclient_address ${MGMTIP}
fi fi
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment