Faidon Liambotis has submitted this change and it was merged.

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

Bug: T103499
Change-Id: Ie785fca4451da125d8ad2b065006afd790a4b020
---
M modules/puppetmaster/manifests/scripts.pp
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/puppetmaster/manifests/scripts.pp 
b/modules/puppetmaster/manifests/scripts.pp
index 5a40665..129c034 100644
--- a/modules/puppetmaster/manifests/scripts.pp
+++ b/modules/puppetmaster/manifests/scripts.pp
@@ -50,7 +50,6 @@
             group   => 'root',
             mode    => '0544',
             source  => 'puppet:///modules/puppetmaster/wmf-reimage',
-            require => Class['role::access_new_install'],
         }
 
         file { '/usr/local/sbin/install-console':
@@ -59,7 +58,6 @@
             group   => 'root',
             mode    => '0544',
             source  => 'puppet:///modules/puppetmaster/install-console',
-            require => Class['role::access_new_install'],
         }
     }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/220154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie785fca4451da125d8ad2b065006afd790a4b020
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to