@@ -212,7 +212,7 @@ function configure_cinder() {

     cp $CINDER_DIR/etc/cinder/cinder.conf.sample $CINDER_CONF

     iniset $CINDER_CONF DEFAULT auth_strategy keystone

-    iniset $CINDER_CONF DEFAULT debug True

+    iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     iniset $CINDER_CONF DEFAULT verbose True

     if [ "$CINDER_MULTI_LVM_BACKEND" = "True" ]; then

         iniset $CINDER_CONF DEFAULT enabled_backends lvmdriver-1,lvmdriver-2

@@ -71,7 +71,7 @@ function configure_glance() {

     # Copy over our glance configurations and update them

     cp $GLANCE_DIR/etc/glance-registry.conf $GLANCE_REGISTRY_CONF

-    iniset $GLANCE_REGISTRY_CONF DEFAULT debug True

+    iniset $GLANCE_REGISTRY_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     inicomment $GLANCE_REGISTRY_CONF DEFAULT log_file

     local dburl=`database_connection_url glance`

     iniset $GLANCE_REGISTRY_CONF DEFAULT sql_connection $dburl

@@ -87,7 +87,7 @@ function configure_glance() {

     iniset $GLANCE_REGISTRY_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/registry

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

-    iniset $GLANCE_API_CONF DEFAULT debug True

+    iniset $GLANCE_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     inicomment $GLANCE_API_CONF DEFAULT log_file

     iniset $GLANCE_API_CONF DEFAULT sql_connection $dburl

     iniset $GLANCE_API_CONF DEFAULT use_syslog $SYSLOG

@@ -123,7 +123,7 @@ function configure_glance() {

     cp -p $GLANCE_DIR/etc/glance-api-paste.ini $GLANCE_API_PASTE_INI

     cp $GLANCE_DIR/etc/glance-cache.conf $GLANCE_CACHE_CONF

-    iniset $GLANCE_CACHE_CONF DEFAULT debug True

+    iniset $GLANCE_CACHE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     inicomment $GLANCE_CACHE_CONF DEFAULT log_file

     iniset $GLANCE_CACHE_CONF DEFAULT use_syslog $SYSLOG

     iniset $GLANCE_CACHE_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/

@@ -68,7 +68,7 @@ function configure_heat() {

     # Cloudformation API

     HEAT_API_CFN_CONF=$HEAT_CONF_DIR/heat-api-cfn.conf

     cp $HEAT_DIR/etc/heat/heat-api-cfn.conf $HEAT_API_CFN_CONF

-    iniset $HEAT_API_CFN_CONF DEFAULT debug True

+    iniset $HEAT_API_CFN_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     inicomment $HEAT_API_CFN_CONF DEFAULT log_file

     iniset $HEAT_API_CFN_CONF DEFAULT use_syslog $SYSLOG

     iniset $HEAT_API_CFN_CONF DEFAULT bind_host $HEAT_API_CFN_HOST

@@ -90,7 +90,7 @@ function configure_heat() {

     # OpenStack API

     HEAT_API_CONF=$HEAT_CONF_DIR/heat-api.conf

     cp $HEAT_DIR/etc/heat/heat-api.conf $HEAT_API_CONF

-    iniset $HEAT_API_CONF DEFAULT debug True

+    iniset $HEAT_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     inicomment $HEAT_API_CONF DEFAULT log_file

     iniset $HEAT_API_CONF DEFAULT use_syslog $SYSLOG

     iniset $HEAT_API_CONF DEFAULT bind_host $HEAT_API_HOST

@@ -112,7 +112,7 @@ function configure_heat() {

     # engine

     HEAT_ENGINE_CONF=$HEAT_CONF_DIR/heat-engine.conf

     cp $HEAT_DIR/etc/heat/heat-engine.conf $HEAT_ENGINE_CONF

-    iniset $HEAT_ENGINE_CONF DEFAULT debug True

+    iniset $HEAT_ENGINE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     inicomment $HEAT_ENGINE_CONF DEFAULT log_file

     iniset $HEAT_ENGINE_CONF DEFAULT use_syslog $SYSLOG

     iniset $HEAT_ENGINE_CONF DEFAULT bind_host $HEAT_ENGINE_HOST

@@ -128,7 +128,7 @@ function configure_heat() {

     # Cloudwatch API

     HEAT_API_CW_CONF=$HEAT_CONF_DIR/heat-api-cloudwatch.conf

     cp $HEAT_DIR/etc/heat/heat-api-cloudwatch.conf $HEAT_API_CW_CONF

-    iniset $HEAT_API_CW_CONF DEFAULT debug True

+    iniset $HEAT_API_CW_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     inicomment $HEAT_API_CW_CONF DEFAULT log_file

     iniset $HEAT_API_CW_CONF DEFAULT use_syslog $SYSLOG

     iniset $HEAT_API_CW_CONF DEFAULT bind_host $HEAT_API_CW_HOST

@@ -537,7 +537,7 @@ function _configure_neutron_dhcp_agent() {

     cp $NEUTRON_DIR/etc/dhcp_agent.ini $Q_DHCP_CONF_FILE

     iniset $Q_DHCP_CONF_FILE DEFAULT verbose True

-    iniset $Q_DHCP_CONF_FILE DEFAULT debug True

+    iniset $Q_DHCP_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE

     iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"

@@ -557,7 +557,7 @@ function _configure_neutron_l3_agent() {

     cp $NEUTRON_DIR/etc/l3_agent.ini $Q_L3_CONF_FILE

     iniset $Q_L3_CONF_FILE DEFAULT verbose True

-    iniset $Q_L3_CONF_FILE DEFAULT debug True

+    iniset $Q_L3_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     iniset $Q_L3_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE

     iniset $Q_L3_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"

@@ -573,7 +573,7 @@ function _configure_neutron_metadata_agent() {

     cp $NEUTRON_DIR/etc/metadata_agent.ini $Q_META_CONF_FILE

     iniset $Q_META_CONF_FILE DEFAULT verbose True

-    iniset $Q_META_CONF_FILE DEFAULT debug True

+    iniset $Q_META_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP

     iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"

@@ -597,7 +597,7 @@ function _configure_neutron_plugin_agent() {

     # ensure that an agent's configuration can override the default

     iniset /$Q_PLUGIN_CONF_FILE agent root_helper "$Q_RR_COMMAND"

     iniset $NEUTRON_CONF DEFAULT verbose True

-    iniset $NEUTRON_CONF DEFAULT debug True

+    iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     # Configure agent for plugin

     neutron_plugin_configure_plugin_agent

@@ -620,7 +620,7 @@ function _configure_neutron_service() {

     fi

     iniset $NEUTRON_CONF DEFAULT verbose True

-    iniset $NEUTRON_CONF DEFAULT debug True

+    iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     iniset $NEUTRON_CONF DEFAULT policy_file $Q_POLICY_FILE

     iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP

@@ -430,7 +430,7 @@ function create_nova_conf() {

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

     rm -f $NOVA_CONF

     iniset $NOVA_CONF DEFAULT verbose "True"

-    iniset $NOVA_CONF DEFAULT debug "True"

+    iniset $NOVA_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"

     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"

@@ -252,6 +252,9 @@ OFFLINE=`trueorfalse False $OFFLINE`

 # operation.

 ERROR_ON_CLONE=`trueorfalse False $ERROR_ON_CLONE`

+# Whether to enable the debug log level in OpenStack services

+ENABLE_DEBUG_LOG_LEVEL=`trueorfalse True $ENABLE_DEBUG_LOG_LEVEL`

+

 # Destination path for service data

 DATA_DIR=${DATA_DIR:-${DEST}/data}

 sudo mkdir -p $DATA_DIR