@@ -354,73 +354,73 @@ function create_nova_conf() {

     # (Re)create ``nova.conf``

     rm -f $NOVA_CONF

     add_nova_opt "[DEFAULT]"

-    add_nova_opt "verbose=True"

-    add_nova_opt "auth_strategy=keystone"

-    add_nova_opt "allow_resize_to_same_host=True"

-    add_nova_opt "api_paste_config=$NOVA_API_PASTE_INI"

-    add_nova_opt "rootwrap_config=$NOVA_CONF_DIR/rootwrap.conf"

-    add_nova_opt "compute_scheduler_driver=$SCHEDULER"

-    add_nova_opt "dhcpbridge_flagfile=$NOVA_CONF"

-    add_nova_opt "force_dhcp_release=True"

-    add_nova_opt "fixed_range=$FIXED_RANGE"

-    add_nova_opt "default_floating_pool=$PUBLIC_NETWORK_NAME"

-    add_nova_opt "s3_host=$SERVICE_HOST"

-    add_nova_opt "s3_port=$S3_SERVICE_PORT"

-    add_nova_opt "osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions"

-    add_nova_opt "my_ip=$HOST_IP"

+    iniset $NOVA_CONF DEFAULT verbose "True"

+    iniset $NOVA_CONF DEFAULT auth_strategy "keystone"

+    iniset $NOVA_CONF DEFAULT allow_resize_to_same_host "True"

+    iniset $NOVA_CONF DEFAULT api_paste_config "$NOVA_API_PASTE_INI"

+    iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"

+    iniset $NOVA_CONF DEFAULT compute_scheduler_driver "$SCHEDULER"

+    iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF"

+    iniset $NOVA_CONF DEFAULT force_dhcp_release "True"

+    iniset $NOVA_CONF DEFAULT fixed_range "$FIXED_RANGE"

+    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"

+    iniset $NOVA_CONF DEFAULT osapi_compute_extension "nova.api.openstack.compute.contrib.standard_extensions"

+    iniset $NOVA_CONF DEFAULT my_ip "$HOST_IP"

     local dburl

     database_connection_url dburl nova

-    add_nova_opt "sql_connection=$dburl"

+    iniset $NOVA_CONF DEFAULT sql_connection "$dburl"

     if is_baremetal; then

         database_connection_url dburl nova_bm

-        add_nova_opt "baremetal_sql_connection=$dburl"

+        iniset $NOVA_CONF baremetal sql_connection $dburl

     fi

-    add_nova_opt "libvirt_type=$LIBVIRT_TYPE"

-    add_nova_opt "libvirt_cpu_mode=none"

-    add_nova_opt "instance_name_template=${INSTANCE_NAME_PREFIX}%08x"

+    iniset $NOVA_CONF DEFAULT libvirt_type "$LIBVIRT_TYPE"

+    iniset $NOVA_CONF DEFAULT libvirt_cpu_mode "none"

+    iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x"

     if is_service_enabled n-api; then

-        add_nova_opt "enabled_apis=$NOVA_ENABLED_APIS"

+        iniset $NOVA_CONF DEFAULT enabled_apis "$NOVA_ENABLED_APIS"

         if is_service_enabled tls-proxy; then

             # Set the service port for a proxy to take the original

-            add_nova_opt "osapi_compute_listen_port=$NOVA_SERVICE_PORT_INT"

+            iniset $NOVA_CONF DEFAULT osapi_compute_listen_port "$NOVA_SERVICE_PORT_INT"

         fi

     fi

     if is_service_enabled cinder; then

-        add_nova_opt "volume_api_class=nova.volume.cinder.API"

+        iniset $NOVA_CONF DEFAULT volume_api_class "nova.volume.cinder.API"

     fi

     if [ -n "$NOVA_STATE_PATH" ]; then

-        add_nova_opt "state_path=$NOVA_STATE_PATH"

-        add_nova_opt "lock_path=$NOVA_STATE_PATH"

+        iniset $NOVA_CONF DEFAULT state_path "$NOVA_STATE_PATH"

+        iniset $NOVA_CONF DEFAULT lock_path "$NOVA_STATE_PATH"

     fi

     if [ -n "$NOVA_INSTANCES_PATH" ]; then

-        add_nova_opt "instances_path=$NOVA_INSTANCES_PATH"

+        iniset $NOVA_CONF DEFAULT instances_path "$NOVA_INSTANCES_PATH"

     fi

     if [ "$MULTI_HOST" != "False" ]; then

-        add_nova_opt "multi_host=True"

-        add_nova_opt "send_arp_for_ha=True"

+        iniset $NOVA_CONF DEFAULT multi_host "True"

+        iniset $NOVA_CONF DEFAULT send_arp_for_ha "True"

     fi

     if [ "$SYSLOG" != "False" ]; then

-        add_nova_opt "use_syslog=True"

+        iniset $NOVA_CONF DEFAULT use_syslog "True"

     fi

     if [ "$API_RATE_LIMIT" != "True" ]; then

-        add_nova_opt "api_rate_limit=False"

+        iniset $NOVA_CONF DEFAULT api_rate_limit "False"

     fi

     if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then

         # Add color to logging output

-        add_nova_opt "logging_context_format_string=%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s%(color)s] %(instance)s%(color)s%(message)s"

-        add_nova_opt "logging_default_format_string=%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s"

-        add_nova_opt "logging_debug_format_suffix=from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d"

-        add_nova_opt "logging_exception_prefix=%(color)s%(asctime)s.%(msecs)d TRACE %(name)s %(instance)s"

+        iniset $NOVA_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s%(color)s] %(instance)s%(color)s%(message)s"

