Merge pull request #349 from sych74/JE-70789

Je 70789

Author: sych74

scripts/common.yml

@@ -1,4 +1,5 @@
 globals:
+  db_cluster_path: https://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
   customConfigFile: /etc/mysql/conf.d/my_custom.cnf
 
 actions:
@@ -74,7 +75,7 @@ actions:
 
   setupAdminUser:
     - cmd[${this.id}]: |-
-        wget ${baseUrl}/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log;
+        wget ${globals.db_cluster_path}/scripts/setupUser.sh -O ~/setupUser.sh;
         bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log;
       user: root
 
@@ -87,7 +88,7 @@ actions:
         pswd: ${globals.REPLICA_PSWD}
 
   addCustomConfig:
-    - cmd[sqldb]: wget ${baseUrl}/configs/custom.cnf -O ${globals.customConfigFile} &>> /var/log/run.log;
+    - cmd[sqldb]: wget ${globals.db_cluster_path}/configs/custom.cnf -O ${globals.customConfigFile};
     - env.file.AddFavorite:
       nodeGroup: sqldb
       path: ${globals.customConfigFile}

scripts/galera.jps

@@ -151,6 +151,7 @@ actions:
         [ -f /var/lib/mysql/grastate.dat ] && rm -f /var/lib/mysql/grastate.dat
         [ -f /var/lib/mysql/gvwstate.dat ] && rm -f /var/lib/mysql/gvwstate.dat
         [ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
+        [ -f /var/lib/mysql/tc.log ] && rm -f /var/lib/mysql/tc.log
         pgrep mysql 1>/dev/null && pkill -9 mysql;
         pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
       user: root

scripts/proxy-common.yml

@@ -1,3 +1,6 @@
+globals:
+  db_cluster_path: https://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
+
 actions:
   setupOrchestrator:
     - log: Orchestrator configuration
@@ -11,7 +14,7 @@ actions:
           mysql -h 127.0.0.1 -P3360 -uroot -e "SET PASSWORD FOR 'admin'@'127.0.0.1' = PASSWORD('${globals.ORCH_PASS}');"
         fi
         mysql -h 127.0.0.1 -P3360 -uroot -e "FLUSH PRIVILEGES;"
-        wget ${baseUrl}/configs/orchestrator.conf.json -O /etc/orchestrator.conf.json &>> /var/log/run.log
+        wget ${globals.db_cluster_path}/configs/orchestrator.conf.json -O /etc/orchestrator.conf.json &>> /var/log/run.log
         sed -i -e 's|orc_client_user|${globals.DB_USER}|g' /etc/orchestrator.conf.json
         sed -i -e 's|orc_client_password|${globals.DB_PASS}|g' /etc/orchestrator.conf.json
         sed -i -e 's|orc_server_user|admin|g' /etc/orchestrator.conf.json

scripts/xtradb.jps

@@ -132,6 +132,7 @@ actions:
         [ -f /var/lib/mysql/grastate.dat ] && rm -f /var/lib/mysql/grastate.dat
         [ -f /var/lib/mysql/gvwstate.dat ] && rm -f /var/lib/mysql/gvwstate.dat
         [ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
+        [ -f /var/lib/mysql/tc.log ] && rm -f /var/lib/mysql/tc.log
         pgrep mysql 1>/dev/null && pkill -9 mysql;
         pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
       user: root