@@ -105,10 +105,7 @@ function configure_cinder() {

     iniset $CINDER_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME

     iniset $CINDER_API_PASTE_INI filter:authtoken admin_user cinder

     iniset $CINDER_API_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD

-

-    if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then

-        iniset $CINDER_API_PASTE_INI filter:authtoken signing_dir $CINDER_AUTH_CACHE_DIR

-    fi

+    iniset $CINDER_API_PASTE_INI filter:authtoken signing_dir $CINDER_AUTH_CACHE_DIR

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

     iniset $CINDER_CONF DEFAULT auth_strategy keystone

@@ -212,11 +209,9 @@ function init_cinder() {

         fi

     fi

-    if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then

-        # Create cache dir

-        sudo mkdir -p $CINDER_AUTH_CACHE_DIR

-        sudo chown `whoami` $CINDER_AUTH_CACHE_DIR

-    fi

+    # Create cache dir

+    sudo mkdir -p $CINDER_AUTH_CACHE_DIR

+    sudo chown `whoami` $CINDER_AUTH_CACHE_DIR

 }

 # install_cinder() - Collect source and prepare

@@ -95,9 +95,7 @@ function configure_glance() {

     iniset $GLANCE_REGISTRY_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME

     iniset $GLANCE_REGISTRY_CONF keystone_authtoken admin_user glance

     iniset $GLANCE_REGISTRY_CONF keystone_authtoken admin_password $SERVICE_PASSWORD

-    if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then

-        iniset $GLANCE_REGISTRY_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/registry

-    fi

+    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

@@ -121,9 +119,7 @@ function configure_glance() {

         iniset $GLANCE_API_CONF DEFAULT rabbit_host $RABBIT_HOST

         iniset $GLANCE_API_CONF DEFAULT rabbit_password $RABBIT_PASSWORD

     fi

-    if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then

-        iniset $GLANCE_API_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/api

-    fi

+    iniset $GLANCE_API_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/api

     cp -p $GLANCE_DIR/etc/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI

@@ -163,13 +159,11 @@ function init_glance() {

     $GLANCE_BIN_DIR/glance-manage db_sync

-    if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then

-        # Create cache dir

-        sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/api

-        sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/api

-        sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/registry

-        sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/registry

-    fi

+    # Create cache dir

+    sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/api

+    sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/api

+    sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/registry

+    sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/registry

 }

 # install_glanceclient() - Collect source and prepare

@@ -172,9 +172,7 @@ function configure_nova() {

         " -i $NOVA_API_PASTE_INI

     fi

-    if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then

-        iniset $NOVA_API_PASTE_INI filter:authtoken signing_dir $NOVA_AUTH_CACHE_DIR

-    fi

+    iniset $NOVA_API_PASTE_INI filter:authtoken signing_dir $NOVA_AUTH_CACHE_DIR

     if is_service_enabled n-cpu; then

         # Force IP forwarding on, just on case

@@ -418,11 +416,9 @@ function init_nova() {

         $NOVA_BIN_DIR/nova-manage db sync

     fi

-    if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then

-        # Create cache dir

-        sudo mkdir -p $NOVA_AUTH_CACHE_DIR

-        sudo chown `whoami` $NOVA_AUTH_CACHE_DIR

-    fi

+    # Create cache dir

+    sudo mkdir -p $NOVA_AUTH_CACHE_DIR

+    sudo chown `whoami` $NOVA_AUTH_CACHE_DIR

 }

 # install_novaclient() - Collect source and prepare

@@ -123,12 +123,10 @@ function quantum_setup_keystone() {

     iniset $conf_file $section admin_tenant_name $SERVICE_TENANT_NAME

     iniset $conf_file $section admin_user $Q_ADMIN_USERNAME

     iniset $conf_file $section admin_password $SERVICE_PASSWORD

-    if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then

-        iniset $conf_file $section signing_dir $QUANTUM_AUTH_CACHE_DIR

-        # Create cache dir

-        sudo mkdir -p $QUANTUM_AUTH_CACHE_DIR

-        sudo chown `whoami` $QUANTUM_AUTH_CACHE_DIR

-    fi

+    iniset $conf_file $section signing_dir $QUANTUM_AUTH_CACHE_DIR

+    # Create cache dir

+    sudo mkdir -p $QUANTUM_AUTH_CACHE_DIR

+    sudo chown `whoami` $QUANTUM_AUTH_CACHE_DIR

 }

 function quantum_setup_ovs_bridge() {