@@ -169,7 +169,7 @@ function configure_ceilometer {

     [ ! -d $CEILOMETER_API_LOG_DIR ] &&  sudo mkdir -m 755 -p $CEILOMETER_API_LOG_DIR

     sudo chown $STACK_USER $CEILOMETER_API_LOG_DIR

-    iniset_rpc_backend ceilometer $CEILOMETER_CONF DEFAULT

+    iniset_rpc_backend ceilometer $CEILOMETER_CONF

     iniset $CEILOMETER_CONF DEFAULT notification_topics "$CEILOMETER_NOTIFICATION_TOPICS"

     iniset $CEILOMETER_CONF DEFAULT verbose True

@@ -281,7 +281,7 @@ function configure_cinder {

         iniset $CINDER_CONF DEFAULT use_syslog True

     fi

-    iniset_rpc_backend cinder $CINDER_CONF DEFAULT

+    iniset_rpc_backend cinder $CINDER_CONF

     if [[ "$CINDER_SECURE_DELETE" == "False" ]]; then

         iniset $CINDER_CONF DEFAULT secure_delete False

@@ -112,7 +112,7 @@ function configure_glance {

     if is_service_enabled qpid || [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; then

         iniset $GLANCE_REGISTRY_CONF DEFAULT notification_driver messaging

     fi

-    iniset_rpc_backend glance $GLANCE_REGISTRY_CONF DEFAULT

+    iniset_rpc_backend glance $GLANCE_REGISTRY_CONF

     cp $GLANCE_DIR/etc/glance-api.conf $GLANCE_API_CONF

     iniset $GLANCE_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

@@ -125,7 +125,7 @@ function configure_glance {

     if is_service_enabled qpid || [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; then

         iniset $GLANCE_API_CONF DEFAULT notification_driver messaging

     fi

-    iniset_rpc_backend glance $GLANCE_API_CONF DEFAULT

+    iniset_rpc_backend glance $GLANCE_API_CONF

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

         iniset $GLANCE_API_CONF DEFAULT container_formats "ami,ari,aki,bare,ovf,tgz"

         iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,raw,iso"

@@ -105,7 +105,7 @@ function configure_heat {

     cp $HEAT_DIR/etc/heat/policy.json $HEAT_POLICY_FILE

     # common options

-    iniset_rpc_backend heat $HEAT_CONF DEFAULT

+    iniset_rpc_backend heat $HEAT_CONF

     iniset $HEAT_CONF DEFAULT heat_metadata_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT

     iniset $HEAT_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1/waitcondition

     iniset $HEAT_CONF DEFAULT heat_watch_server_url http://$HEAT_API_CW_HOST:$HEAT_API_CW_PORT

@@ -313,7 +313,7 @@ function configure_ironic_api {

     iniset $IRONIC_CONF_FILE keystone_authtoken cafile $SSL_BUNDLE_FILE

     iniset $IRONIC_CONF_FILE keystone_authtoken signing_dir $IRONIC_AUTH_CACHE_DIR/api

-    iniset_rpc_backend ironic $IRONIC_CONF_FILE DEFAULT

+    iniset_rpc_backend ironic $IRONIC_CONF_FILE

     iniset $IRONIC_CONF_FILE api port $IRONIC_SERVICE_PORT

     cp -p $IRONIC_DIR/etc/ironic/policy.json $IRONIC_POLICY_JSON

@@ -226,7 +226,7 @@ function configure_keystone {

         iniset $KEYSTONE_CONF assignment driver "keystone.assignment.backends.$KEYSTONE_ASSIGNMENT_BACKEND.Assignment"

     fi

-    iniset_rpc_backend keystone $KEYSTONE_CONF DEFAULT

+    iniset_rpc_backend keystone $KEYSTONE_CONF

     # Set the URL advertised in the ``versions`` structure returned by the '/' route

     if is_service_enabled tls-proxy; then

@@ -422,7 +422,7 @@ function is_neutron_enabled {

 # Set common config for all neutron server and agents.

 function configure_neutron {

     _configure_neutron_common

-    iniset_rpc_backend neutron $NEUTRON_CONF DEFAULT

+    iniset_rpc_backend neutron $NEUTRON_CONF

     # goes before q-svc to init Q_SERVICE_PLUGIN_CLASSES

     if is_service_enabled q-lbaas; then

@@ -537,7 +537,7 @@ function create_nova_conf {

     iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST"

     iniset $NOVA_CONF DEFAULT keystone_ec2_url $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens

-    iniset_rpc_backend nova $NOVA_CONF DEFAULT

+    iniset_rpc_backend nova $NOVA_CONF

     iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"

     iniset $NOVA_CONF DEFAULT osapi_compute_workers "$API_WORKERS"

@@ -237,7 +237,7 @@ function restart_rpc_backend {

 function iniset_rpc_backend {

     local package=$1

     local file=$2

-    local section=$3

+    local section=${3:-DEFAULT}

     if is_service_enabled zeromq; then

         iniset $file $section rpc_backend "zmq"

         iniset $file $section rpc_zmq_host `hostname`

@@ -127,7 +127,7 @@ function configure_sahara {

     if is_service_enabled ceilometer; then

         iniset $SAHARA_CONF_FILE DEFAULT enable_notifications "true"

         iniset $SAHARA_CONF_FILE DEFAULT notification_driver "messaging"

-        iniset_rpc_backend sahara $SAHARA_CONF_FILE DEFAULT

+        iniset_rpc_backend sahara $SAHARA_CONF_FILE

     fi

     iniset $SAHARA_CONF_FILE DEFAULT verbose True

@@ -133,7 +133,7 @@ function configure_zaqar {

         iniset $ZAQAR_CONF DEFAULT notification_driver messaging

         iniset $ZAQAR_CONF DEFAULT control_exchange zaqar

     fi

-    iniset_rpc_backend zaqar $ZAQAR_CONF DEFAULT

+    iniset_rpc_backend zaqar $ZAQAR_CONF

     cleanup_zaqar

 }