refs #8140 - Change bacula after, apply.config, master-promote

roles/db/defaults/main.yaml

@@ -29,8 +29,8 @@ required_mariabackup_files_and_scripts:
   - { src: scripts/check-memory.sh, dest: /root/scripts/check-memory.sh, mode: u=rwx,g=rx,o=rx }
   - { src: scripts/export-privs.sh, dest: /root/scripts/export-privs.sh, mode: u=rwx,g=rx,o=rx }
   - { src: scripts/mysqltuner.pl, dest: /root/scripts/mysqltuner.pl, mode: u=rwx,g=rx,o=rx }
-  - { src: scripts/promote-master.sh, dest: /root/scripts/promote-master.sh, mode: u=rwx,g=rx,o=rx }
-  - { src: scripts/promote-slave.sh, dest: /root/scripts/promote-slave.sh, mode: u=rwx,g=rx,o=rx }
+  - { src: scripts/events-promote.sh, dest: /root/scripts/events-promote.sh, mode: u=rwx,g=rx,o=rx }
+  - { src: scripts/events-demote.sh, dest: /root/scripts/events-demote.sh, mode: u=rwx,g=rx,o=rx }
   - { src: scripts/README.md, dest: /root/scripts/README.md, mode: u=rw,g=r,o=r }
   - { src: scripts/scheduler-log.sh, dest: /root/scripts/scheduler-log.sh, mode: u=rwx,g=rx,o=rx }
 downloads:

roles/db/files/mariabackup/bacula-after.sh

@@ -5,8 +5,7 @@ myDir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 . "$myDir/config.sh"
 . "$myDir/apply.config.sh"
 
-todayDir=$(date +%Y-%m-%d)
-pattern="$baculaDir/mnt/local-backup/${todayDir}_??-??_full.gz"
+pattern="$baculaDir/mnt/local-backup/*_full.gz"
 files=($pattern)
 backupFile="${files[0]}"
 
@@ -31,19 +30,23 @@ mysql < "$myDir/apply.sql"
 echo "Upgrading tables."
 mysql_upgrade
 
-echo "Applying repository changes."
-curl --silent --request POST --location --user "$jenkinsAuth" "$jenkinsUrl/build?delay=0sec"
 
-echo "Waiting for Jenkins job to end."
-jobResult=null
-while [ "$jobResult" = "null" ]; do
-	sleep 10
-	jobResult=$(curl --silent --location --user "$jenkinsAuth" "$jenkinsUrl/lastBuild/api/json" | jq --raw-output ".result")
-done
-echo "Job result: $jobResult"
+if [ -n "$jenkinsUrl" ]; then
+	echo "Applying repository changes."
+	curl --silent --request POST --location --user "$jenkinsAuth" "$jenkinsUrl/build?delay=0sec"
 
-echo "Promoting to master."
-"/root/scripts/promote-master.sh"
+	echo "Waiting for Jenkins job to end."
+	jobResult=null
+	while [ "$jobResult" = "null" ]; do
+		sleep 10
+		jobResult=$(curl --silent --location --user "$jenkinsAuth" "$jenkinsUrl/lastBuild/api/json" | jq --raw-output ".result")
+	done
+	echo "Job result: $jobResult"
+fi
+
+
+echo "Promoting Events."
+"/root/scripts/events-promote.sh"
 
 for node in "${dbClusterSiblings[@]}"; do
 	ssh root@$node service mysql start

roles/db/tasks/mariadb.yml

@@ -13,7 +13,7 @@
 
 - name: Run MariaDB repository setup script
   command:
-    cmd: "/bin/bash /tmp/mariadb_repo_setup --mariadb-server-version={{ db.version | default('10.11.6') }}"
+    cmd: "/bin/bash /tmp/mariadb_repo_setup --mariadb-server-version={{ db.version | default('10.11.10') }}"
     creates: "/etc/apt/sources.list.d/mariadb.list"
 
 - name: Install Percona repository package

roles/db/templates/mariabackup/apply.config.sh

@@ -15,5 +15,7 @@ dbClusterSiblings=()
 # Jenkins authentication string
 jenkinsAuth=jenkins:{{ lookup(passbolt, 'jenkinsAuth', folder_parent_id=passbolt_folder).password }}
 
+{% if db.jenkinsUrl is defined %}
 # Jenkins job URL
-jenkinsUrl=https://jenkins.verdnatura.es/job/Scheduler/job/db-apply-changes-{{ db.branch }}
+jenkinsUrl={{ db.jenkinsUrl }}
+{% endif %}