+        iniset $NOVA_CONF DEFAULT logging_default_format_string "%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s"

+        iniset $NOVA_CONF DEFAULT logging_debug_format_suffix "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d"

+        iniset $NOVA_CONF DEFAULT logging_exception_prefix "%(color)s%(asctime)s.%(msecs)d TRACE %(name)s %(instance)s"

     else

         # Show user_name and project_name instead of user_id and project_id

-        add_nova_opt "logging_context_format_string=%(asctime)s.%(msecs)d %(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s] %(instance)s%(message)s"

+        iniset $NOVA_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)d %(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s] %(instance)s%(message)s"

     fi

     if is_service_enabled ceilometer; then

-        add_nova_opt "instance_usage_audit=True"

-        add_nova_opt "instance_usage_audit_period=hour"

-        add_nova_opt "notification_driver=nova.openstack.common.notifier.rpc_notifier"

-        add_nova_opt "notification_driver=ceilometer.compute.nova_notifier"

+        iniset $NOVA_CONF DEFAULT instance_usage_audit "True"

+        iniset $NOVA_CONF DEFAULT instance_usage_audit_period "hour"

+        iniset $NOVA_CONF DEFAULT notification_driver "nova.openstack.common.notifier.rpc_notifier"

+        iniset $NOVA_CONF DEFAULT notification_driver "ceilometer.compute.nova_notifier"

     fi

