summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-glance/glance-api.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-glance/glance-api.conf')
-rw-r--r--meta-openstack/recipes-devtools/python/python-glance/glance-api.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-glance/glance-api.conf b/meta-openstack/recipes-devtools/python/python-glance/glance-api.conf
index 433306e..a3382ef 100644
--- a/meta-openstack/recipes-devtools/python/python-glance/glance-api.conf
+++ b/meta-openstack/recipes-devtools/python/python-glance/glance-api.conf
@@ -47,8 +47,8 @@ backlog = 4096
47# registry server. Any valid SQLAlchemy connection string is fine. 47# registry server. Any valid SQLAlchemy connection string is fine.
48# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine 48# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
49#sql_connection = mysql:///root:@localhost/glance?charset=utf8 49#sql_connection = mysql:///root:@localhost/glance?charset=utf8
50sql_connection = sqlite:////etc/glance/glance.db 50#sql_connection = sqlite:////etc/glance/glance.db
51 51sql_connection = postgresql://nova:nova@localhost/glance
52 52
53# Period in seconds after which SQLAlchemy should reestablish its connection 53# Period in seconds after which SQLAlchemy should reestablish its connection
54# to the database. 54# to the database.
@@ -343,9 +343,9 @@ image_cache_dir = /var/lib/glance/image_cache/
343auth_host = 127.0.0.1 343auth_host = 127.0.0.1
344auth_port = 35357 344auth_port = 35357
345auth_protocol = http 345auth_protocol = http
346admin_tenant_name = %SERVICE_TENANT_NAME% 346admin_tenant_name = service
347admin_user = %SERVICE_USER% 347admin_user = admin
348admin_password = %SERVICE_PASSWORD% 348admin_password = password
349 349
350[paste_deploy] 350[paste_deploy]
351# Name of the paste configuration file that defines the available pipelines 351# Name of the paste configuration file that defines the available pipelines