Matanya has uploaded a new change for review. https://gerrit.wikimedia.org/r/215693
Change subject: glance: qualify vars ...................................................................... glance: qualify vars bug: T97251 Change-Id: I7c12148e3d7a4152afe58a3e32922c9405a54516 --- M modules/openstack/templates/icehouse/glance/glance-registry.conf.erb 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/93/215693/1 diff --git a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb index 700f429..1f9dfb0 100644 --- a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb +++ b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb @@ -6,7 +6,7 @@ debug = False # Address to bind the registry server -bind_host = <%= glanceconfig["bind_ip"] %> +bind_host = <%= @glanceconfig["bind_ip"] %> # Port the bind the registry server to bind_port = 9191 @@ -64,14 +64,14 @@ #ca_file = /path/to/cafile [keystone_authtoken] -service_protocol = <%= glanceconfig["keystone_auth_protocol"] %> -service_host = <%= glanceconfig["keystone_auth_host"] %> +service_protocol = <%= @glanceconfig["keystone_auth_protocol"] %> +service_host = <%= @glanceconfig["keystone_auth_host"] %> service_port = 5000 -auth_host = <%= glanceconfig["keystone_auth_host"] %> -auth_port = <%= glanceconfig["keystone_auth_port"] %> -auth_protocol = <%= glanceconfig["keystone_auth_protocol"] %> -admin_token = <%= glanceconfig["keystone_admin_token"] %> -auth_uri = <%= glanceconfig["auth_uri"] %> +auth_host = <%= @glanceconfig["keystone_auth_host"] %> +auth_port = <%= @glanceconfig["keystone_auth_port"] %> +auth_protocol = <%= @glanceconfig["keystone_auth_protocol"] %> +admin_token = <%= @glanceconfig["keystone_admin_token"] %> +auth_uri = <%= @glanceconfig["auth_uri"] %> [paste_deploy] # Name of the paste configuration file that defines the available pipelines @@ -88,4 +88,4 @@ # 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"] %> +connection = mysql://<%= @glanceconfig["db_user"] %>:<%= @glanceconfig["db_pass"] %>@<%= @glanceconfig["db_host"] %>/<%= @glanceconfig["db_name"] %> -- To view, visit https://gerrit.wikimedia.org/r/215693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c12148e3d7a4152afe58a3e32922c9405a54516 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya <mata...@foss.co.il> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
