Mark Bergsma has submitted this change and it was merged.
Change subject: Change paths for file sources as well
......................................................................
Change paths for file sources as well
Change-Id: Id7e5aeb28f11bdc3809fe068fb6ea06bc4cb9962
---
M modules/ganglia-new/manifests/monitor/aggregator/init.pp
M modules/ganglia-new/manifests/monitor/aggregator/instance.pp
M modules/ganglia-new/manifests/monitor/config.pp
M modules/ganglia-new/manifests/monitor/service.pp
4 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ganglia-new/manifests/monitor/aggregator/init.pp
b/modules/ganglia-new/manifests/monitor/aggregator/init.pp
index 80540a3..9047948 100644
--- a/modules/ganglia-new/manifests/monitor/aggregator/init.pp
+++ b/modules/ganglia-new/manifests/monitor/aggregator/init.pp
@@ -8,11 +8,11 @@
ensure => directory,
mode => 0555;
"/etc/init/ganglia-monitor-aggregator.conf":
- source =>
"puppet:///modules/ganglia/upstart/ganglia-monitor-aggregator.conf",
+ source =>
"puppet:///modules/ganglian-new/upstart/ganglia-monitor-aggregator.conf",
before => Service["ganglia-monitor-aggregator"],
mode => 0444;
"/etc/init/ganglia-monitor-aggregator-instance.conf":
- source =>
"puppet:///modules/ganglia/upstart/ganglia-monitor-aggregator-instance.conf",
+ source =>
"puppet:///modules/ganglia-new/upstart/ganglia-monitor-aggregator-instance.conf",
before => Service["ganglia-monitor-aggregator"],
mode => 0444;
}
diff --git a/modules/ganglia-new/manifests/monitor/aggregator/instance.pp
b/modules/ganglia-new/manifests/monitor/aggregator/instance.pp
index 4c861fb..7509c7a 100644
--- a/modules/ganglia-new/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia-new/manifests/monitor/aggregator/instance.pp
@@ -16,7 +16,7 @@
file { "/etc/ganglia/aggregators/${id}.conf":
require => File["/etc/ganglia/aggregators"],
mode => 0444,
- content => template("ganglia/gmond.conf.erb"),
+ content => template("ganglia-new/gmond.conf.erb"),
notify => Service[$title]
}
}
diff --git a/modules/ganglia-new/manifests/monitor/config.pp
b/modules/ganglia-new/manifests/monitor/config.pp
index 4754afb..4f45ba8 100644
--- a/modules/ganglia-new/manifests/monitor/config.pp
+++ b/modules/ganglia-new/manifests/monitor/config.pp
@@ -12,7 +12,7 @@
file { "/etc/ganglia/gmond.conf":
mode => 0444,
- content => template("ganglia/gmond.conf.erb"),
+ content => template("ganglia-new/gmond.conf.erb"),
notify => Service["ganglia-monitor"]
}
}
diff --git a/modules/ganglia-new/manifests/monitor/service.pp
b/modules/ganglia-new/manifests/monitor/service.pp
index cf696f5..08ffe06 100644
--- a/modules/ganglia-new/manifests/monitor/service.pp
+++ b/modules/ganglia-new/manifests/monitor/service.pp
@@ -2,7 +2,7 @@
Class[ganglia-new::monitor::config] ->
Class[ganglia-new::monitor::service]
file { "/etc/init/ganglia-monitor.conf":
- source =>
"puppet:///modules/ganglia/upstart/ganglia-monitor.conf",
+ source =>
"puppet:///modules/ganglia-new/upstart/ganglia-monitor.conf",
mode => 0444
}
--
To view, visit https://gerrit.wikimedia.org/r/53591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7e5aeb28f11bdc3809fe068fb6ea06bc4cb9962
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
