Andrew Bogott has submitted this change and it was merged.
Change subject: Use proper novaconfig[] settings in environment scripts.
......................................................................
Use proper novaconfig[] settings in environment scripts.
Followup to e2513914819f5f121c42e9714d048aebb9b68689
Change-Id: I68d478e317676b4b2f7cfe974f815432c2e10769
---
M modules/openstack/manifests/envscripts.pp
M modules/openstack/templates/novaenv.sh.erb
M modules/openstack/templates/wmflabsorg-domainadminenv.sh.erb
3 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/envscripts.pp
b/modules/openstack/manifests/envscripts.pp
index 6d968a6..82a9b5b 100644
--- a/modules/openstack/manifests/envscripts.pp
+++ b/modules/openstack/manifests/envscripts.pp
@@ -4,6 +4,7 @@
$designateconfig
) {
+ $nova_region = $::site
# Handy script to set up environment for commandline nova magic
file { '/root/novaenv.sh':
content => template('openstack/novaenv.sh.erb'),
diff --git a/modules/openstack/templates/novaenv.sh.erb
b/modules/openstack/templates/novaenv.sh.erb
index d63f13b..4670695 100644
--- a/modules/openstack/templates/novaenv.sh.erb
+++ b/modules/openstack/templates/novaenv.sh.erb
@@ -1,8 +1,8 @@
export OS_USERNAME="novaadmin"
export OS_PROJECT_DOMAIN_ID="default"
export OS_USER_DOMAIN_ID="default"
-export OS_PASSWORD="<%= @wikitech_nova_ldap_user_pass %>"
-export OS_AUTH_URL="http://<%= @nova_controller_hostname %>:35357/v3"
+export OS_PASSWORD="<%= @novaconfig['ldap_user_pass'] %>"
+export OS_AUTH_URL="http://<%= @novaconfig['controller_hostname'] %>:35357/v3"
export OS_REGION_NAME="<%= @nova_region %>"
export OS_TENANT_NAME="testlabs"
export OS_NO_CACHE=1
diff --git a/modules/openstack/templates/wmflabsorg-domainadminenv.sh.erb
b/modules/openstack/templates/wmflabsorg-domainadminenv.sh.erb
index 49ea7e6..d5debb6 100644
--- a/modules/openstack/templates/wmflabsorg-domainadminenv.sh.erb
+++ b/modules/openstack/templates/wmflabsorg-domainadminenv.sh.erb
@@ -4,7 +4,7 @@
export OS_PROJECT_DOMAIN_ID="default"
export OS_USER_DOMAIN_ID="default"
export OS_PASSWORD="<%= @designateconfig['wmflabsdotorg_pass'] %>"
-export OS_AUTH_URL="http://<%= @nova_controller_hostname %>:35357/v3"
+export OS_AUTH_URL="http://<%= @novaconfig['controller_hostname'] %>:35357/v3"
export OS_REGION_NAME="<%= @nova_region %>"
export OS_TENANT_NAME="<%= @designateconfig['wmflabsdotorg_project'] %>"
export OS_NO_CACHE=1
--
To view, visit https://gerrit.wikimedia.org/r/277311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68d478e317676b4b2f7cfe974f815432c2e10769
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
