Browse code
Update the vnc config options group 'DEFAULT' to 'vnc'
n-api log output WARNINGs that vnc config options group 'DEFAULT'
is deprecated. New vnc config options group is 'vnc'.
This is change of Nova.[1]
This patch changes the vnc config options group 'DEFAULT' to 'vnc'.
[1] https://bugs.launchpad.net/nova/+bug/1447528
Change-Id: If54f750bac83298e90bdca27b5992fe2e5fbb712
Closes-Bug: 1483583
Mahito OGURA authored on 2015/08/12 10:21:27Showing 2 changed files
| ... | ... |
@@ -594,9 +594,9 @@ function create_nova_conf {
|
| 594 | 594 |
# These settings don't hurt anything if n-xvnc and n-novnc are disabled |
| 595 | 595 |
if is_service_enabled n-cpu; then |
| 596 | 596 |
NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_auto.html"}
|
| 597 |
- iniset $NOVA_CONF DEFAULT novncproxy_base_url "$NOVNCPROXY_URL" |
|
| 597 |
+ iniset $NOVA_CONF vnc novncproxy_base_url "$NOVNCPROXY_URL" |
|
| 598 | 598 |
XVPVNCPROXY_URL=${XVPVNCPROXY_URL:-"http://$SERVICE_HOST:6081/console"}
|
| 599 |
- iniset $NOVA_CONF DEFAULT xvpvncproxy_base_url "$XVPVNCPROXY_URL" |
|
| 599 |
+ iniset $NOVA_CONF vnc xvpvncproxy_base_url "$XVPVNCPROXY_URL" |
|
| 600 | 600 |
SPICEHTML5PROXY_URL=${SPICEHTML5PROXY_URL:-"http://$SERVICE_HOST:6082/spice_auto.html"}
|
| 601 | 601 |
iniset $NOVA_CONF spice html5proxy_base_url "$SPICEHTML5PROXY_URL" |
| 602 | 602 |
fi |
| ... | ... |
@@ -606,13 +606,13 @@ function create_nova_conf {
|
| 606 | 606 |
# For multi-host, this should be the management ip of the compute host. |
| 607 | 607 |
VNCSERVER_LISTEN=${VNCSERVER_LISTEN=$NOVA_SERVICE_LOCAL_HOST}
|
| 608 | 608 |
VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=$NOVA_SERVICE_LOCAL_HOST}
|
| 609 |
- iniset $NOVA_CONF DEFAULT vnc_enabled true |
|
| 610 |
- iniset $NOVA_CONF DEFAULT vncserver_listen "$VNCSERVER_LISTEN" |
|
| 611 |
- iniset $NOVA_CONF DEFAULT vncserver_proxyclient_address "$VNCSERVER_PROXYCLIENT_ADDRESS" |
|
| 609 |
+ iniset $NOVA_CONF vnc enabled true |
|
| 610 |
+ iniset $NOVA_CONF vnc vncserver_listen "$VNCSERVER_LISTEN" |
|
| 611 |
+ iniset $NOVA_CONF vnc vncserver_proxyclient_address "$VNCSERVER_PROXYCLIENT_ADDRESS" |
|
| 612 | 612 |
iniset $NOVA_CONF DEFAULT novncproxy_host "$NOVA_SERVICE_LISTEN_ADDRESS" |
| 613 | 613 |
iniset $NOVA_CONF DEFAULT xvpvncproxy_host "$NOVA_SERVICE_LISTEN_ADDRESS" |
| 614 | 614 |
else |
| 615 |
- iniset $NOVA_CONF DEFAULT vnc_enabled false |
|
| 615 |
+ iniset $NOVA_CONF vnc enabled false |
|
| 616 | 616 |
fi |
| 617 | 617 |
|
| 618 | 618 |
if is_service_enabled n-spice; then |
| ... | ... |
@@ -48,13 +48,13 @@ function configure_nova_hypervisor {
|
| 48 | 48 |
iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER" |
| 49 | 49 |
# Power architecture currently does not support graphical consoles. |
| 50 | 50 |
if is_arch "ppc64"; then |
| 51 |
- iniset $NOVA_CONF DEFAULT vnc_enabled "false" |
|
| 51 |
+ iniset $NOVA_CONF vnc enabled "false" |
|
| 52 | 52 |
fi |
| 53 | 53 |
|
| 54 | 54 |
# arm64-specific configuration |
| 55 | 55 |
if is_arch "aarch64"; then |
| 56 | 56 |
# arm64 architecture currently does not support graphical consoles. |
| 57 |
- iniset $NOVA_CONF DEFAULT vnc_enabled "false" |
|
| 57 |
+ iniset $NOVA_CONF vnc enabled "false" |
|
| 58 | 58 |
fi |
| 59 | 59 |
|
| 60 | 60 |
# File injection is being disabled by default in the near future - |
| ... | ... |
@@ -65,9 +65,9 @@ function configure_nova_hypervisor {
|
| 65 | 65 |
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system" |
| 66 | 66 |
iniset $NOVA_CONF libvirt images_type "ploop" |
| 67 | 67 |
iniset $NOVA_CONF DEFAULT force_raw_images "False" |
| 68 |
- iniset $NOVA_CONF DEFAULT vncserver_proxyclient_address $HOST_IP |
|
| 69 |
- iniset $NOVA_CONF DEFAULT vncserver_listen $HOST_IP |
|
| 70 |
- iniset $NOVA_CONF DEFAULT vnc_keymap |
|
| 68 |
+ iniset $NOVA_CONF vnc vncserver_proxyclient_address $HOST_IP |
|
| 69 |
+ iniset $NOVA_CONF vnc vncserver_listen $HOST_IP |
|
| 70 |
+ iniset $NOVA_CONF vnc keymap |
|
| 71 | 71 |
fi |
| 72 | 72 |
} |
| 73 | 73 |
|