Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220180
Change subject: puppetmaster: don't depend scripts on role::access_new_install
......................................................................
puppetmaster: don't depend scripts on role::access_new_install
Otherwise puppet breaks on the backends where we don't have new_install key
deployed, also revert realm detection as without the dependency it isn't
necessary.
Bug: T103499
Change-Id: I2df6380f2d45a9f158eb543cfe96868d6c982cbf
---
M modules/puppetmaster/manifests/scripts.pp
1 file changed, 15 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/220180/1
diff --git a/modules/puppetmaster/manifests/scripts.pp
b/modules/puppetmaster/manifests/scripts.pp
index 129c034..1313d6c 100644
--- a/modules/puppetmaster/manifests/scripts.pp
+++ b/modules/puppetmaster/manifests/scripts.pp
@@ -43,21 +43,21 @@
}
# Helper script to clean stored data about a server we're reimaging.
- if $::realm == 'production' {
- file { '/usr/local/bin/wmf-reimage':
- ensure => 'present',
- owner => 'root',
- group => 'root',
- mode => '0544',
- source => 'puppet:///modules/puppetmaster/wmf-reimage',
- }
+ file { '/usr/local/bin/wmf-reimage':
+ ensure => 'present',
+ owner => 'root',
+ group => 'root',
+ mode => '0544',
+ source => 'puppet:///modules/puppetmaster/wmf-reimage',
+ }
- file { '/usr/local/sbin/install-console':
- ensure => 'present',
- owner => 'root',
- group => 'root',
- mode => '0544',
- source => 'puppet:///modules/puppetmaster/install-console',
- }
+ # Log in using SSH into a machine running debian-installer or before the
+ # first puppet run.
+ file { '/usr/local/sbin/install-console':
+ ensure => 'present',
+ owner => 'root',
+ group => 'root',
+ mode => '0544',
+ source => 'puppet:///modules/puppetmaster/install-console',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/220180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2df6380f2d45a9f158eb543cfe96868d6c982cbf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
