[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolchecker: Fix directory dependencies

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334473 )

Change subject: toolchecker: Fix directory dependencies
..


toolchecker: Fix directory dependencies

Change-Id: I957faaf3ab074d1e5fafdfaeec9aaf4fe9a348ad
---
M modules/toollabs/manifests/check.pp
M modules/toollabs/manifests/checker.pp
2 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Madhuvishy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/toollabs/manifests/check.pp 
b/modules/toollabs/manifests/check.pp
index 73d7476..e3ba7b1 100644
--- a/modules/toollabs/manifests/check.pp
+++ b/modules/toollabs/manifests/check.pp
@@ -13,7 +13,6 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0644',
-require => File['etc/init/toolschecker'],
 notify  => Service["toolschecker_${check_name}"],
 }
 
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 4a2dad9..d67a491 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -109,6 +109,14 @@
 before => Toollabs::Check[keys($checks)],
 }
 
+file { '/etc/init/toolschecker':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
+before => Toollabs::Check[keys($checks)],
+}
+
 file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
 ensure => file,
 owner  => 'root',
@@ -134,13 +142,6 @@
 mode   => '0555',
 source => 
'puppet:///modules/toollabs/toolschecker_lighttpd_service.php',
 notify => Toollabs::Check[keys($checks)],
-}
-
-file { '/etc/init/toolschecker':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0644',
 }
 
 # We need this host's puppet cert and key (readable) so we can check

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I957faaf3ab074d1e5fafdfaeec9aaf4fe9a348ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: toolchecker: Fix directory dependencies

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334473 )

Change subject: toolchecker: Fix directory dependencies
..

toolchecker: Fix directory dependencies

Change-Id: I957faaf3ab074d1e5fafdfaeec9aaf4fe9a348ad
---
M modules/toollabs/manifests/check.pp
M modules/toollabs/manifests/checker.pp
2 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/334473/1

diff --git a/modules/toollabs/manifests/check.pp 
b/modules/toollabs/manifests/check.pp
index 73d7476..e3ba7b1 100644
--- a/modules/toollabs/manifests/check.pp
+++ b/modules/toollabs/manifests/check.pp
@@ -13,7 +13,6 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0644',
-require => File['etc/init/toolschecker'],
 notify  => Service["toolschecker_${check_name}"],
 }
 
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 4a2dad9..d67a491 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -109,6 +109,14 @@
 before => Toollabs::Check[keys($checks)],
 }
 
+file { '/etc/init/toolschecker':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
+before => Toollabs::Check[keys($checks)],
+}
+
 file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
 ensure => file,
 owner  => 'root',
@@ -134,13 +142,6 @@
 mode   => '0555',
 source => 
'puppet:///modules/toollabs/toolschecker_lighttpd_service.php',
 notify => Toollabs::Check[keys($checks)],
-}
-
-file { '/etc/init/toolschecker':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0644',
 }
 
 # We need this host's puppet cert and key (readable) so we can check

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I957faaf3ab074d1e5fafdfaeec9aaf4fe9a348ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 

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