From e9aa3b028fca055236af202d96975fe1a70cdce3 Mon Sep 17 00:00:00 2001 From: Jens Sandmann <jens@sandzwerg.de> Date: Tue, 10 Jul 2018 23:29:23 +0200 Subject: [PATCH] Changed playbook from include to import_playbook because include will be depricated in 2.8 --- functions/get_secret.yml | 2 +- site.yml | 14 +++++++------- warpsrvint/docker_grafana/tasks/main.yml | 2 +- warpsrvint/docker_influx/tasks/main.yml | 2 +- warpsrvint/docker_kapacitor/tasks/main.yaml | 2 +- warpsrvint/docker_l4z0r/tasks/main.yml | 2 +- warpsrvint/docker_librenms/tasks/main.yml | 2 +- warpsrvint/docker_matestatdb/tasks/main.yml | 2 +- webserver/docker_alerta/tasks/main.yml | 2 +- webserver/docker_hackmd/tasks/main.yml | 2 +- webserver/docker_jabber_test/tasks/main.yaml | 2 +- webserver/docker_keycloak/tasks/main.yml | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/functions/get_secret.yml b/functions/get_secret.yml index e8b5964e..6133a8b0 100644 --- a/functions/get_secret.yml +++ b/functions/get_secret.yml @@ -8,7 +8,7 @@ # # Beispiel: (Auslesen von Passörtern aus /srv/xyz/secret_pw, registrierung als Variable secret_pw, erzeugung mit 24 Zeichen falls nicht vorhanden) # -# - include: ../functions/get_secret.yml +# - import_playbook: ../functions/get_secret.yml # with_items: # - { path: /srv/xyz/secret_pw, length: 24 } # - { path: /srv/xyz/secret2_pw, length: 12 } diff --git a/site.yml b/site.yml index ba00dbe4..ca70bd1f 100644 --- a/site.yml +++ b/site.yml @@ -1,13 +1,13 @@ --- # Hauptdatei, includiert lediglich die einzelnen Playbooks -- include: all/main.yml -- include: vorstandspi/main.yml -- include: warphab/main.yml -- include: warpsrvint/main.yml -- include: warpsrvext/main.yml -- include: webserver/main.yml -- include: webserver-test/main.yml +- import_playbook: all/main.yml +- import_playbook: vorstandspi/main.yml +- import_playbook: warphab/main.yml +- import_playbook: warpsrvint/main.yml +- import_playbook: warpsrvext/main.yml +- import_playbook: webserver/main.yml +- import_playbook: webserver-test/main.yml diff --git a/warpsrvint/docker_grafana/tasks/main.yml b/warpsrvint/docker_grafana/tasks/main.yml index c84ff0f2..a5b49db9 100644 --- a/warpsrvint/docker_grafana/tasks/main.yml +++ b/warpsrvint/docker_grafana/tasks/main.yml @@ -1,6 +1,6 @@ --- # Get secrets -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/ldap/secret/ldap_readonly_pass, length: 24 } - { path: /srv/grafana/grafana_admin_pass, length: 12 } diff --git a/warpsrvint/docker_influx/tasks/main.yml b/warpsrvint/docker_influx/tasks/main.yml index 204f09e9..e82cb1c6 100644 --- a/warpsrvint/docker_influx/tasks/main.yml +++ b/warpsrvint/docker_influx/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/influx/influx_admin_pw, length: 24 } diff --git a/warpsrvint/docker_kapacitor/tasks/main.yaml b/warpsrvint/docker_kapacitor/tasks/main.yaml index d888c731..0e3abc3a 100644 --- a/warpsrvint/docker_kapacitor/tasks/main.yaml +++ b/warpsrvint/docker_kapacitor/tasks/main.yaml @@ -1,5 +1,5 @@ --- -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/influx/influx_admin_pw, length: 24 } - { path: /srv/kapacitor/alerta_token, length: -1 } diff --git a/warpsrvint/docker_l4z0r/tasks/main.yml b/warpsrvint/docker_l4z0r/tasks/main.yml index 8a59a5d8..f338cd4f 100644 --- a/warpsrvint/docker_l4z0r/tasks/main.yml +++ b/warpsrvint/docker_l4z0r/tasks/main.yml @@ -10,7 +10,7 @@ - "/srv/l4z0r/db" # Get secrets -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/l4z0r/mysql_root_pw, length: 24 } - { path: /srv/l4z0r/mysql_user_pw, length: 12 } diff --git a/warpsrvint/docker_librenms/tasks/main.yml b/warpsrvint/docker_librenms/tasks/main.yml index 55fcbd29..d47671a1 100644 --- a/warpsrvint/docker_librenms/tasks/main.yml +++ b/warpsrvint/docker_librenms/tasks/main.yml @@ -1,7 +1,7 @@ --- # Get secrets -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/librenms/mysql_root_pw, length: 24 } - { path: /srv/librenms/mysql_user_pw, length: 12 } diff --git a/warpsrvint/docker_matestatdb/tasks/main.yml b/warpsrvint/docker_matestatdb/tasks/main.yml index 4f83478f..ad3914b3 100644 --- a/warpsrvint/docker_matestatdb/tasks/main.yml +++ b/warpsrvint/docker_matestatdb/tasks/main.yml @@ -1,6 +1,6 @@ --- # Get secrets -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/matestatdb/postgres_admin_pw, length: 24 } diff --git a/webserver/docker_alerta/tasks/main.yml b/webserver/docker_alerta/tasks/main.yml index 2dda680d..3b60c2e4 100644 --- a/webserver/docker_alerta/tasks/main.yml +++ b/webserver/docker_alerta/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/alerta/alerta_secret_key, length: 24 } - { path: /srv/alerta/alerta_oauth_client_secret, length: -1 } diff --git a/webserver/docker_hackmd/tasks/main.yml b/webserver/docker_hackmd/tasks/main.yml index f24578eb..79c234e7 100644 --- a/webserver/docker_hackmd/tasks/main.yml +++ b/webserver/docker_hackmd/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/hackmd/mysql_root_pass, length: 24 } - { path: /srv/hackmd/mysql_user_pass, length: 12 } diff --git a/webserver/docker_jabber_test/tasks/main.yaml b/webserver/docker_jabber_test/tasks/main.yaml index 9955ea4f..de49fc58 100644 --- a/webserver/docker_jabber_test/tasks/main.yaml +++ b/webserver/docker_jabber_test/tasks/main.yaml @@ -20,7 +20,7 @@ - "/srv/jabber_test/saslauthd" # Get secrets -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/ldap/secret/ldap_readonly_pass, length: 24 } diff --git a/webserver/docker_keycloak/tasks/main.yml b/webserver/docker_keycloak/tasks/main.yml index 7d3b2ed0..30cd4861 100644 --- a/webserver/docker_keycloak/tasks/main.yml +++ b/webserver/docker_keycloak/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: ../functions/get_secret.yml +- import_playbook: ../functions/get_secret.yml with_items: - { path: /srv/keycloak/keycloak_admin_pass, length: 24 } - { path: /srv/keycloak/postgres_user_pass, length: 12 } -- GitLab