Andrew Bogott has submitted this change and it was merged.
Change subject: Puppet Horizon Panel: Deploy on Labs
......................................................................
Puppet Horizon Panel: Deploy on Labs
Bug: T91990
Change-Id: I89f9ef6a896b711acfaef305dc767a50ed50c672
---
M manifests/site.pp
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index efc46b3..6e82d39 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -215,6 +215,7 @@
role(horizon, striker::web)
include standard
include base::firewall
+ include openstack::horizon::puppetpanel
}
# DHCP / TFTP
@@ -1403,12 +1404,7 @@
role(labs::openstack::nova::manager, mariadb::wikitech, horizon)
include base::firewall
include standard
-
- class { 'openstack::horizon::puppetpanel':
- # Currently we only have Liberty code for this,
- # but it works fine with mitaka Horizon.
- openstack_version => 'liberty',
- }
+ include openstack::horizon::puppetpanel
interface::add_ip6_mapped { 'main': }
}
--
To view, visit https://gerrit.wikimedia.org/r/311449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89f9ef6a896b711acfaef305dc767a50ed50c672
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
