From 4c0f2d375db5365d2445ff682d543d658c0f7886 Mon Sep 17 00:00:00 2001 From: Jens Sandmann <jens@sandzwerg.de> Date: Mon, 30 Jul 2018 22:59:02 +0200 Subject: [PATCH] turns out you can't use import import_playbook for that In the future we probably want to use include_task for that instead --- warpsrvint/docker_grafana/tasks/main.yml | 9 ++++----- warpsrvint/docker_influx/tasks/main.yml | 6 +++--- warpsrvint/docker_kapacitor/tasks/main.yaml | 6 +++--- warpsrvint/docker_l4z0r/tasks/main.yml | 21 ++++++++++----------- warpsrvint/docker_librenms/tasks/main.yml | 6 +++--- warpsrvint/docker_matestatdb/tasks/main.yml | 8 ++++---- webserver/docker_alerta/tasks/main.yml | 6 +++--- webserver/docker_hackmd/tasks/main.yml | 6 +++--- webserver/docker_keycloak/tasks/main.yml | 6 +++--- 9 files changed, 36 insertions(+), 38 deletions(-) diff --git a/warpsrvint/docker_grafana/tasks/main.yml b/warpsrvint/docker_grafana/tasks/main.yml index a5b49db9..d7e53d7e 100644 --- a/warpsrvint/docker_grafana/tasks/main.yml +++ b/warpsrvint/docker_grafana/tasks/main.yml @@ -1,12 +1,12 @@ --- -# Get secrets -- import_playbook: ../functions/get_secret.yml +# Get secrets +- include: ../functions/get_secret.yml with_items: - { path: /srv/ldap/secret/ldap_readonly_pass, length: 24 } - { path: /srv/grafana/grafana_admin_pass, length: 12 } - name: create folder struct for grafana - file: + file: path: "{{ item }}" state: "directory" with_items: @@ -16,7 +16,7 @@ - name: create config files template: src={{ item }} dest=/srv/grafana/config/{{ item }} - with_items: + with_items: - grafana.ini - ldap.toml register: config @@ -36,4 +36,3 @@ docker_service: project_src: /srv/grafana/ state: present - diff --git a/warpsrvint/docker_influx/tasks/main.yml b/warpsrvint/docker_influx/tasks/main.yml index e82cb1c6..1564e60e 100644 --- a/warpsrvint/docker_influx/tasks/main.yml +++ b/warpsrvint/docker_influx/tasks/main.yml @@ -1,12 +1,12 @@ --- -- import_playbook: ../functions/get_secret.yml +- include: ../functions/get_secret.yml with_items: - { path: /srv/influx/influx_admin_pw, length: 24 } - + - name: create folder struct for influx - file: + file: path: "{{ item }}" state: "directory" with_items: diff --git a/warpsrvint/docker_kapacitor/tasks/main.yaml b/warpsrvint/docker_kapacitor/tasks/main.yaml index 0e3abc3a..9f3fb9d8 100644 --- a/warpsrvint/docker_kapacitor/tasks/main.yaml +++ b/warpsrvint/docker_kapacitor/tasks/main.yaml @@ -1,11 +1,11 @@ --- -- import_playbook: ../functions/get_secret.yml +- include: ../functions/get_secret.yml with_items: - { path: /srv/influx/influx_admin_pw, length: 24 } - { path: /srv/kapacitor/alerta_token, length: -1 } - name: create folder struct for kapacitor - file: + file: path: "{{ item }}" state: "directory" with_items: @@ -49,7 +49,7 @@ - task_mem_used.tick - task_notraffic_globe.tick - task_notraffic_telekom.tick - notify: restart kapacitor docker + notify: restart kapacitor docker - name: start kapacitor docker diff --git a/warpsrvint/docker_l4z0r/tasks/main.yml b/warpsrvint/docker_l4z0r/tasks/main.yml index f338cd4f..549d9f12 100644 --- a/warpsrvint/docker_l4z0r/tasks/main.yml +++ b/warpsrvint/docker_l4z0r/tasks/main.yml @@ -1,29 +1,28 @@ --- -# Create folders -- name: create folder struct for l4z0r - file: - path: "{{ item }}" +# Create folders +- name: create folder struct for l4z0r + file: + path: "{{ item }}" state: "directory" with_items: - "/srv/l4z0r" - "/srv/l4z0r/db" -# Get secrets -- import_playbook: ../functions/get_secret.yml +# Get secrets +- include: ../functions/get_secret.yml with_items: - { path: /srv/l4z0r/mysql_root_pw, length: 24 } - { path: /srv/l4z0r/mysql_user_pw, length: 12 } -# Create docker-compose.yml +# Create docker-compose.yml - name: Konfig-Datei erstellen - template: - src: "docker-compose.yml" + template: + src: "docker-compose.yml" dest: "/srv/l4z0r/docker-compose.yml" -# Start containers +# Start containers - name: start l4z0r docker docker_service: project_src: /srv/l4z0r/ state: present - diff --git a/warpsrvint/docker_librenms/tasks/main.yml b/warpsrvint/docker_librenms/tasks/main.yml index d47671a1..d4ac4815 100644 --- a/warpsrvint/docker_librenms/tasks/main.yml +++ b/warpsrvint/docker_librenms/tasks/main.yml @@ -1,13 +1,13 @@ --- -# Get secrets -- import_playbook: ../functions/get_secret.yml +# Get secrets +- include: ../functions/get_secret.yml with_items: - { path: /srv/librenms/mysql_root_pw, length: 24 } - { path: /srv/librenms/mysql_user_pw, length: 12 } - name: create folder struct for librenms - file: + file: path: "{{ item }}" state: "directory" owner: www-data diff --git a/warpsrvint/docker_matestatdb/tasks/main.yml b/warpsrvint/docker_matestatdb/tasks/main.yml index ad3914b3..23c5d41a 100644 --- a/warpsrvint/docker_matestatdb/tasks/main.yml +++ b/warpsrvint/docker_matestatdb/tasks/main.yml @@ -1,16 +1,16 @@ --- -# Get secrets -- import_playbook: ../functions/get_secret.yml +# Get secrets +- include: ../functions/get_secret.yml with_items: - { path: /srv/matestatdb/postgres_admin_pw, length: 24 } - name: create folder struct for matestatdb - file: + file: path: "{{ item }}" state: "directory" with_items: - "/srv/matestatdb/" - - "/srv/matestatdb/data/" + - "/srv/matestatdb/data/" - name: Docker Compose Konfig-Datei erstellen template: diff --git a/webserver/docker_alerta/tasks/main.yml b/webserver/docker_alerta/tasks/main.yml index 3b60c2e4..c2ff2eb4 100644 --- a/webserver/docker_alerta/tasks/main.yml +++ b/webserver/docker_alerta/tasks/main.yml @@ -1,16 +1,16 @@ --- -- import_playbook: ../functions/get_secret.yml +- include: ../functions/get_secret.yml with_items: - { path: /srv/alerta/alerta_secret_key, length: 24 } - { path: /srv/alerta/alerta_oauth_client_secret, length: -1 } - { path: /srv/alerta/alerta_token, length: -1 } - { path: /srv/alerta/telegram_token, length: -1 } - { path: /srv/alerta/telegram_chatid, length: -1 } - + - name: create folder struct for alerta - file: + file: path: "{{ item }}" state: "directory" with_items: diff --git a/webserver/docker_hackmd/tasks/main.yml b/webserver/docker_hackmd/tasks/main.yml index 79c234e7..c0dee0f5 100644 --- a/webserver/docker_hackmd/tasks/main.yml +++ b/webserver/docker_hackmd/tasks/main.yml @@ -1,15 +1,15 @@ --- -- import_playbook: ../functions/get_secret.yml +- include: ../functions/get_secret.yml with_items: - { path: /srv/hackmd/mysql_root_pass, length: 24 } - { path: /srv/hackmd/mysql_user_pass, length: 12 } - { path: /srv/hackmd/hackmd_session_secret, length: 32 } - { path: /srv/ldap/secret/ldap_readonly_pass, length: -1 } - + - name: create folder struct for hackmd - file: + file: path: "{{ item }}" state: "directory" with_items: diff --git a/webserver/docker_keycloak/tasks/main.yml b/webserver/docker_keycloak/tasks/main.yml index 30cd4861..737fd499 100644 --- a/webserver/docker_keycloak/tasks/main.yml +++ b/webserver/docker_keycloak/tasks/main.yml @@ -1,13 +1,13 @@ --- -- import_playbook: ../functions/get_secret.yml +- include: ../functions/get_secret.yml with_items: - { path: /srv/keycloak/keycloak_admin_pass, length: 24 } - { path: /srv/keycloak/postgres_user_pass, length: 12 } - + - name: create folder struct for keycloak - file: + file: path: "{{ item }}" state: "directory" with_items: -- GitLab