diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-glance/glance-api.conf | 4 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-glance/glance-registry.conf | 2 |
2 files changed, 2 insertions, 4 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 a3382ef..cc7c43d 100644 --- a/meta-openstack/recipes-devtools/python/python-glance/glance-api.conf +++ b/meta-openstack/recipes-devtools/python/python-glance/glance-api.conf | |||
@@ -46,9 +46,7 @@ backlog = 4096 | |||
46 | # SQLAlchemy connection string for the reference implementation | 46 | # SQLAlchemy connection string for the reference implementation |
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 = postgresql://admin:admin@localhost/glance |
50 | #sql_connection = sqlite:////etc/glance/glance.db | ||
51 | sql_connection = postgresql://nova:nova@localhost/glance | ||
52 | 50 | ||
53 | # Period in seconds after which SQLAlchemy should reestablish its connection | 51 | # Period in seconds after which SQLAlchemy should reestablish its connection |
54 | # to the database. | 52 | # to the database. |
diff --git a/meta-openstack/recipes-devtools/python/python-glance/glance-registry.conf b/meta-openstack/recipes-devtools/python/python-glance/glance-registry.conf index e751109..a4675d0 100644 --- a/meta-openstack/recipes-devtools/python/python-glance/glance-registry.conf +++ b/meta-openstack/recipes-devtools/python/python-glance/glance-registry.conf | |||
@@ -25,7 +25,7 @@ backlog = 4096 | |||
25 | # SQLAlchemy connection string for the reference implementation | 25 | # SQLAlchemy connection string for the reference implementation |
26 | # registry server. Any valid SQLAlchemy connection string is fine. | 26 | # registry server. Any valid SQLAlchemy connection string is fine. |
27 | # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine | 27 | # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine |
28 | sql_connection = postgresql://nova:nova@localhost/glance | 28 | sql_connection = postgresql://admin:admin@localhost/glance |
29 | 29 | ||
30 | # Period in seconds after which SQLAlchemy should reestablish its connection | 30 | # Period in seconds after which SQLAlchemy should reestablish its connection |
31 | # to the database. | 31 | # to the database. |