Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161013
Change subject: Turn on dns and ldap on labcontrol2001.
......................................................................
Turn on dns and ldap on labcontrol2001.
Change-Id: I6c7787eb495160c3e266198fae86e6cfd2c22418
---
M manifests/site.pp
M modules/ldap/manifests/role/server.pp
2 files changed, 25 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/161013/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 6fbf883..a252bd5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3045,6 +3045,27 @@
include role::deployment::salt_masters::labs
}
+node 'labcontrol2001.wikimedia.org' {
+ $cluster = 'virt'
+ $ganglia_aggregator = true
+ #$is_puppet_master = true
+ #$is_labs_puppet_master = true
+ #$openstack_version = 'folsom'
+ #$use_neutron = false
+ $puppet_version = '3'
+
+ include standard
+ include admin
+ include role::dns::ldap
+ include ldap::role::server::labs
+ include ldap::role::client::labs
+
+ #include role::nova::controller
+ #include role::nova::manager
+ #include role::salt::masters::labs
+ #include role::deployment::salt_masters::labs
+}
+
node 'labnet1001.eqiad.wmnet' {
$cluster = 'virt'
$openstack_version = 'havana'
diff --git a/modules/ldap/manifests/role/server.pp
b/modules/ldap/manifests/role/server.pp
index 608b962..3ef7764 100644
--- a/modules/ldap/manifests/role/server.pp
+++ b/modules/ldap/manifests/role/server.pp
@@ -26,8 +26,11 @@
'virt1000': {
$certificate = 'virt1000.wikimedia.org'
}
+ 'labcontrol2001': {
+ $certificate = 'labcontrol2001.wikimedia.org'
+ }
'default': {
- fail('Production realm ldap certificates for
virt0/1000 only!')
+ fail('Production realm ldap certificates for
virt0/1000/labcontrol2001 only!')
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/161013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c7787eb495160c3e266198fae86e6cfd2c22418
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
