Merge "Make MySQL root password configurable"

2014-04-08 13:08:38 +00:00 · 2014-04-08 13:08:38 +00:00 · 353f04ad00
parent 78b1acb1c9 b20200fdc4
commit 353f04ad00
2 changed files with 7 additions and 1 deletions
--- a/elements/mysql-common/os-config-applier/mnt/state/etc/mysql/static-dbusers.json
+++ b/elements/mysql-common/os-config-applier/mnt/state/etc/mysql/static-dbusers.json
@ -1 +1,4 @@
-[{"username": "root"}]
+[{"username": "root"{{#mysql.root-password}},
+  "password": "{{mysql.root-password}}"
+{{/mysql.root-password}}
+}]
--- a/elements/seed-stack-config/config.json
+++ b/elements/seed-stack-config/config.json
@ -9,6 +9,9 @@
    "host": "127.0.0.1",
    "db": "mysql://keystone:unset@localhost/keystone"
  },
+  "mysql": {
+    "root-password" : "unset"
+  },
  "rabbit": {
    "host": "127.0.0.1",
    "username": "guest",