Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212305
Change subject: Remove the unneeded priorites in filenames
......................................................................
Remove the unneeded priorites in filenames
Now that we use base::puppet::config, priorities in filenames are not
needed
Change-Id: I8305150f8edc1bfb619f1793f7af667152e3b93f
---
M modules/puppetmaster/manifests/config.pp
M modules/puppetmaster/manifests/logstash.pp
R modules/puppetmaster/templates/logstash.conf.erb
R modules/puppetmaster/templates/master.conf.erb
4 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/212305/1
diff --git a/modules/puppetmaster/manifests/config.pp
b/modules/puppetmaster/manifests/config.pp
index 33d7d0e..001988e 100644
--- a/modules/puppetmaster/manifests/config.pp
+++ b/modules/puppetmaster/manifests/config.pp
@@ -5,7 +5,7 @@
class puppetmaster::config {
base::puppet::config { 'master':
prio => 20,
- content => template('puppetmaster/20-master.conf.erb'),
+ content => template('puppetmaster/master.conf.erb'),
}
# See https://tickets.puppetlabs.com/browse/PUP-1237
diff --git a/modules/puppetmaster/manifests/logstash.pp
b/modules/puppetmaster/manifests/logstash.pp
index f1eb9cb..62e7988 100644
--- a/modules/puppetmaster/manifests/logstash.pp
+++ b/modules/puppetmaster/manifests/logstash.pp
@@ -27,6 +27,6 @@
base::puppet::config { 'logstash':
prio => 30,
- content => template('puppetmaster/30-logstash.conf.erb'),
+ content => template('puppetmaster/logstash.conf.erb'),
}
}
diff --git a/modules/puppetmaster/templates/30-logstash.conf.erb
b/modules/puppetmaster/templates/logstash.conf.erb
similarity index 100%
rename from modules/puppetmaster/templates/30-logstash.conf.erb
rename to modules/puppetmaster/templates/logstash.conf.erb
diff --git a/modules/puppetmaster/templates/20-master.conf.erb
b/modules/puppetmaster/templates/master.conf.erb
similarity index 100%
rename from modules/puppetmaster/templates/20-master.conf.erb
rename to modules/puppetmaster/templates/master.conf.erb
--
To view, visit https://gerrit.wikimedia.org/r/212305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8305150f8edc1bfb619f1793f7af667152e3b93f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
