From 4a29bba8debecefcd19b4165e9133d01ed619c9a Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Fri, 20 Jul 2018 22:38:18 +0200
Subject: [PATCH] fixed imports
---
site.yml | 2 --
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_keycloak/tasks/main.yml | 2 +-
10 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/site.yml b/site.yml
index ca70bd1f..89ef6e69 100644
--- a/site.yml
+++ b/site.yml
@@ -9,6 +9,4 @@
- import_playbook: webserver/main.yml
- import_playbook: webserver-test/main.yml
-
-
\ No newline at end of file
diff --git a/warpsrvint/docker_grafana/tasks/main.yml b/warpsrvint/docker_grafana/tasks/main.yml
index a5b49db9..cc10bfbf 100644
--- a/warpsrvint/docker_grafana/tasks/main.yml
+++ b/warpsrvint/docker_grafana/tasks/main.yml
@@ -1,6 +1,6 @@
---
# Get secrets
-- import_playbook: ../functions/get_secret.yml
+- include_tasks: ../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 e82cb1c6..5380b14d 100644
--- a/warpsrvint/docker_influx/tasks/main.yml
+++ b/warpsrvint/docker_influx/tasks/main.yml
@@ -1,6 +1,6 @@
---
-- import_playbook: ../functions/get_secret.yml
+- include_tasks: ../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 0e3abc3a..c7a30312 100644
--- a/warpsrvint/docker_kapacitor/tasks/main.yaml
+++ b/warpsrvint/docker_kapacitor/tasks/main.yaml
@@ -1,5 +1,5 @@
---
-- import_playbook: ../functions/get_secret.yml
+- include_tasks: ../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 f338cd4f..6800a43f 100644
--- a/warpsrvint/docker_l4z0r/tasks/main.yml
+++ b/warpsrvint/docker_l4z0r/tasks/main.yml
@@ -10,7 +10,7 @@
- "/srv/l4z0r/db"
# Get secrets
-- import_playbook: ../functions/get_secret.yml
+- include_tasks: ../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 d47671a1..455bed45 100644
--- a/warpsrvint/docker_librenms/tasks/main.yml
+++ b/warpsrvint/docker_librenms/tasks/main.yml
@@ -1,7 +1,7 @@
---
# Get secrets
-- import_playbook: ../functions/get_secret.yml
+- include_tasks: ../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 ad3914b3..7d17615d 100644
--- a/warpsrvint/docker_matestatdb/tasks/main.yml
+++ b/warpsrvint/docker_matestatdb/tasks/main.yml
@@ -1,6 +1,6 @@
---
# Get secrets
-- import_playbook: ../functions/get_secret.yml
+- include_tasks: ../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 3b60c2e4..77e0b5fa 100644
--- a/webserver/docker_alerta/tasks/main.yml
+++ b/webserver/docker_alerta/tasks/main.yml
@@ -1,6 +1,6 @@
---
-- import_playbook: ../functions/get_secret.yml
+- include_tasks: ../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 79c234e7..3cbd0880 100644
--- a/webserver/docker_hackmd/tasks/main.yml
+++ b/webserver/docker_hackmd/tasks/main.yml
@@ -1,6 +1,6 @@
---
-- import_playbook: ../functions/get_secret.yml
+- include_tasks: ../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_keycloak/tasks/main.yml b/webserver/docker_keycloak/tasks/main.yml
index 30cd4861..e7be0968 100644
--- a/webserver/docker_keycloak/tasks/main.yml
+++ b/webserver/docker_keycloak/tasks/main.yml
@@ -1,6 +1,6 @@
---
-- import_playbook: ../functions/get_secret.yml
+- include_tasks: ../functions/get_secret.yml
with_items:
- { path: /srv/keycloak/keycloak_admin_pass, length: 24 }
- { path: /srv/keycloak/postgres_user_pass, length: 12 }
--
GitLab