summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/puppet/modules/custom/manifests/init.pp4
-rw-r--r--hiera/aardwolf.yaml2
-rw-r--r--hiera/donkey.yaml2
-rw-r--r--nodes/donkey.json3
-rw-r--r--services/pixelated.json1
5 files changed, 11 insertions, 1 deletions
diff --git a/files/puppet/modules/custom/manifests/init.pp b/files/puppet/modules/custom/manifests/init.pp
index 74a688b..b7468e0 100644
--- a/files/puppet/modules/custom/manifests/init.pp
+++ b/files/puppet/modules/custom/manifests/init.pp
@@ -11,4 +11,8 @@ class custom {
if member ( $services, 'openvpn') {
include custom_munin_node::openvpn
}
+
+ if member ( $services, 'pixelated') {
+ include pixelated::dispatcher
+ }
}
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index 8219b4a..9445b15 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -90,6 +90,8 @@ services:
- couchdb
- soledad
soledad:
+ couchdb_leap_mx_user:
+ username: leap_mx
couchdb_soledad_user:
password: 35MzsnEEAeHTVNhI_FaCFNS5bhd7RGEf
salt: 7f725f3cc60c388e9af8140555e09dfa
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 206f114..fd9cf88 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -495,6 +495,7 @@ nagios:
ip_address: "199.119.112.133"
services:
- monitor
+ - pixelated
- webapp
ssh_port: 22
elephant:
@@ -665,6 +666,7 @@ platform:
service_type: public_service
services:
- monitor
+ - pixelated
- webapp
sources:
apt:
diff --git a/nodes/donkey.json b/nodes/donkey.json
index 438f725..2271348 100644
--- a/nodes/donkey.json
+++ b/nodes/donkey.json
@@ -2,7 +2,8 @@
"ip_address": "199.119.112.133",
"services": [
"monitor",
- "webapp"
+ "webapp",
+ "pixelated"
],
"tags": [
"dc",
diff --git a/services/pixelated.json b/services/pixelated.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/services/pixelated.json
@@ -0,0 +1 @@
+{}