diff options
author | binary <me@rgoncalves.se> | 2021-03-05 11:33:48 +0100 |
---|---|---|
committer | binary <me@rgoncalves.se> | 2021-03-05 11:33:48 +0100 |
commit | fde556928d8ba7970566d1e445706083a599c9a3 (patch) | |
tree | bdaa0ddf83b0b30594ba461774271ed19a57564b | |
parent | 375ee90ffd6586b4f72196d23aa0f9101dd18149 (diff) | |
download | infrastructure-fde556928d8ba7970566d1e445706083a599c9a3.tar.gz |
Refactor playbook usage
-rw-r--r-- | playbooks/all-hosts-basic.yml | 2 | ||||
-rw-r--r-- | playbooks/network.yml | 6 | ||||
-rw-r--r-- | playbooks/network/grafana.yml (renamed from playbooks/grafana.yml) | 6 | ||||
-rw-r--r-- | playbooks/network/localhost.yml | 1 | ||||
-rw-r--r-- | playbooks/st0gme1.rgoncalves.se.yml | 9 |
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"} |