aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--playbooks/all-hosts-basic.yml2
-rw-r--r--playbooks/network.yml6
-rw-r--r--playbooks/network/grafana.yml (renamed from playbooks/grafana.yml)6
-rw-r--r--playbooks/network/localhost.yml1
-rw-r--r--playbooks/st0gme1.rgoncalves.se.yml9
5 files changed, 7 insertions, 17 deletions
diff --git a/playbooks/all-hosts-basic.yml b/playbooks/all-hosts-basic.yml
index 2aeef8f..5e2662e 100644
--- a/playbooks/all-hosts-basic.yml
+++ b/playbooks/all-hosts-basic.yml
@@ -7,10 +7,8 @@
- hosts: servers
roles:
- # basic networking init
- { role: repositories }
- { role: dns }
- # basic user friendly configuration
- { role: common }
- { role: tools }
- { role: sshd }
diff --git a/playbooks/network.yml b/playbooks/network.yml
index 1b34572..14911a6 100644
--- a/playbooks/network.yml
+++ b/playbooks/network.yml
@@ -19,7 +19,9 @@
roles:
- { role: dns }
- { role: sshd }
- - { role: prometheus }
+
+- name: import grafana playbook
+ import_playbook: network/grafana.yml
- name: import domain controller playbook
- import_playbook: dc0.rgoncalves.se
+ import_playbook: dc0.rgoncalves.se.yml
diff --git a/playbooks/grafana.yml b/playbooks/network/grafana.yml
index 5c3de4e..30bc0f4 100644
--- a/playbooks/grafana.yml
+++ b/playbooks/network/grafana.yml
@@ -1,6 +1,6 @@
-# network ~~ playbooks/network.yml
-# common network configuration
+# network ~~ playbooks/network/grafana.yml
+# setup grafana for all hosts
---
@@ -8,6 +8,6 @@
roles:
- { role: prometheus }
-- hosts: vm1
+- hosts: st0cld0
roles:
- { role: grafana }
diff --git a/playbooks/network/localhost.yml b/playbooks/network/localhost.yml
index 4d87654..32d46fa 100644
--- a/playbooks/network/localhost.yml
+++ b/playbooks/network/localhost.yml
@@ -9,4 +9,3 @@
roles:
- { role: sshdns }
-
diff --git a/playbooks/st0gme1.rgoncalves.se.yml b/playbooks/st0gme1.rgoncalves.se.yml
deleted file mode 100644
index d1be699..0000000
--- a/playbooks/st0gme1.rgoncalves.se.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# st0gme1 ~~ playbooks/st1gme0.rgoncalves.se.yml
-# openbsd based game server.
-
----
-
-- hosts: st0gme1
- roles:
- - { role: minecraft , tags: "role_minecraft"}
remember that computers suck.