@@ -433,17 +433,17 @@ function create_nova_conf() {

     # For Example: ``EXTRA_OPTS=(foo=true bar=2)``

     for I in "${EXTRA_OPTS[@]}"; do

         # Attempt to convert flags to options

-        add_nova_opt ${I//--}

+        iniset $NOVA_CONF DEFAULT ${I//=/ }

     done

 }

 function create_nova_conf_nova_network() {

-    add_nova_opt "network_manager=nova.network.manager.$NET_MAN"

-    add_nova_opt "public_interface=$PUBLIC_INTERFACE"

-    add_nova_opt "vlan_interface=$VLAN_INTERFACE"

-    add_nova_opt "flat_network_bridge=$FLAT_NETWORK_BRIDGE"

+    iniset $NOVA_CONF DEFAULT network_manager "nova.network.manager.$NET_MAN"

+    iniset $NOVA_CONF DEFAULT public_interface "$PUBLIC_INTERFACE"

+    iniset $NOVA_CONF DEFAULT vlan_interface "$VLAN_INTERFACE"

+    iniset $NOVA_CONF DEFAULT flat_network_bridge "$FLAT_NETWORK_BRIDGE"

     if [ -n "$FLAT_INTERFACE" ]; then

-        add_nova_opt "flat_interface=$FLAT_INTERFACE"

+        iniset $NOVA_CONF DEFAULT flat_interface "$FLAT_INTERFACE"

     fi

 }

@@ -200,13 +200,13 @@ function configure_quantum() {

 }

 function create_nova_conf_quantum() {

-    add_nova_opt "network_api_class=nova.network.quantumv2.api.API"

-    add_nova_opt "quantum_admin_username=$Q_ADMIN_USERNAME"

-    add_nova_opt "quantum_admin_password=$SERVICE_PASSWORD"

-    add_nova_opt "quantum_admin_auth_url=$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0"

-    add_nova_opt "quantum_auth_strategy=$Q_AUTH_STRATEGY"

-    add_nova_opt "quantum_admin_tenant_name=$SERVICE_TENANT_NAME"

-    add_nova_opt "quantum_url=http://$Q_HOST:$Q_PORT"

+    iniset $NOVA_CONF DEFAULT network_api_class "nova.network.quantumv2.api.API"

+    iniset $NOVA_CONF DEFAULT quantum_admin_username "$Q_ADMIN_USERNAME"

+    iniset $NOVA_CONF DEFAULT quantum_admin_password "$SERVICE_PASSWORD"

+    iniset $NOVA_CONF DEFAULT quantum_admin_auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0"

+    iniset $NOVA_CONF DEFAULT quantum_auth_strategy "$Q_AUTH_STRATEGY"

+    iniset $NOVA_CONF DEFAULT quantum_admin_tenant_name "$SERVICE_TENANT_NAME"

+    iniset $NOVA_CONF DEFAULT quantum_url "http://$Q_HOST:$Q_PORT"

     if [[ "$Q_PLUGIN" = "openvswitch" ]]; then

         NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver"}

@@ -214,14 +214,14 @@ function create_nova_conf_quantum() {

         NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver"}

     elif [[ "$Q_PLUGIN" = "ryu" ]]; then

         NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"quantum.plugins.ryu.nova.vif.LibvirtOpenVswitchOFPRyuDriver"}

-        add_nova_opt "libvirt_ovs_integration_bridge=$OVS_BRIDGE"

-        add_nova_opt "linuxnet_ovs_ryu_api_host=$RYU_API_HOST:$RYU_API_PORT"

-        add_nova_opt "libvirt_ovs_ryu_api_host=$RYU_API_HOST:$RYU_API_PORT"

+        iniset $NOVA_CONF DEFAULT libvirt_ovs_integration_bridge "$OVS_BRIDGE"

+        iniset $NOVA_CONF DEFAULT linuxnet_ovs_ryu_api_host "$RYU_API_HOST:$RYU_API_PORT"

+        iniset $NOVA_CONF DEFAULT libvirt_ovs_ryu_api_host "$RYU_API_HOST:$RYU_API_PORT"

     fi

-    add_nova_opt "libvirt_vif_driver=$NOVA_VIF_DRIVER"

-    add_nova_opt "linuxnet_interface_driver=$LINUXNET_VIF_DRIVER"

+    iniset $NOVA_CONF DEFAULT libvirt_vif_driver "$NOVA_VIF_DRIVER"

+    iniset $NOVA_CONF DEFAULT linuxnet_interface_driver "$LINUXNET_VIF_DRIVER"

     if is_service_enabled q-meta; then

-        add_nova_opt "service_quantum_metadata_proxy=True"

+        iniset $NOVA_CONF DEFAULT service_quantum_metadata_proxy "True"

     fi

 }

@@ -1059,9 +1059,9 @@ if is_service_enabled nova; then

     # These settings don't hurt anything if n-xvnc and n-novnc are disabled

     if is_service_enabled n-cpu; then

         NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_auto.html"}

-        add_nova_opt "novncproxy_base_url=$NOVNCPROXY_URL"

+        iniset $NOVA_CONF DEFAULT novncproxy_base_url "$NOVNCPROXY_URL"

         XVPVNCPROXY_URL=${XVPVNCPROXY_URL:-"http://$SERVICE_HOST:6081/console"}

-        add_nova_opt "xvpvncproxy_base_url=$XVPVNCPROXY_URL"

+        iniset $NOVA_CONF DEFAULT xvpvncproxy_base_url "$XVPVNCPROXY_URL"

     fi

     if [ "$VIRT_DRIVER" = 'xenserver' ]; then

         VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=169.254.0.1}

@@ -1071,18 +1071,18 @@ if is_service_enabled nova; then

     # Address on which instance vncservers will listen on compute hosts.

     # For multi-host, this should be the management ip of the compute host.

     VNCSERVER_LISTEN=${VNCSERVER_LISTEN=127.0.0.1}

-    add_nova_opt "vncserver_listen=$VNCSERVER_LISTEN"

-    add_nova_opt "vncserver_proxyclient_address=$VNCSERVER_PROXYCLIENT_ADDRESS"

-    add_nova_opt "ec2_dmz_host=$EC2_DMZ_HOST"

+    iniset $NOVA_CONF DEFAULT vncserver_listen "$VNCSERVER_LISTEN"

+    iniset $NOVA_CONF DEFAULT vncserver_proxyclient_address "$VNCSERVER_PROXYCLIENT_ADDRESS"

+    iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST"

     if is_service_enabled zeromq; then

-        add_nova_opt "rpc_backend=nova.openstack.common.rpc.impl_zmq"

+        iniset $NOVA_CONF DEFAULT rpc_backend "nova.openstack.common.rpc.impl_zmq"

     elif is_service_enabled qpid; then

-        add_nova_opt "rpc_backend=nova.rpc.impl_qpid"

+        iniset $NOVA_CONF DEFAULT rpc_backend "nova.rpc.impl_qpid"

     elif [ -n "$RABBIT_HOST" ] &&  [ -n "$RABBIT_PASSWORD" ]; then

-        add_nova_opt "rabbit_host=$RABBIT_HOST"

-        add_nova_opt "rabbit_password=$RABBIT_PASSWORD"

+        iniset $NOVA_CONF DEFAULT rabbit_host "$RABBIT_HOST"

+        iniset $NOVA_CONF DEFAULT rabbit_password "$RABBIT_PASSWORD"

     fi

-    add_nova_opt "glance_api_servers=$GLANCE_HOSTPORT"

+    iniset $NOVA_CONF DEFAULT glance_api_servers "$GLANCE_HOSTPORT"

     # XenServer

@@ -1091,16 +1091,16 @@ if is_service_enabled nova; then

     if [ "$VIRT_DRIVER" = 'xenserver' ]; then

         echo_summary "Using XenServer virtualization driver"

         read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN."

-        add_nova_opt "compute_driver=xenapi.XenAPIDriver"

+        iniset $NOVA_CONF DEFAULT compute_driver "xenapi.XenAPIDriver"

         XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}

         XENAPI_USER=${XENAPI_USER:-"root"}

