Rush has submitted this change and it was merged.
Change subject: labstore: Add account_services to secondary cluster
......................................................................
labstore: Add account_services to secondary cluster
* can run on both secondary cluster nodes
* remove from labstore1001
Bug: T151014
Change-Id: Ia13e8dbc2977e57032e2e678c97fa8c35b58860e
---
M modules/labstore/manifests/account_services.pp
M modules/labstore/manifests/fileserver/primary.pp
M modules/role/manifests/labs/nfs/secondary.pp
3 files changed, 4 insertions(+), 17 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/modules/labstore/manifests/account_services.pp
b/modules/labstore/manifests/account_services.pp
index ba21125..082dfcc 100644
--- a/modules/labstore/manifests/account_services.pp
+++ b/modules/labstore/manifests/account_services.pp
@@ -27,10 +27,6 @@
ensure => present,
}
- # Set to true only for the labstore that is currently
- # actively serving files
- $is_active = (hiera('active_labstore_host') == $::hostname)
-
$ldapconfig = hiera_hash('labsldapconfig', {})
include passwords::mysql::labsdb
@@ -77,21 +73,12 @@
mode => '0550',
}
- # Terrible hack
- if $is_active {
- $service_ensure = 'present'
- } else {
- $service_ensure = 'absent'
- }
-
base::service_unit { 'create-dbusers':
- ensure => $service_ensure,
+ ensure => present,
systemd => true,
}
- if $is_active {
- nrpe::monitor_systemd_unit_state { 'create-dbusers':
- description => 'Ensure mysql credential creation for tools users
is running',
- }
+ nrpe::monitor_systemd_unit_state { 'create-dbusers':
+ description => 'Ensure mysql credential creation for tools users is
running',
}
}
diff --git a/modules/labstore/manifests/fileserver/primary.pp
b/modules/labstore/manifests/fileserver/primary.pp
index cdf4642..35af693 100644
--- a/modules/labstore/manifests/fileserver/primary.pp
+++ b/modules/labstore/manifests/fileserver/primary.pp
@@ -8,7 +8,6 @@
include labstore
include labstore::fileserver::exports
- include labstore::account_services
require_package('python3-paramiko')
require_package('python3-pymysql')
diff --git a/modules/role/manifests/labs/nfs/secondary.pp
b/modules/role/manifests/labs/nfs/secondary.pp
index 63314c2..c67af91 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -7,6 +7,7 @@
include labstore::fileserver::exports
include labstore::fileserver::secondary
include labstore::backup_keys
+ include labstore::account_services
# Enable RPS to balance IRQs over CPUs
interface::rps { $monitor: }
--
To view, visit https://gerrit.wikimedia.org/r/322224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia13e8dbc2977e57032e2e678c97fa8c35b58860e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
