Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/220023
Change subject: puppetmaster: split frontend scripts ...................................................................... puppetmaster: split frontend scripts Backend puppetmaster don't have new_install key installed, thus we should copy dependent scripts only if the key is available. This fixes puppet broken on the backends after https://gerrit.wikimedia.org/r/#/c/217016/ Change-Id: Ifa91e035fa37f538804d8ac6a881422cda97ee32 --- M modules/puppetmaster/manifests/init.pp M modules/puppetmaster/manifests/scripts.pp A modules/puppetmaster/manifests/scripts/frontend.pp 3 files changed, 26 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/23/220023/1 diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp index c246cb4..c66b8d5 100644 --- a/modules/puppetmaster/manifests/init.pp +++ b/modules/puppetmaster/manifests/init.pp @@ -61,6 +61,7 @@ include ::apache::mod::proxy include ::apache::mod::proxy_http include ::apache::mod::proxy_balancer + include puppetmaster::scripts::frontend } class { 'puppetmaster::passenger': diff --git a/modules/puppetmaster/manifests/scripts.pp b/modules/puppetmaster/manifests/scripts.pp index a7cfd5a..64dceeb 100644 --- a/modules/puppetmaster/manifests/scripts.pp +++ b/modules/puppetmaster/manifests/scripts.pp @@ -41,23 +41,4 @@ hour => [0, 8, 16], # Run every 8 hours, to prevent excess load minute => 27, # Run at a time when hopefully no other cron jobs are } - - # Helper script to clean stored data about a server we're reimaging. - file { '/usr/local/bin/wmf-reimage': - ensure => 'present', - owner => 'root', - group => 'root', - mode => '0544', - source => 'puppet:///modules/puppetmaster/wmf-reimage', - require => Class['role::access_new_install'], - } - - file { '/usr/local/sbin/install-console': - ensure => 'present', - owner => 'root', - group => 'root', - mode => '0544', - source => 'puppet:///modules/puppetmaster/install-console', - require => Class['role::access_new_install'], - } } diff --git a/modules/puppetmaster/manifests/scripts/frontend.pp b/modules/puppetmaster/manifests/scripts/frontend.pp new file mode 100644 index 0000000..8e4446b --- /dev/null +++ b/modules/puppetmaster/manifests/scripts/frontend.pp @@ -0,0 +1,25 @@ +# Class: puppetmaster::scripts::frontend +# +# This class installs some puppetmaster server side scripts required by +# frontend puppetmaster. +# +class puppetmaster::scripts::frontend { + # Helper script to clean stored data about a server we're reimaging. + file { '/usr/local/bin/wmf-reimage': + ensure => 'present', + owner => 'root', + group => 'root', + mode => '0544', + source => 'puppet:///modules/puppetmaster/wmf-reimage', + require => Class['role::access_new_install'], + } + + file { '/usr/local/sbin/install-console': + ensure => 'present', + owner => 'root', + group => 'root', + mode => '0544', + source => 'puppet:///modules/puppetmaster/install-console', + require => Class['role::access_new_install'], + } +} -- To view, visit https://gerrit.wikimedia.org/r/220023 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa91e035fa37f538804d8ac6a881422cda97ee32 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
