Andrew Bogott has submitted this change and it was merged. Change subject: Update glance config for icehouse ......................................................................
Update glance config for icehouse Change-Id: I7242c02e9a5cd45cfc883952c3824a7196bd73ad --- M modules/openstack/templates/icehouse/glance/glance-api.conf.erb 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb index f7a0399..e658e60 100644 --- a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb +++ b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb @@ -43,11 +43,6 @@ # Not supported on OS X. #tcp_keepidle = 600 -# SQLAlchemy connection string for the reference implementation -# registry server. Any valid SQLAlchemy connection string is fine. -# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine -sql_connection = mysql://<%= glanceconfig["db_user"] %>:<%= glanceconfig["db_pass"] %>@<%= glanceconfig["db_host"] %>/<%= glanceconfig["db_name"] %> - # Period in seconds after which SQLAlchemy should reestablish its connection # to the database. # @@ -141,6 +136,7 @@ # Configuration options if sending notifications via rabbitmq (these are # the defaults) +rpc_backend = rabbit rabbit_host = localhost rabbit_port = 5672 rabbit_use_ssl = false @@ -327,3 +323,10 @@ # [pipeline:glance-api-keystone], you would configure the flavor below # as 'keystone'. flavor=keystone + +[database] +# SQLAlchemy connection string for the reference implementation +# registry server. Any valid SQLAlchemy connection string is fine. +# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine +connection = mysql://<%= glanceconfig["db_user"] %>:<%= glanceconfig["db_pass"] %>@<%= glanceconfig["db_host"] %>/<%= glanceconfig["db_name"] %> + -- To view, visit https://gerrit.wikimedia.org/r/174421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7242c02e9a5cd45cfc883952c3824a7196bd73ad Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
