Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385479 )
Change subject: quarry: use profile::labs::lvm::srv instead of role
......................................................................
quarry: use profile::labs::lvm::srv instead of role
require would ensure all resources it contains (eg Mount['/srv']) are
released before the rest.
Change-Id: Ifa5d7ab0a948a3bca28cbbd0e315b1d065ff93dd
---
M modules/role/manifests/labs/quarry/celeryrunner.pp
M modules/role/manifests/labs/quarry/database.pp
M modules/role/manifests/labs/quarry/redis.pp
M modules/role/manifests/labs/quarry/web.pp
4 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/labs/quarry/celeryrunner.pp
b/modules/role/manifests/labs/quarry/celeryrunner.pp
index 1104d3f..b8480b5 100644
--- a/modules/role/manifests/labs/quarry/celeryrunner.pp
+++ b/modules/role/manifests/labs/quarry/celeryrunner.pp
@@ -1,9 +1,9 @@
# filtertags: labs-project-quarry
class role::labs::quarry::celeryrunner {
- include role::labs::lvm::srv
+ require ::profile::labs::lvm::srv
include ::labs_debrepo
class { '::quarry::celeryrunner':
- require => [Mount['/srv'], Class['::labs_debrepo']],
+ require => [Class['::labs_debrepo']],
}
}
diff --git a/modules/role/manifests/labs/quarry/database.pp
b/modules/role/manifests/labs/quarry/database.pp
index 858a48c..8e49156 100644
--- a/modules/role/manifests/labs/quarry/database.pp
+++ b/modules/role/manifests/labs/quarry/database.pp
@@ -1,8 +1,7 @@
# filtertags: labs-project-quarry
class role::labs::quarry::database {
- include role::labs::lvm::srv
+ require ::profile::labs::lvm::srv
class { '::quarry::database':
- require => Mount['/srv']
}
}
diff --git a/modules/role/manifests/labs/quarry/redis.pp
b/modules/role/manifests/labs/quarry/redis.pp
index 65ee50a..72e8e6b 100644
--- a/modules/role/manifests/labs/quarry/redis.pp
+++ b/modules/role/manifests/labs/quarry/redis.pp
@@ -1,8 +1,7 @@
# filtertags: labs-project-quarry
class role::labs::quarry::redis {
- include role::labs::lvm::srv
+ require ::profile::labs::lvm::srv
class { '::quarry::redis':
- require => Mount['/srv']
}
}
diff --git a/modules/role/manifests/labs/quarry/web.pp
b/modules/role/manifests/labs/quarry/web.pp
index 9feb661..ad50d68 100644
--- a/modules/role/manifests/labs/quarry/web.pp
+++ b/modules/role/manifests/labs/quarry/web.pp
@@ -1,9 +1,9 @@
# filtertags: labs-project-quarry
class role::labs::quarry::web {
- include role::labs::lvm::srv
+ require ::profile::labs::lvm::srv
include ::labs_debrepo
class { '::quarry::web':
- require => [Mount['/srv'], Class['::labs_debrepo']],
+ require => [Class['::labs_debrepo']],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/385479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa5d7ab0a948a3bca28cbbd0e315b1d065ff93dd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
