Andrew Bogott has submitted this change and it was merged.
Change subject: Add wmflabsdotorg credentials to horizon config
......................................................................
Add wmflabsdotorg credentials to horizon config
Bug: T129245
Change-Id: I9fce4c30d008aaf2361a973036ab279a71244fad
---
M manifests/role/horizon.pp
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/templates/liberty/horizon/local_settings.py.erb
3 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/horizon.pp b/manifests/role/horizon.pp
index b8734fb..281fb6b 100644
--- a/manifests/role/horizon.pp
+++ b/manifests/role/horizon.pp
@@ -6,6 +6,7 @@
class { 'openstack::horizon::service':
openstack_version => $::openstack_version,
novaconfig => $novaconfig,
+ designateconfig => $designateconfig,
}
ferm::service { 'horizon_http':
diff --git a/modules/openstack/manifests/horizon/service.pp
b/modules/openstack/manifests/horizon/service.pp
index 4d2debc..b15f738 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -3,7 +3,8 @@
class openstack::horizon::service(
$openstack_version = $::openstack::version,
$webserver_hostname = 'horizon.wikimedia.org',
- $novaconfig)
+ $novaconfig,
+ $designateconfig)
{
# basic horizon packages and config
include openstack::repo
diff --git a/modules/openstack/templates/liberty/horizon/local_settings.py.erb
b/modules/openstack/templates/liberty/horizon/local_settings.py.erb
index 31e4630..ed8ff3e 100644
--- a/modules/openstack/templates/liberty/horizon/local_settings.py.erb
+++ b/modules/openstack/templates/liberty/horizon/local_settings.py.erb
@@ -1,6 +1,6 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-###
puppet:///modules/openstack/templates/icehouse/horizon/local_settings.py.erb
+### puppet:///modules/openstack/templates/liberty/horizon/local_settings.py.erb
#####################################################################
import os
@@ -525,3 +525,6 @@
HORIZON_IMAGES_ALLOW_UPLOAD = False
DESIGNATE = { 'records_use_fips': True }
+
+WMFLABSDOTORG_ADMIN_USERNAME = '<%= @designateconfig['wmflabsdotorg_admin'] %>'
+WMFLABSDOTORG_ADMIN_PASSWORD = '<%= @designateconfig['wmflabsdotorg_pass'] %>'
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/278538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9fce4c30d008aaf2361a973036ab279a71244fad
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[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