-        add_nova_opt "xenapi_connection_url=$XENAPI_CONNECTION_URL"

-        add_nova_opt "xenapi_connection_username=$XENAPI_USER"

-        add_nova_opt "xenapi_connection_password=$XENAPI_PASSWORD"

-        add_nova_opt "flat_injected=False"

+        iniset $NOVA_CONF DEFAULT xenapi_connection_url "$XENAPI_CONNECTION_URL"

+        iniset $NOVA_CONF DEFAULT xenapi_connection_username "$XENAPI_USER"

+        iniset $NOVA_CONF DEFAULT xenapi_connection_password "$XENAPI_PASSWORD"

+        iniset $NOVA_CONF DEFAULT flat_injected "False"

         # Need to avoid crash due to new firewall support

         XEN_FIREWALL_DRIVER=${XEN_FIREWALL_DRIVER:-"nova.virt.firewall.IptablesFirewallDriver"}

-        add_nova_opt "firewall_driver=$XEN_FIREWALL_DRIVER"

+        iniset $NOVA_CONF DEFAULT firewall_driver "$XEN_FIREWALL_DRIVER"

     # OpenVZ

     # ------

@@ -1109,34 +1109,34 @@ if is_service_enabled nova; then

         echo_summary "Using OpenVZ virtualization driver"

         # TODO(deva): OpenVZ driver does not yet work if compute_driver is set here.

         #             Replace connection_type when this is fixed.

