From c2f7a183f324f77312cda4af1819633a5c852849 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Thu, 8 Aug 2019 00:33:26 +0200
Subject: [PATCH] mysql: move passwordstore lookup from tasks to variables
---
mysql/defaults/main.yml | 4 ++++
mysql/tasks/main.yml | 9 +++------
2 files changed, 7 insertions(+), 6 deletions(-)
create mode 100644 mysql/defaults/main.yml
diff --git a/mysql/defaults/main.yml b/mysql/defaults/main.yml
new file mode 100644
index 0000000..9622f41
--- /dev/null
+++ b/mysql/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+
+# yamllint disable-line rule:line-length
+mysql_root_password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml
index 905d655..26b0e4a 100644
--- a/mysql/tasks/main.yml
+++ b/mysql/tasks/main.yml
@@ -37,11 +37,9 @@
- name: ensure the mysql root user exists and has the correct password
mysql_user:
name: root
- # yamllint disable-line rule:line-length
- password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
+ password: "{{ mysql_root_password }}"
login_user: root
- # yamllint disable-line rule:line-length
- login_password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
+ login_password: "{{ mysql_root_password }}"
register: mysql_root_creation_result
no_log: true
ignore_errors: true
@@ -52,8 +50,7 @@
- name: initialize the mysql root user
mysql_user:
name: root
- # yamllint disable-line rule:line-length
- password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
+ password: "{{ mysql_root_password }}"
no_log: true
when: mysql_root_creation_result|failed
tags:
--
GitLab