Add db.user and db.password to Openbook JSON

Issue: IS-64

2 files changed, 18 insertions, 18 deletions

diff --git a/salt/openbook/database/files/create_openbook_schemas.sql.orig b/salt/openbook/database/files/create_openbook_schemas.sql.orig
index 127e740..60f40b9 100644
--- a/salt/openbook/database/files/create_openbook_schemas.sql.orig
+++ b/salt/openbook/database/files/create_openbook_schemas.sql.orig
@@ -14,8 +14,8 @@
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `openbook` /*!40100 DEFAULT CHARACTER SET utf8 */;
 
-GRANT ALL PRIVILEGES ON openbook.* TO openbook@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook.* TO openbook@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
 FLUSH PRIVILEGES;
 
 USE `openbook`;
@@ -2353,8 +2353,8 @@ DELIMITER ;
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `openbook_jobs` /*!40100 DEFAULT CHARACTER SET utf8 */;
 
-GRANT ALL PRIVILEGES ON openbook_jobs.* TO openbook@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_jobs.* TO openbook@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_jobs.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_jobs.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
 FLUSH PRIVILEGES;
 
 USE `openbook_jobs`;
@@ -2600,8 +2600,8 @@ UNLOCK TABLES;
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `openbook_workflow` /*!40100 DEFAULT CHARACTER SET utf8 */;
 
-GRANT ALL PRIVILEGES ON openbook_workflow.* TO openbook@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_workflow.* TO openbook@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_workflow.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_workflow.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
 FLUSH PRIVILEGES;
 
 USE `openbook_workflow`;
diff --git a/salt/openbook/database/files/fix_permissions.sh b/salt/openbook/database/files/fix_permissions.sh
index 9eff79c..f2ce525 100644
--- a/salt/openbook/database/files/fix_permissions.sh
+++ b/salt/openbook/database/files/fix_permissions.sh
@@ -21,18 +21,18 @@ GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ ope
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}' WITH GRANT OPTION;
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}' WITH GRANT OPTION;
 GRANT ALL PRIVILEGES ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook.* TO 'openbook'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook.* TO 'openbook'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook.* TO 'openbook'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook.* TO 'openbook'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_jobs.* TO 'openbook'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_jobs.* TO 'openbook'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_jobs.* TO 'openbook'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_jobs.* TO 'openbook'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_workflow.* TO 'openbook'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_workflow.* TO 'openbook'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_workflow.* TO 'openbook'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
-GRANT ALL PRIVILEGES ON openbook_workflow.* TO 'openbook'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_jobs.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_jobs.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_jobs.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_jobs.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_workflow.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_workflow.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_workflow.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
+GRANT ALL PRIVILEGES ON openbook_workflow.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}';
 FLUSH PRIVILEGES;
 EOF