x/anvil
Code Issues Proposed changes

Resync past configs with devstack.sh v1, issue #75

Browse Source
This commit is contained in:
Joshua Harlow 2012-03-21 10:51:02 -07:00
parent 835ee03fa0
commit 69de077672
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/stack.ini
View File

@ -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?

6
conf/templates/glance/glance-api-paste.ini
View File

@ -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%

6
conf/templates/glance/glance-registry-paste.ini
View File

@ -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%