Ori.livneh has submitted this change and it was merged.
Change subject: Add a simple restbase role
......................................................................
Add a simple restbase role
Change-Id: Ia607fb50e2ec9066baa0df5306f2a07e24be30e1
---
D hieradata/labs/.gitignore
A hieradata/labs/restbase.yaml
A manifests/role/restbase.pp
M modules/restbase/manifests/init.pp
4 files changed, 16 insertions(+), 5 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs/.gitignore b/hieradata/labs/.gitignore
deleted file mode 100644
index 7c20c48..0000000
--- a/hieradata/labs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Exclude all yaml files here from git, as they should be created on-demand
for any instance.
-*.yaml
diff --git a/hieradata/labs/restbase.yaml b/hieradata/labs/restbase.yaml
new file mode 100644
index 0000000..7c69d4a
--- /dev/null
+++ b/hieradata/labs/restbase.yaml
@@ -0,0 +1,4 @@
+seeds:
+ - "localhost"
+logstash_port: 12201
+logstash_host: "deployment-logstash1.eqiad.wmflabs"
diff --git a/manifests/role/restbase.pp b/manifests/role/restbase.pp
new file mode 100644
index 0000000..e003194
--- /dev/null
+++ b/manifests/role/restbase.pp
@@ -0,0 +1,9 @@
+# == Class role::restbase
+#
+
+# Config should be pulled from hiera
+class role::restbase {
+ system::role { 'restbase': description => "Restbase ${::realm}" }
+
+ include ::restbase
+}
diff --git a/modules/restbase/manifests/init.pp
b/modules/restbase/manifests/init.pp
index 5384f65..3e190ee 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -23,13 +23,13 @@
# GELF logging port. Default: 12201
#
class restbase(
- $cassandra_user,
- $cassandra_password,
+ $cassandra_user = 'cassandra',
+ $cassandra_password = 'cassandra',
$seeds = [$::ipaddress],
$cassandra_defaultConsistency = 'localQuorum',
$port = 7231,
$logstash_host = 'localhost',
- $logstash_port = '12201',
+ $logstash_port = 12201,
) {
ensure_packages( ['nodejs', 'nodejs-legacy', 'npm'] )
--
To view, visit https://gerrit.wikimedia.org/r/171741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia607fb50e2ec9066baa0df5306f2a07e24be30e1
Gerrit-PatchSet: 22
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
