From 69de0776727fab6659cfa18b13feb1715bc6000b Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Wed, 21 Mar 2012 10:51:02 -0700 Subject: [PATCH] Resync past configs with devstack.sh v1, issue #75 --- conf/stack.ini | 2 +- conf/templates/glance/glance-api-paste.ini | 6 +----- conf/templates/glance/glance-registry-paste.ini | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/conf/stack.ini b/conf/stack.ini index 28bb2f3f..1a0e24f6 100644 --- a/conf/stack.ini +++ b/conf/stack.ini @@ -141,7 +141,7 @@ volume_name_postfix = ${VOLUME_NAME_POSTFIX:-%08x} instance_name_prefix = ${INSTANCE_NAME_PREFIX:-instance-} instance_name_postfix = ${INSTANCE_NAME_POSTFIX:-%08x} -# Where instances will be stored +# Where instances will be stored defaults to $NOVA_DIR/instances instances_path = ${INSTANCES_PATH:-} # Are we setup in multihost mode? diff --git a/conf/templates/glance/glance-api-paste.ini b/conf/templates/glance/glance-api-paste.ini index 7364aa68..cdbd2400 100644 --- a/conf/templates/glance/glance-api-paste.ini +++ b/conf/templates/glance/glance-api-paste.ini @@ -1,4 +1,4 @@ -# From devstack commit 6aef757432595ec4aa318c20246bf1d6aaf681db +# From devstack commit ecdd8fc6ba872f7615bf78a1df71e3dc7d8e1d23 [pipeline:glance-api] #pipeline = versionnegotiation context apiv1app @@ -32,10 +32,6 @@ glance.filter_factory = glance.common.context:ContextMiddleware [filter:authtoken] paste.filter_factory = keystone.middleware.auth_token:filter_factory -# FIXME(dtroyer): remove these service_* entries after auth_token is updated -service_host = %KEYSTONE_SERVICE_HOST% -service_port = %KEYSTONE_SERVICE_PORT% -service_protocol = %KEYSTONE_SERVICE_PROTOCOL% auth_host = %KEYSTONE_AUTH_HOST% auth_port = %KEYSTONE_AUTH_PORT% auth_protocol = %KEYSTONE_AUTH_PROTOCOL% diff --git a/conf/templates/glance/glance-registry-paste.ini b/conf/templates/glance/glance-registry-paste.ini index ad97e51d..7085b2ab 100644 --- a/conf/templates/glance/glance-registry-paste.ini +++ b/conf/templates/glance/glance-registry-paste.ini @@ -1,4 +1,4 @@ -# From devstack commit 6aef757432595ec4aa318c20246bf1d6aaf681db +# From devstack commit ecdd8fc6ba872f7615bf78a1df71e3dc7d8e1d23 [pipeline:glance-registry] #pipeline = context registryapp @@ -16,10 +16,6 @@ glance.filter_factory = glance.common.context:ContextMiddleware [filter:authtoken] paste.filter_factory = keystone.middleware.auth_token:filter_factory -# FIXME(dtroyer): remove these service_* entries after auth_token is updated -service_host = %KEYSTONE_SERVICE_HOST% -service_port = %KEYSTONE_SERVICE_PORT% -service_protocol = %KEYSTONE_SERVICE_PROTOCOL% auth_host = %KEYSTONE_AUTH_HOST% auth_port = %KEYSTONE_AUTH_PORT% auth_protocol = %KEYSTONE_AUTH_PROTOCOL%