diff --git a/roles/services/defaults/main.yaml b/roles/services/defaults/main.yaml index 9e977f2..77fbac6 100644 --- a/roles/services/defaults/main.yaml +++ b/roles/services/defaults/main.yaml @@ -49,8 +49,7 @@ required_files_and_mariabackup_files_and_root_scripts: - { src: "files/scripts/promote-master.sh", dest: "/root/scripts/promote-master.sh", mode: "u=rwx,g=rx,o=rx" } - { src: "files/scripts/promote-slave.sh", dest: "/root/scripts/promote-slave.sh", mode: "u=rwx,g=rx,o=rx" } - { src: "files/scripts/README.md", dest: "/root/scripts/README.md", mode: "u=rw,g=r,o=r" } - - { src: "files/scripts/scheduler-log.sh", dest: "/root/scripts/scheduler-log.sh", mode: "u=rwx,g=rx,o=rx" } - - { src: "files/scripts/sync-conf.sh", dest: "/root/scripts/sync-conf.sh", mode: "u=rwx,g=rx,o=rx" } + - { src: "files/scripts/scheduler-log.sh", dest: "/root/scripts/scheduler-log.sh", mode: "u=rwx,g=rx,o=rx" } downloads: - { url: "https://r.mariadb.com/downloads/mariadb_repo_setup", dest: "/tmp/mariadb_repo_setup", mode: "u=rwx,g=rx,o=rx" } - { url: "https://repo.percona.com/apt/percona-release_latest.generic_all.deb", dest: "/tmp/percona-release_latest.generic_all.deb", mode: "u=rw,g=r,o=r" } diff --git a/roles/services/files/scripts/sync-conf.sh b/roles/services/files/scripts/sync-conf.sh deleted file mode 100755 index 3597234..0000000 --- a/roles/services/files/scripts/sync-conf.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -partner=root@db2.static.verdnatura.es -confDir=/etc/mysql/mariadb.conf.d -files=( - z90-vn.cnf - z95-production.cnf -) - -#echo "Reloading service." -#service mariadb reload - -if [ $? -eq "0" ]; then - echo "Synchronizing partner configuration." - for file in "${files[@]}"; do - scp "$confDir/$file" $partner:$confDir - done - - #echo "Reloading partner service." - #ssh $partner service mariadb reload -fi diff --git a/roles/services/tasks/mariadb.yml b/roles/services/tasks/mariadb.yml index 35b97c6..5049a1d 100644 --- a/roles/services/tasks/mariadb.yml +++ b/roles/services/tasks/mariadb.yml @@ -55,7 +55,7 @@ path: /etc/fstab marker: "# {mark} ANSIBLE-MANAGED TMPFS ENTRY" block: | - tmpfs /mnt/mysqltmp tmpfs rw,size=6144M 0 0 + tmpfs /mnt/mysqltmp tmpfs rw,size={{ mysqltmpsize }} 0 0 register: fstab - name: Mount all filesystems from /etc/fstab diff --git a/roles/services/templates/test-db_dev/apply.config.sh b/roles/services/templates/test-db_dev/apply.config.sh index 8ac2677..6894c3f 100755 --- a/roles/services/templates/test-db_dev/apply.config.sh +++ b/roles/services/templates/test-db_dev/apply.config.sh @@ -4,10 +4,10 @@ baculaDir=/mnt/mysqldata/bacula-restore # Database branch name -dbBranch={{ entorno }} +dbBranch={{ dbBranch }} # Database environment -dbEnvironment={{ entorno }} +dbEnvironment={{ dbEnvironment }} # MariaDB cluster sibling node hostnames dbClusterSiblings=() @@ -16,5 +16,5 @@ dbClusterSiblings=() jenkinsAuth=jenkins:{{ lookup(passbolt, 'jenkinsAuth', folder_parent_id=passbolt_folder).password }} # Jenkins job URL -jenkinsUrl=https://jenkins.verdnatura.es/job/Scheduler/job/db-apply-changes-{{ entorno }} +jenkinsUrl=https://jenkins.verdnatura.es/job/Scheduler/job/db-apply-changes-{{ dbBranch }}