From: Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com>
Date: Fri, 5 Apr 2019 04:56:57 +0000 (+0000)
Subject: SO mariadb scripts failure if user exists
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3df6bf96d0fa4818e15c6d212f054303d1cb5142;p=so%2Fdocker-config.git

SO mariadb scripts failure if user exists

Issue-ID: OOM-1781

Signed-off-by: Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com>
Change-Id: Ib4b48271375cb2771771258ffee14afddcaf314c
---

diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh b/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh
index fdec4c3..b6d30e4 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh
@@ -26,7 +26,7 @@ echo "Creating camundabpmn database . . ." 1>/tmp/mariadb-camundabpmn.log 2>&1
 mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1 
 DROP DATABASE IF EXISTS `camundabpmn`;
 CREATE DATABASE `camundabpmn`;
-DELETE FROM mysql.user WHERE User='camundauser';
+DROP USER IF EXISTS 'camundauser';
 CREATE USER 'camundauser';
 GRANT ALL on camundabpmn.* to 'camundauser' identified by 'camunda123' with GRANT OPTION;
 FLUSH PRIVILEGES;
diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/02-create-requestdb.sh b/volumes/mariadb/docker-entrypoint-initdb.d/02-create-requestdb.sh
index 068a553..b277605 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/02-create-requestdb.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/02-create-requestdb.sh
@@ -26,7 +26,7 @@ echo "Creating requestdb database . . ." 1>/tmp/mariadb-requestdb.log 2>&1
 mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
 DROP DATABASE IF EXISTS `requestdb`;
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `requestdb` /*!40100 DEFAULT CHARACTER SET latin1 */;
-DELETE FROM mysql.user WHERE User='requestuser';
+DROP USER IF EXISTS 'requestuser';
 CREATE USER 'requestuser';
 GRANT ALL on requestdb.* to 'requestuser' identified by 'request123' with GRANT OPTION;
 FLUSH PRIVILEGES;
diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/03-create-catalogdb.sh b/volumes/mariadb/docker-entrypoint-initdb.d/03-create-catalogdb.sh
index 0ce6c37..10fb4b1 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/03-create-catalogdb.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/03-create-catalogdb.sh
@@ -26,10 +26,10 @@ echo "Creating catalogdb database . . ." 1>/tmp/mariadb-catalogdb.log 2>&1
 mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
 DROP DATABASE IF EXISTS `catalogdb`;
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `catalogdb` /*!40100 DEFAULT CHARACTER SET latin1 */;
-DELETE FROM mysql.user WHERE User='cataloguser';
+DROP USER IF EXISTS 'cataloguser';
 CREATE USER 'cataloguser';
 GRANT ALL on catalogdb.* to 'cataloguser' identified by 'catalog123' with GRANT OPTION;
 FLUSH PRIVILEGES;
 EOF
 
-echo "Created catalogdb database . . ." 1>>/tmp/mariadb-catalogdb.log 2>&1
\ No newline at end of file
+echo "Created catalogdb database . . ." 1>>/tmp/mariadb-catalogdb.log 2>&1
diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/04-create-so-user.sh b/volumes/mariadb/docker-entrypoint-initdb.d/04-create-so-user.sh
index 307d553..9c96720 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/04-create-so-user.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/04-create-so-user.sh
@@ -24,7 +24,7 @@
 echo "Creating so user . . ." 1>/tmp/mariadb-so-user.log 2>&1
 
 mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
-DELETE FROM mysql.user WHERE User='so_user';
+DROP USER IF EXISTS 'so_user';
 CREATE USER 'so_user';
 GRANT USAGE ON *.* TO 'so_user'@'%' IDENTIFIED BY 'so_User123';
 GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE, SHOW VIEW ON `requestdb`.* TO 'so_user'@'%';
@@ -33,4 +33,4 @@ GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE, SHOW VIEW ON `camundabpmn`.* TO '
 FLUSH PRIVILEGES;
 EOF
 
-echo "Created so user . . ." 1>>/tmp/mariadb-so-user.log 2>&1
\ No newline at end of file
+echo "Created so user . . ." 1>>/tmp/mariadb-so-user.log 2>&1
diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/05-create-so-admin.sh b/volumes/mariadb/docker-entrypoint-initdb.d/05-create-so-admin.sh
index d31159a..6eb3baa 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/05-create-so-admin.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/05-create-so-admin.sh
@@ -24,7 +24,7 @@
 echo "Creating so admin user . . ." 1>/tmp/mariadb-so-admin.log 2>&1
 
 mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
-DELETE FROM mysql.user WHERE User='so_admin';
+DROP USER IF EXISTS 'so_admin';
 CREATE USER 'so_admin';
 GRANT USAGE ON *.* TO 'so_admin'@'%' IDENTIFIED BY 'so_Admin123';
 GRANT ALL PRIVILEGES ON `camundabpmn`.* TO 'so_admin'@'%' WITH GRANT OPTION;
@@ -33,4 +33,4 @@ GRANT ALL PRIVILEGES ON `catalogdb`.* TO 'so_admin'@'%' WITH GRANT OPTION;
 FLUSH PRIVILEGES;
 EOF
 
-echo "Created so admin user . . ." 1>>/tmp/mariadb-so-admin.log 2>&1
\ No newline at end of file
+echo "Created so admin user . . ." 1>>/tmp/mariadb-so-admin.log 2>&1