[MediaWiki-commits] [Gerrit] Fix dependency after collector module change - change (operations/puppet)

2015-05-28 Thread Ottomata (Code Review) 
Ottomata has submitted this change and it was merged.

Change subject: Fix dependency after collector module change
..


Fix dependency after collector module change

Change-Id: Iae6f942e926970b8b5fd5ea70be04cd913ce1021
---
M modules/diamond/manifests/collector.pp
M modules/diamond/manifests/collector_module.pp
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/modules/diamond/manifests/collector.pp 
b/modules/diamond/manifests/collector.pp
index 8e8d317..c4d4599 100644
--- a/modules/diamond/manifests/collector.pp
+++ b/modules/diamond/manifests/collector.pp
@@ -72,6 +72,7 @@
 ensure => $ensure,
 name   => $name,
 source => $source,
+before => File["/etc/diamond/collectors/${collector}.conf"],
 }
 }
 }
diff --git a/modules/diamond/manifests/collector_module.pp 
b/modules/diamond/manifests/collector_module.pp
index ef8cdd6..8858bc5 100644
--- a/modules/diamond/manifests/collector_module.pp
+++ b/modules/diamond/manifests/collector_module.pp
@@ -31,7 +31,6 @@
 
 file { "/usr/share/diamond/collectors/${name}/${name}.py":
 ensure => $ensure,
-before => File["/etc/diamond/collectors/${collector}.conf"],
 source => $source,
 owner  => 'root',
 group  => 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae6f942e926970b8b5fd5ea70be04cd913ce1021
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] Fix dependency after collector module change - change (operations/puppet)

2015-05-28 Thread Ottomata (Code Review) 
Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/214414

Change subject: Fix dependency after collector module change
..

Fix dependency after collector module change

Change-Id: Iae6f942e926970b8b5fd5ea70be04cd913ce1021
---
M modules/diamond/manifests/collector.pp
M modules/diamond/manifests/collector_module.pp
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/214414/1

diff --git a/modules/diamond/manifests/collector.pp 
b/modules/diamond/manifests/collector.pp
index 8e8d317..c4d4599 100644
--- a/modules/diamond/manifests/collector.pp
+++ b/modules/diamond/manifests/collector.pp
@@ -72,6 +72,7 @@
 ensure => $ensure,
 name   => $name,
 source => $source,
+before => File["/etc/diamond/collectors/${collector}.conf"],
 }
 }
 }
diff --git a/modules/diamond/manifests/collector_module.pp 
b/modules/diamond/manifests/collector_module.pp
index ef8cdd6..8858bc5 100644
--- a/modules/diamond/manifests/collector_module.pp
+++ b/modules/diamond/manifests/collector_module.pp
@@ -31,7 +31,6 @@
 
 file { "/usr/share/diamond/collectors/${name}/${name}.py":
 ensure => $ensure,
-before => File["/etc/diamond/collectors/${collector}.conf"],
 source => $source,
 owner  => 'root',
 group  => 'root',

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

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

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