coren has submitted this change and it was merged.
Change subject: Labs: Tweaks to labstore config for migration
......................................................................
Labs: Tweaks to labstore config for migration
- set $site
- disable autostart of manage-nfs-volumes
Change-Id: I517ea7f7e4a960f93dfbe7e86ba43ea48f129af6
---
M manifests/openstack.pp
M manifests/site.pp
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 77ad815..9c8206e 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -153,7 +153,6 @@
service { "manage-nfs-volumes":
enable => true,
- ensure => running,
require => Generic::Upstart_job["manage-nfs-volumes"];
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 5a3d61a..bad6122 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1234,6 +1234,7 @@
node /labstore[12]\.pmtpa\.wmnet/ {
+ $site = 'pmtpa'
$cluster = "gluster"
$ldapincludes = ['openldap', 'nss', 'utils']
@@ -1252,6 +1253,7 @@
node /labstore[34]\.pmtpa\.wmnet/ {
+ $site = 'pmtpa'
$cluster = "labsnfs"
$ldapincludes = ['openldap', 'nss', 'utils']
@@ -1273,6 +1275,7 @@
node /labstore100[12]\.eqiad\.wmnet/ {
+ $site = 'eqiad'
$cluster = "labsnfs"
$ldapincludes = ['openldap', 'nss', 'utils']
--
To view, visit https://gerrit.wikimedia.org/r/113953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I517ea7f7e4a960f93dfbe7e86ba43ea48f129af6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
