Andrew Bogott has submitted this change and it was merged. Change subject: Revert most of "Nova config changes for icehouse" ......................................................................
Revert most of "Nova config changes for icehouse" This reverts commit 25c709a517b9cc391dd459254bac5d70b600765c. This was breaking things. Change-Id: I7d1a4774c270f46119ad0e96b23cd54ae4d8494d --- M modules/openstack/templates/icehouse/nova/api-paste.ini.erb 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/icehouse/nova/api-paste.ini.erb b/modules/openstack/templates/icehouse/nova/api-paste.ini.erb index 53ff365..2b36b0f 100644 --- a/modules/openstack/templates/icehouse/nova/api-paste.ini.erb +++ b/modules/openstack/templates/icehouse/nova/api-paste.ini.erb @@ -119,3 +119,12 @@ [filter:authtoken] paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory +service_protocol = http +service_host = <%= novaconfig["keystone_auth_host"] %> +service_port = 5000 +auth_host = <%= novaconfig["keystone_auth_host"] %> +auth_port = <%= novaconfig["keystone_auth_port"] %> +auth_protocol = <%= novaconfig["keystone_auth_protocol"] %> +admin_token = <%= novaconfig["keystone_admin_token"] %> +signing_dir = /tmp/keystone-signing-nova +auth_uri = <%= novaconfig["auth_uri"] %> -- To view, visit https://gerrit.wikimedia.org/r/174470 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d1a4774c270f46119ad0e96b23cd54ae4d8494d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
