summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorckonstanski <ckonstanski@pippiandcarlos.com>2017-09-29 21:20:47 -0600
committerckonstanski <ckonstanski@pippiandcarlos.com>2017-09-29 21:20:47 -0600
commit8323e3d84898d6dc2c62680dec2dca457e943bf8 (patch)
tree532c6e65900134d3a9b11edc03f9952c34b5ba40
parent3360370fd7ed48d6c65d05c8e242c3dd224dee46 (diff)
.my.cnf is once a salt template and once an ansible template
-rw-r--r--pillar/openbook/database.sls2
-rw-r--r--salt/openbook/database/files/_my.cnf4
2 files changed, 3 insertions, 3 deletions
diff --git a/pillar/openbook/database.sls b/pillar/openbook/database.sls
index 36b7ad1..361c2e6 100644
--- a/pillar/openbook/database.sls
+++ b/pillar/openbook/database.sls
@@ -86,7 +86,7 @@ database:
path: /root
source: _my.cnf
mode: "0644"
- is_template: True
+ is_template: False
relative_to_buildroot: False
ansible: True
_my_cnf:
diff --git a/salt/openbook/database/files/_my.cnf b/salt/openbook/database/files/_my.cnf
index e158680..269e0ba 100644
--- a/salt/openbook/database/files/_my.cnf
+++ b/salt/openbook/database/files/_my.cnf
@@ -1,6 +1,6 @@
[mysql]
user=root
-password={% raw %}{{ openbook_database_password }}{% endraw %}
+password={{ openbook_database_password }}
[mysqldump]
user=root
-password={% raw %}{{ openbook_database_password }}{% endraw %}
+password={{ openbook_database_password }}