From 085f2fb0e2d399281b137c9fa95a7a39e270be7d Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Fri, 2 Sep 2016 14:00:39 -0700 Subject: [PATCH] Remove the same configurations as the default The default value of force_dhcp_release is True on Nova side: https://github.com/openstack/nova/blob/master/nova/conf/network.py#L306 The default value of vnc.enabled is True on Nova side: https://github.com/openstack/nova/blob/master/nova/conf/vnc.py#L27 The default value of spice.enabled is False on Nova side: https://github.com/openstack/nova/blob/master/nova/conf/spice.py#L30 So it is not necessary to set them on Devstack. Change-Id: I67cc103269d2d612ad443c72f2a77d7ae2ca09e3 --- lib/nova | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/nova b/lib/nova index 670f605fd6..8496868821 100644 --- a/lib/nova +++ b/lib/nova @@ -461,7 +461,6 @@ function create_nova_conf { iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf" iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER" iniset $NOVA_CONF DEFAULT scheduler_default_filters "$FILTERS" - iniset $NOVA_CONF DEFAULT force_dhcp_release "True" iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME" iniset $NOVA_CONF DEFAULT s3_host "$SERVICE_HOST" iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT" @@ -557,7 +556,6 @@ function create_nova_conf { # For multi-host, this should be the management ip of the compute host. VNCSERVER_LISTEN=${VNCSERVER_LISTEN=$NOVA_SERVICE_LOCAL_HOST} VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=$NOVA_SERVICE_LOCAL_HOST} - iniset $NOVA_CONF vnc enabled true iniset $NOVA_CONF vnc vncserver_listen "$VNCSERVER_LISTEN" iniset $NOVA_CONF vnc vncserver_proxyclient_address "$VNCSERVER_PROXYCLIENT_ADDRESS" iniset $NOVA_CONF vnc novncproxy_host "$NOVA_SERVICE_LISTEN_ADDRESS" @@ -575,8 +573,6 @@ function create_nova_conf { iniset $NOVA_CONF spice server_listen "$SPICESERVER_LISTEN" iniset $NOVA_CONF spice server_proxyclient_address "$SPICESERVER_PROXYCLIENT_ADDRESS" iniset $NOVA_CONF spice html5proxy_host "$NOVA_SERVICE_LISTEN_ADDRESS" - else - iniset $NOVA_CONF spice enabled false fi # Set the oslo messaging driver to the typical default. This does not