Andrew Bogott has submitted this change and it was merged. Change subject: Use hiera values rather than hard-coded names for project in designate.conf. ......................................................................
Use hiera values rather than hard-coded names for project in designate.conf. Also... that last patch overcorrected... nova still calls testlabs 'testlabs' apparently. Change-Id: I4547fe38b39849f3608ba50064c41fe2455f6e17 --- M modules/openstack/templates/kilo/designate/designate.conf.erb 1 file changed, 3 insertions(+), 6 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb b/modules/openstack/templates/kilo/designate/designate.conf.erb index 9df368b..d4b2557 100644 --- a/modules/openstack/templates/kilo/designate/designate.conf.erb +++ b/modules/openstack/templates/kilo/designate/designate.conf.erb @@ -221,8 +221,7 @@ reverse_format = '%(hostname)s.%(project_name)s.%(domain)s' keystone_auth_name = "novaadmin" keystone_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>" -# This is the id for 'testlabs': -keystone_auth_project = "669709120c054d078d04d8b90d1a8a1e" +keystone_auth_project = <%= @keystoneconfig['admin_project_id'] %> keystone_auth_url = "http://<%= @designateconfig['controller_hostname'] %>:35357/v3" #----------------------- @@ -239,13 +238,11 @@ ldappassword = <%= @keystoneconfig['ldap_user_pass'] %> nova_auth_name = "novaadmin" nova_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>" -# This is the id for 'testlabs': -nova_auth_project = "669709120c054d078d04d8b90d1a8a1e" +nova_auth_project = "<%= @keystoneconfig['admin_project_name'] %>" nova_auth_url = "http://<%= @designateconfig['controller_hostname'] %>:35357/v2.0" keystone_auth_name = "novaadmin" keystone_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>" -# This is the id for 'testlabs': -keystone_auth_project = "669709120c054d078d04d8b90d1a8a1e" +keystone_auth_project = <%= @keystoneconfig['admin_project_id'] %> keystone_auth_url = "http://<%= @designateconfig['controller_hostname'] %>:35357/v3" certmanager_user = certmanager -- To view, visit https://gerrit.wikimedia.org/r/270330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4547fe38b39849f3608ba50064c41fe2455f6e17 Gerrit-PatchSet: 2 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
