Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386799 )
Change subject: Cumin: fix wmf-style violations
......................................................................
Cumin: fix wmf-style violations
Change-Id: I848002ea3e38e63d154d64bb4638bc33b4ef4b2a
---
M modules/profile/manifests/cumin/master.pp
M modules/profile/manifests/cumin/target.pp
M modules/role/manifests/cumin/master.pp
3 files changed, 10 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, but someone else must approve
Volans: Looks good to me, approved
diff --git a/modules/profile/manifests/cumin/master.pp
b/modules/profile/manifests/cumin/master.pp
index 2847240..1f0502d 100644
--- a/modules/profile/manifests/cumin/master.pp
+++ b/modules/profile/manifests/cumin/master.pp
@@ -1,9 +1,9 @@
class profile::cumin::master (
$puppetdb_host = hiera('puppetmaster::puppetdb::master'),
- $cumin_log_path = '/var/log/cumin',
$datacenters = hiera('datacenters'),
) {
include passwords::phabricator
+ $cumin_log_path = '/var/log/cumin'
::keyholder::agent { 'cumin_master':
trusted_groups => ['root'],
diff --git a/modules/profile/manifests/cumin/target.pp
b/modules/profile/manifests/cumin/target.pp
index 805d93a..0d78875 100644
--- a/modules/profile/manifests/cumin/target.pp
+++ b/modules/profile/manifests/cumin/target.pp
@@ -5,7 +5,7 @@
# those anymore.
class profile::cumin::target(
$cluster = hiera('cluster', 'misc'),
- $site = $::site,
+ $site = $::site, # lint:ignore:wmf_styleguide
) {
if $::_roles {
$roles = prefix(keys($::_roles), 'role::')
@@ -21,9 +21,9 @@
$cumin_master_pub_key = secret('keyholder/cumin_master.pub')
ssh::userkey { 'root-cumin':
- ensure => present,
- user => 'root',
- skey => 'cumin',
- content => template('profile/cumin/userkey.erb'),
+ ensure => present,
+ user => 'root',
+ skey => 'cumin',
+ content => template('profile/cumin/userkey.erb'),
}
}
diff --git a/modules/role/manifests/cumin/master.pp
b/modules/role/manifests/cumin/master.pp
index 467c8de..8bc15c8 100644
--- a/modules/role/manifests/cumin/master.pp
+++ b/modules/role/manifests/cumin/master.pp
@@ -4,4 +4,8 @@
#
class role::cumin::master {
include ::profile::cumin::master
+
+ system::role { 'cumin::master':
+ description => 'Install Cumin and configure the host to be a Cumin
master',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/386799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I848002ea3e38e63d154d64bb4638bc33b4ef4b2a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