-        #             add_nova_opt "compute_driver=openvz.connection.OpenVzConnection"

-        add_nova_opt "connection_type=openvz"

+        #             iniset $NOVA_CONF DEFAULT compute_driver "openvz.connection.OpenVzConnection"

+        iniset $NOVA_CONF DEFAULT connection_type "openvz"

         LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}

-        add_nova_opt "firewall_driver=$LIBVIRT_FIREWALL_DRIVER"

+        iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"

     # Bare Metal

     # ----------

     elif [ "$VIRT_DRIVER" = 'baremetal' ]; then

         echo_summary "Using BareMetal driver"

-        add_nova_opt "compute_driver=nova.virt.baremetal.driver.BareMetalDriver"

         LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"}

-        add_nova_opt "firewall_driver=$LIBVIRT_FIREWALL_DRIVER"

-        add_nova_opt "baremetal_driver=$BM_DRIVER"

-        add_nova_opt "baremetal_tftp_root=/tftpboot"

-        add_nova_opt "baremetal_instance_type_extra_specs=cpu_arch:$BM_CPU_ARCH"

-        add_nova_opt "baremetal_power_manager=$BM_POWER_MANAGER"

-        add_nova_opt "scheduler_host_manager=nova.scheduler.baremetal_host_manager.BaremetalHostManager"

-        add_nova_opt "scheduler_default_filters=AllHostsFilter"

+        iniset $NOVA_CONF DEFAULT compute_driver nova.virt.baremetal.driver.BareMetalDriver

+        iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER

+        iniset $NOVA_CONF DEFAULT scheduler_host_manager nova.scheduler.baremetal_host_manager.BaremetalHostManager

+        iniset $NOVA_CONF DEFAULT scheduler_default_filters AllHostsFilter

+        iniset $NOVA_CONF baremetal driver $BM_DRIVER

+        iniset $NOVA_CONF baremetal instance_type_extra_specs cpu_arch:$BM_CPU_ARCH

+        iniset $NOVA_CONF baremetal power_manager $BM_POWER_MANAGER

+        iniset $NOVA_CONF baremetal tftp_root /tftpboot

     # Default

     # -------

     else

         echo_summary "Using libvirt virtualization driver"

-        add_nova_opt "compute_driver=libvirt.LibvirtDriver"

+        iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"

         LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}

-        add_nova_opt "firewall_driver=$LIBVIRT_FIREWALL_DRIVER"

+        iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"

     fi

 fi

@@ -1174,9 +1174,9 @@ if is_service_enabled key && is_service_enabled swift3 && is_service_enabled nov

     CREDS=$(keystone ec2-credentials-create --user_id $NOVA_USER_ID --tenant_id $NOVA_TENANT_ID)

     ACCESS_KEY=$(echo "$CREDS" | awk '/ access / { print $4 }')

     SECRET_KEY=$(echo "$CREDS" | awk '/ secret / { print $4 }')

-    add_nova_opt "s3_access_key=$ACCESS_KEY"

-    add_nova_opt "s3_secret_key=$SECRET_KEY"

-    add_nova_opt "s3_affix_tenant=True"

+    iniset $NOVA_CONF DEFAULT s3_access_key "$ACCESS_KEY"

+    iniset $NOVA_CONF DEFAULT s3_secret_key "$SECRET_KEY"

+    iniset $NOVA_CONF DEFAULT s3_affix_tenant "True"

 fi

 screen_it zeromq "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-rpc-zmq-receiver"