[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::scap: fetch mediawiki after mwdeploy has its sudo...

2018-01-16 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404431 )

Change subject: mediawiki::scap: fetch mediawiki after mwdeploy has its sudo 
rules
..


mediawiki::scap: fetch mediawiki after mwdeploy has its sudo rules

This causes a resource order problem causing scap pull to fail during
the first puppet run.

Change-Id: I69e96b8e1c5ae819ddd4e6c627104ea15a2c52b7
---
M modules/mediawiki/manifests/scap.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified
  Volans: Looks good to me, but someone else must approve



diff --git a/modules/mediawiki/manifests/scap.pp 
b/modules/mediawiki/manifests/scap.pp
index 73d72fd..903b773 100644
--- a/modules/mediawiki/manifests/scap.pp
+++ b/modules/mediawiki/manifests/scap.pp
@@ -43,7 +43,7 @@
 exec { 'fetch_mediawiki':
 command => "${scap_bin_dir}/scap pull",
 creates => "${mediawiki_deployment_dir}/docroot",
-require => [ File[$mediawiki_deployment_dir], Package['scap'] ],
+require => [ File[$mediawiki_deployment_dir], Package['scap'], 
Sudo::User['mwdeploy'] ],
 timeout => 30 * 60,  # 30 minutes
 user=> 'mwdeploy',
 group   => 'mwdeploy',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69e96b8e1c5ae819ddd4e6c627104ea15a2c52b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::scap: fetch mediawiki after mwdeploy has its sudo...

2018-01-16 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404431 )

Change subject: mediawiki::scap: fetch mediawiki after mwdeploy has its sudo 
rules
..

mediawiki::scap: fetch mediawiki after mwdeploy has its sudo rules

This causes a resource order problem causing scap pull to fail during
the first puppet run.

Change-Id: I69e96b8e1c5ae819ddd4e6c627104ea15a2c52b7
---
M modules/mediawiki/manifests/scap.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/404431/1

diff --git a/modules/mediawiki/manifests/scap.pp 
b/modules/mediawiki/manifests/scap.pp
index 73d72fd..903b773 100644
--- a/modules/mediawiki/manifests/scap.pp
+++ b/modules/mediawiki/manifests/scap.pp
@@ -43,7 +43,7 @@
 exec { 'fetch_mediawiki':
 command => "${scap_bin_dir}/scap pull",
 creates => "${mediawiki_deployment_dir}/docroot",
-require => [ File[$mediawiki_deployment_dir], Package['scap'] ],
+require => [ File[$mediawiki_deployment_dir], Package['scap'], 
Sudo::User['mwdeploy'] ],
 timeout => 30 * 60,  # 30 minutes
 user=> 'mwdeploy',
 group   => 'mwdeploy',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69e96b8e1c5ae819ddd4e6c627104ea15a2c52b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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