From 7edf8e0dc8793328d85ce34ab8df4ba2f5f349b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=AC=E8=BE=BE?= <510386283@qq.com> Date: Sat, 26 Oct 2024 00:21:41 +0800 Subject: [PATCH 1/5] support opengauss6.0.0, panweidb3.0.0 --- opengauss_ansible/playbooks/pre_tasks/SHA256SUMS.txt | 10 ++++++++++ .../pre_tasks/validate_common_config_setting.yml | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/opengauss_ansible/playbooks/pre_tasks/SHA256SUMS.txt b/opengauss_ansible/playbooks/pre_tasks/SHA256SUMS.txt index cba60fe..b2ef77c 100644 --- a/opengauss_ansible/playbooks/pre_tasks/SHA256SUMS.txt +++ b/opengauss_ansible/playbooks/pre_tasks/SHA256SUMS.txt @@ -12,3 +12,13 @@ panweidb 2.0.3 openEuler22 bd7b5ad3533ffe13dfca8f27691868a1c5dfe1effad009abfda16 panweidb 2.0.3 BigCloud8 5c6bc83afa5337bc94dbf32ad4da6a3c55a542a635a9633a08c0f0a903be1c80 PanWeiDB_V2.0-S2.0.3_B01-install-bclinux_8.2-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S2.0.3_B01-bclinux-64bit-om.tar.gz PanWeiDB_V2.0-S2.0.3_B01-bclinux-64bit.tar.bz2 panweidb 2.0.3 CentOS7 09d124033173233acd5733d9191748e77e85569ef7e0cd34e201e3b84e996e96 PanWeiDB_V2.0-S2.0.3_B01-install-centos_7-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S2.0.3_B01-CentOS-64bit-om.tar.gz PanWeiDB_V2.0-S2.0.3_B01-CentOS-64bit.tar.bz2 panweidb 2.0.3 BigCloud21 38d625f45c56822b6414221141d469a56a5923a15669842709981b0b3693a711 PanWeiDB_V2.0-S2.0.3_B01-install-bclinux_euler21.10-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S2.0.3_B01-bclinux-64bit-om.tar.gz PanWeiDB_V2.0-S2.0.3_B01-bclinux-64bit.tar.bz2 +opengauss 6.0.0 CentOS7 a5d18bb757cb924b4907189b9ae15f7c openGauss-All-6.0.0-CentOS7-x86_64.tar.gz openGauss-OM-6.0.0-CentOS7-x86_64.tar.gz openGauss-Server-6.0.0-CentOS7-x86_64.tar.bz2 +opengauss 6.0.0 openEuler22 916f5aecec9195ead0cc076befa16496 openGauss-All-6.0.0-openEuler22.03-x86_64.tar.gz openGauss-OM-6.0.0-openEuler22.03-x86_64.tar.gz openGauss-Server-6.0.0-openEuler22.03-x86_64.tar.bz2 +panweidb 3.0.0 CentOS7 9aed3a90a6f7c91be22b7496c7bff092 PanWeiDB_V2.0-S3.0.0_B01-install-centos_7-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S3.0.0_B01-CentOS-64bit-om.tar.gz PanWeiDB_V2.0-S3.0.0_B01-CentOS-64bit.tar.bz2 +panweidb 3.0.0 openEuler22 2993af2def838a82ddc3b1c1b9aef70c PanWeiDB_V2.0-S3.0.0_B01-install-openeuler_22.03-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S3.0.0_B01-openEuler-64bit-om.tar.gz PanWeiDB_V2.0-S3.0.0_B01-openEuler-64bit.tar.bz2 +panweidb 3.0.0 BigCloud8 467f707d6cfec367fe381700d31fb669 PanWeiDB_V2.0-S3.0.0_B01-install-bclinux_8.2-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S3.0.0_B01-bclinux-64bit-om.tar.gz PanWeiDB_V2.0-S3.0.0_B01-bclinux-64bit.tar.bz2 +panweidb 3.0.0 BigCloud21 521cf4174e139c671c7365ce7b04afb7 PanWeiDB_V2.0-S3.0.0_B01-install-bclinux_euler21.10-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S3.0.0_B01-bclinux-64bit-om.tar.gz PanWeiDB_V2.0-S3.0.0_B01-bclinux-64bit.tar.bz2 +panweidb 3.0.1 CentOS7 3c5b8c7d9fe407386546c4325f26ba60 PanWeiDB_V2.0-S3.0.1_B01-install-centos_7-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S3.0.1_B01-CentOS-64bit-om.tar.gz PanWeiDB_V2.0-S3.0.1_B01-CentOS-64bit.tar.bz2 +panweidb 3.0.1 openEuler22 de8bd45dc57745837c75f469ff414a61 PanWeiDB_V2.0-S3.0.1_B01-install-openeuler_22.03-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S3.0.1_B01-openEuler-64bit-om.tar.gz PanWeiDB_V2.0-S3.0.1_B01-openEuler-64bit.tar.bz2 +panweidb 3.0.1 BigCloud8 bad5df50f7c166b09d7b4b14005d3b0a PanWeiDB_V2.0-S3.0.1_B01-install-bclinux_8.2-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S3.0.1_B01-bclinux-64bit-om.tar.gz PanWeiDB_V2.0-S3.0.1_B01-bclinux-64bit.tar.bz2 +panweidb 3.0.1 BigCloud21 7bf3f07bed63f65501af2345144d3550 PanWeiDB_V2.0-S3.0.1_B01-install-bclinux_euler21.10-x86_64-no_mot.tar.gz PanWeiDB_V2.0-S3.0.1_B01-bclinux-64bit-om.tar.gz PanWeiDB_V2.0-S3.0.1_B01-bclinux-64bit.tar.bz2 diff --git a/opengauss_ansible/playbooks/pre_tasks/validate_common_config_setting.yml b/opengauss_ansible/playbooks/pre_tasks/validate_common_config_setting.yml index b274f13..8987d4c 100644 --- a/opengauss_ansible/playbooks/pre_tasks/validate_common_config_setting.yml +++ b/opengauss_ansible/playbooks/pre_tasks/validate_common_config_setting.yml @@ -49,9 +49,9 @@ fail: msg: "`opengauss_version`: {{ opengauss_version }} for {{ db_type }} is not test so not support!" when: - (db_type == 'opengauss' and opengauss_version not in ['5.0.0', '5.0.1', '5.0.2']) or - (db_type == 'panweidb' and opengauss_version not in ['2.0.2', '2.0.3']) - + (db_type == 'opengauss' and opengauss_version not in ['5.0.0', '5.0.1', '5.0.2', '6.0.0']) or + (db_type == 'panweidb' and opengauss_version not in ['2.0.2', '2.0.3', '3.0.0']) +# panweidb 3.0.1 package is not supported due to bugs that prevent installation - name: Validate db_type is a valid option fail: -- Gitee From 70fe3ea72e5c4c25c3a790f95078443e564877fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=AC=E8=BE=BE?= <510386283@qq.com> Date: Sat, 26 Oct 2024 00:51:14 +0800 Subject: [PATCH 2/5] Fix gs_guc.sh to configure some non-existent directories --- .../playbooks/default/var_enterprise_deployment.yml | 2 ++ .../playbooks/vars/var_enterprise_deployment.yml | 2 ++ opengauss_ansible/roles/enterprise_deployment/tasks/mkdir.yml | 2 ++ .../roles/enterprise_deployment/templates/gs_guc.sh.j2 | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/opengauss_ansible/playbooks/default/var_enterprise_deployment.yml b/opengauss_ansible/playbooks/default/var_enterprise_deployment.yml index 98962a5..7372bef 100644 --- a/opengauss_ansible/playbooks/default/var_enterprise_deployment.yml +++ b/opengauss_ansible/playbooks/default/var_enterprise_deployment.yml @@ -10,3 +10,5 @@ gaussdb_data_path: "{{ gausshome }}/data" cm_dir: "{{ gausshome }}/cm" cm_server_port: 5000 tmp_tar_packages_path: "{{ gausshome }}/soft" +audit_directory: "{{ gausshome }}/pg_audit" +archive_dest: "/archive" diff --git a/opengauss_ansible/playbooks/vars/var_enterprise_deployment.yml b/opengauss_ansible/playbooks/vars/var_enterprise_deployment.yml index 98962a5..7372bef 100644 --- a/opengauss_ansible/playbooks/vars/var_enterprise_deployment.yml +++ b/opengauss_ansible/playbooks/vars/var_enterprise_deployment.yml @@ -10,3 +10,5 @@ gaussdb_data_path: "{{ gausshome }}/data" cm_dir: "{{ gausshome }}/cm" cm_server_port: 5000 tmp_tar_packages_path: "{{ gausshome }}/soft" +audit_directory: "{{ gausshome }}/pg_audit" +archive_dest: "/archive" diff --git a/opengauss_ansible/roles/enterprise_deployment/tasks/mkdir.yml b/opengauss_ansible/roles/enterprise_deployment/tasks/mkdir.yml index 704b94c..3967605 100644 --- a/opengauss_ansible/roles/enterprise_deployment/tasks/mkdir.yml +++ b/opengauss_ansible/roles/enterprise_deployment/tasks/mkdir.yml @@ -15,3 +15,5 @@ mode: '0755' with_items: - "{{ tmp_tar_packages_path }}" + - "{{ audit_directory }}" + - "{{ archive_dest }}" diff --git a/opengauss_ansible/roles/enterprise_deployment/templates/gs_guc.sh.j2 b/opengauss_ansible/roles/enterprise_deployment/templates/gs_guc.sh.j2 index 34dfb9e..2a9c928 100644 --- a/opengauss_ansible/roles/enterprise_deployment/templates/gs_guc.sh.j2 +++ b/opengauss_ansible/roles/enterprise_deployment/templates/gs_guc.sh.j2 @@ -18,7 +18,7 @@ function WAL(){ gs_guc set -I all -N all -c "xloginsert_locks=48" gs_guc set -I all -N all -c "advance_xlog_file_num=10" gs_guc set -N all -I all -c "archive_mode=on" - gs_guc set -N all -I all -c "archive_dest='/archive'" + gs_guc set -N all -I all -c "archive_dest='{{ archive_dest }}'" } function replicationAndSlots(){ @@ -75,7 +75,7 @@ function audit(){ gs_guc set -N all -I all -c "audit_copy_exec=0" gs_guc set -N all -I all -c "audit_set_parameter=0" gs_guc set -N all -I all -c "audit_xid_info=0" - gs_guc set -N all -I all -c "audit_directory='/database/panweidb/pg_audit'" + gs_guc set -N all -I all -c "audit_directory='{{ audit_directory }}'" gs_guc set -N all -I all -c "audit_resource_policy=off" gs_guc set -N all -I all -c "audit_file_remain_time=7" gs_guc set -N all -I all -c "audit_space_limit=5GB" -- Gitee From 7ddc69d95821ceb2b291bc66e606ef9d3a0afe28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=AC=E8=BE=BE?= <510386283@qq.com> Date: Sat, 26 Oct 2024 14:09:20 +0800 Subject: [PATCH 3/5] MySQL default 8.4.3 --- mysql_ansible/playbooks/common_config.yml | 2 +- mysql_ansible/playbooks/default/common_config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql_ansible/playbooks/common_config.yml b/mysql_ansible/playbooks/common_config.yml index d408b98..b055976 100644 --- a/mysql_ansible/playbooks/common_config.yml +++ b/mysql_ansible/playbooks/common_config.yml @@ -1,5 +1,5 @@ ## In most cases, just adjust these two parameters. -mysql_version: "8.4.2" +mysql_version: "8.4.3" mysql_port: 3306 # The 'server_specs' variable defines the hardware specifications for the server deployment. diff --git a/mysql_ansible/playbooks/default/common_config.yml b/mysql_ansible/playbooks/default/common_config.yml index d408b98..b055976 100644 --- a/mysql_ansible/playbooks/default/common_config.yml +++ b/mysql_ansible/playbooks/default/common_config.yml @@ -1,5 +1,5 @@ ## In most cases, just adjust these two parameters. -mysql_version: "8.4.2" +mysql_version: "8.4.3" mysql_port: 3306 # The 'server_specs' variable defines the hardware specifications for the server deployment. -- Gitee From e606957346e1484f3edf3451376ef56827049f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=AC=E8=BE=BE?= <510386283@qq.com> Date: Sat, 26 Oct 2024 21:00:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=98=AFMHA=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E8=A7=92=E8=89=B2=E6=97=B6=E6=89=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?os=E6=98=AF=E5=90=A6=E7=AC=A6=E5=90=88=E5=AE=89=E8=A3=85MHA?= =?UTF-8?q?=E7=9A=84=E8=A6=81=E6=B1=82=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=8F=90?= =?UTF-8?q?=E5=89=8D=E5=88=B0pre=5Ftask=E6=B5=81=E7=A8=8B=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql_ansible/playbooks/backup_script.yml | 2 ++ mysql_ansible/playbooks/exporter_install.yml | 3 ++ .../playbooks/install_mysqlshell.yml | 3 ++ .../playbooks/install_xtrabackup.yml | 3 ++ .../playbooks/keepalived_master_slave.yml | 2 ++ mysql_ansible/playbooks/master_slave.yml | 2 ++ mysql_ansible/playbooks/mgr.yml | 2 ++ mysql_ansible/playbooks/mha.yml | 2 ++ .../pre_tasks/check_os_and_python.yml | 33 ++++++++++++++++++ .../playbooks/pre_tasks/confirmation.yml | 34 ------------------- mysql_ansible/playbooks/single_node.yml | 2 ++ mysql_ansible/playbooks/unsafe_uninstall.yml | 3 ++ mysql_ansible/roles/make_mha/tasks/main.yml | 10 ------ 13 files changed, 57 insertions(+), 44 deletions(-) create mode 100644 mysql_ansible/playbooks/pre_tasks/check_os_and_python.yml diff --git a/mysql_ansible/playbooks/backup_script.yml b/mysql_ansible/playbooks/backup_script.yml index 6fc4a14..b08a12c 100644 --- a/mysql_ansible/playbooks/backup_script.yml +++ b/mysql_ansible/playbooks/backup_script.yml @@ -12,6 +12,8 @@ pre_tasks: - name: Import tasks to validate setting in common_config.yml ansible.builtin.import_tasks: pre_tasks/validate_common_config_setting.yml + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml - name: Import confirmation tasks ansible.builtin.import_tasks: pre_tasks/confirmation.yml tasks: diff --git a/mysql_ansible/playbooks/exporter_install.yml b/mysql_ansible/playbooks/exporter_install.yml index 4fffdbe..c254936 100644 --- a/mysql_ansible/playbooks/exporter_install.yml +++ b/mysql_ansible/playbooks/exporter_install.yml @@ -16,6 +16,9 @@ - name: Import tasks to validate setting in common_config.yml ansible.builtin.import_tasks: pre_tasks/validate_common_config_setting.yml + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml + - name: Import tasks to check if packages exist ansible.builtin.import_tasks: pre_tasks/check_if_exporter_packages_exist.yml diff --git a/mysql_ansible/playbooks/install_mysqlshell.yml b/mysql_ansible/playbooks/install_mysqlshell.yml index 6bfe6ce..c205db2 100644 --- a/mysql_ansible/playbooks/install_mysqlshell.yml +++ b/mysql_ansible/playbooks/install_mysqlshell.yml @@ -10,6 +10,9 @@ roles_to_execute: - "../roles/install_mysql_shell" pre_tasks: + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml + - name: Import confirmation tasks ansible.builtin.import_tasks: pre_tasks/confirmation.yml tasks: diff --git a/mysql_ansible/playbooks/install_xtrabackup.yml b/mysql_ansible/playbooks/install_xtrabackup.yml index bc20d45..2dff783 100644 --- a/mysql_ansible/playbooks/install_xtrabackup.yml +++ b/mysql_ansible/playbooks/install_xtrabackup.yml @@ -7,6 +7,9 @@ roles_to_execute: - "../roles/install_xtrabackup" pre_tasks: + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml + - name: Import confirmation tasks ansible.builtin.import_tasks: pre_tasks/confirmation.yml tasks: diff --git a/mysql_ansible/playbooks/keepalived_master_slave.yml b/mysql_ansible/playbooks/keepalived_master_slave.yml index ede7579..f7e26e1 100644 --- a/mysql_ansible/playbooks/keepalived_master_slave.yml +++ b/mysql_ansible/playbooks/keepalived_master_slave.yml @@ -18,6 +18,8 @@ pre_tasks: - name: Import tasks to validate setting in common_config.yml ansible.builtin.import_tasks: pre_tasks/validate_common_config_setting.yml + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml - name: Import tasks to check if packages exist ansible.builtin.import_tasks: pre_tasks/check_if_packages_exist.yml - name: Import validate master_slave tasks diff --git a/mysql_ansible/playbooks/master_slave.yml b/mysql_ansible/playbooks/master_slave.yml index 7f6366f..cc26047 100644 --- a/mysql_ansible/playbooks/master_slave.yml +++ b/mysql_ansible/playbooks/master_slave.yml @@ -17,6 +17,8 @@ pre_tasks: - name: Import tasks to validate setting in common_config.yml ansible.builtin.import_tasks: pre_tasks/validate_common_config_setting.yml + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml - name: Import tasks to check if packages exist ansible.builtin.import_tasks: pre_tasks/check_if_packages_exist.yml - name: Import validate master_slave tasks diff --git a/mysql_ansible/playbooks/mgr.yml b/mysql_ansible/playbooks/mgr.yml index e1e579e..b4240ae 100644 --- a/mysql_ansible/playbooks/mgr.yml +++ b/mysql_ansible/playbooks/mgr.yml @@ -16,6 +16,8 @@ pre_tasks: - name: Import tasks to validate setting in common_config.yml ansible.builtin.import_tasks: pre_tasks/validate_common_config_setting.yml + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml - name: Import tasks to check if packages exist ansible.builtin.import_tasks: pre_tasks/check_if_packages_exist.yml - name: Import validate mgr tasks diff --git a/mysql_ansible/playbooks/mha.yml b/mysql_ansible/playbooks/mha.yml index 6d708b9..d87a0a1 100644 --- a/mysql_ansible/playbooks/mha.yml +++ b/mysql_ansible/playbooks/mha.yml @@ -18,6 +18,8 @@ pre_tasks: - name: Import tasks to validate setting in common_config.yml ansible.builtin.import_tasks: pre_tasks/validate_common_config_setting.yml + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml - name: Import tasks to check if packages exist ansible.builtin.import_tasks: pre_tasks/check_if_packages_exist.yml - name: Import validate mha tasks diff --git a/mysql_ansible/playbooks/pre_tasks/check_os_and_python.yml b/mysql_ansible/playbooks/pre_tasks/check_os_and_python.yml new file mode 100644 index 0000000..d58ce36 --- /dev/null +++ b/mysql_ansible/playbooks/pre_tasks/check_os_and_python.yml @@ -0,0 +1,33 @@ +- name: Set the OS type variable + ansible.builtin.set_fact: + os_type: "{{ ansible_distribution }}{{ ansible_distribution_major_version }}" + +- name: Print the OS type + ansible.builtin.debug: + msg: "The OS type of host {{ inventory_hostname }} is {{ os_type }}" + +- name: Assert if OS type is supported + ansible.builtin.assert: + that: + - os_type in ['Rocky9', 'BigCloud21', 'BigCloud7', 'BigCloud8', 'Anolis OS8', 'openEuler24', 'openEuler20', 'CentOS7', 'CentOS8', 'openEuler22', 'RedHat7', 'RedHat8'] + fail_msg: "Unsupported OS type: {{ os_type }}" + +- name: Check for Python 3 + ansible.builtin.command: /usr/bin/python3 --version + register: pre_task__python3_result + failed_when: false + changed_when: false + +- name: Check for Python 2 + ansible.builtin.command: /usr/bin/python2 --version + register: pre_task__python2_result + failed_when: false + changed_when: false + +- name: Set Python interpreter + ansible.builtin.set_fact: + ansible_python_interpreter: "{% if os_type in ['BigCloud7', 'CentOS7', 'RedHat7'] %}/usr/bin/python2{% elif pre_task__python3_result.rc == 0 %}/usr/bin/python3{% elif pre_task__python2_result.rc == 0 %}/usr/bin/python2{% else %}{{ discovered_interpreter_python }}{% endif %}" + +- name: Print the Python interpreter + ansible.builtin.debug: + msg: "The Python interpreter of host {{ inventory_hostname }} is {{ ansible_python_interpreter }}" diff --git a/mysql_ansible/playbooks/pre_tasks/confirmation.yml b/mysql_ansible/playbooks/pre_tasks/confirmation.yml index 06209ce..7e23364 100644 --- a/mysql_ansible/playbooks/pre_tasks/confirmation.yml +++ b/mysql_ansible/playbooks/pre_tasks/confirmation.yml @@ -1,37 +1,3 @@ -- name: Set the OS type variable - ansible.builtin.set_fact: - os_type: "{{ ansible_distribution }}{{ ansible_distribution_major_version }}" - -- name: Print the OS type - ansible.builtin.debug: - msg: "The OS type of host {{ inventory_hostname }} is {{ os_type }}" - -- name: Assert if OS type is supported - ansible.builtin.assert: - that: - - os_type in ['Rocky9', 'BigCloud21', 'BigCloud7', 'BigCloud8', 'Anolis OS8', 'openEuler24', 'openEuler20', 'CentOS7', 'CentOS8', 'openEuler22', 'RedHat7', 'RedHat8'] - fail_msg: "Unsupported OS type: {{ os_type }}" - -- name: Check for Python 3 - ansible.builtin.command: /usr/bin/python3 --version - register: pre_task__python3_result - failed_when: false - changed_when: false - -- name: Check for Python 2 - ansible.builtin.command: /usr/bin/python2 --version - register: pre_task__python2_result - failed_when: false - changed_when: false - -- name: Set Python interpreter - ansible.builtin.set_fact: - ansible_python_interpreter: "{% if os_type in ['BigCloud7', 'CentOS7', 'RedHat7'] %}/usr/bin/python2{% elif pre_task__python3_result.rc == 0 %}/usr/bin/python3{% elif pre_task__python2_result.rc == 0 %}/usr/bin/python2{% else %}{{ discovered_interpreter_python }}{% endif %}" - -- name: Print the Python interpreter - ansible.builtin.debug: - msg: "The Python interpreter of host {{ inventory_hostname }} is {{ ansible_python_interpreter }}" - - name: Set server_specs_processor_count and server_specs_memtotal_gb based on server_specs set_fact: server_specs_processor_count: "{{ server_specs.split('c')[0] | int }}" diff --git a/mysql_ansible/playbooks/single_node.yml b/mysql_ansible/playbooks/single_node.yml index eddc63a..a311c5d 100644 --- a/mysql_ansible/playbooks/single_node.yml +++ b/mysql_ansible/playbooks/single_node.yml @@ -16,6 +16,8 @@ pre_tasks: - name: Import tasks to validate setting in common_config.yml ansible.builtin.import_tasks: pre_tasks/validate_common_config_setting.yml + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml - name: Import tasks to check if packages exist ansible.builtin.import_tasks: pre_tasks/check_if_packages_exist.yml - name: Import confirmation tasks diff --git a/mysql_ansible/playbooks/unsafe_uninstall.yml b/mysql_ansible/playbooks/unsafe_uninstall.yml index d647edc..7067391 100644 --- a/mysql_ansible/playbooks/unsafe_uninstall.yml +++ b/mysql_ansible/playbooks/unsafe_uninstall.yml @@ -7,6 +7,9 @@ roles_to_execute: - "../roles/unsafe_uninstall" pre_tasks: + - name: Import tasks to check os_type and python + ansible.builtin.import_tasks: pre_tasks/check_os_and_python.yml + - name: Import confirmation tasks ansible.builtin.import_tasks: pre_tasks/confirmation.yml tasks: diff --git a/mysql_ansible/roles/make_mha/tasks/main.yml b/mysql_ansible/roles/make_mha/tasks/main.yml index 6255b59..6ed573f 100644 --- a/mysql_ansible/roles/make_mha/tasks/main.yml +++ b/mysql_ansible/roles/make_mha/tasks/main.yml @@ -1,13 +1,3 @@ -# - name: Fail if mysql version is 8.0 -# ansible.builtin.fail: -# msg: "MHA is not support MySQL 8.0 !" -# when: mysql_package.split('.')[0] == 'mysql-8' and mysql_package.split('.')[1] == '0' - -- name: Fail if OS is not RHEL7 series - ansible.builtin.fail: - msg: "MHA is not suport in this OS!" - when: os_type not in ['BigCloud7', 'CentOS7', 'RedHat7'] - - name: Check is mysqld install by dbops or not ansible.builtin.stat: path: "{{ mysql_data_dir_base }}/data/{{ mysql_port }}/master_slave_finish.flag" -- Gitee From 87f0e2a4f8cf445e676613392aa0ef517e3563e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=AC=E8=BE=BE?= <510386283@qq.com> Date: Mon, 28 Oct 2024 11:38:28 +0800 Subject: [PATCH 5/5] Fix the issue in fetch_enterprise_deployment_log.yml where db_type=opengauss was hardcoded during log copying. --- opengauss_ansible/playbooks/tasks/create_tarball.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opengauss_ansible/playbooks/tasks/create_tarball.yml b/opengauss_ansible/playbooks/tasks/create_tarball.yml index 42d0ca6..92105c6 100644 --- a/opengauss_ansible/playbooks/tasks/create_tarball.yml +++ b/opengauss_ansible/playbooks/tasks/create_tarball.yml @@ -1,11 +1,11 @@ - name: Create tarball of logs shell: | tar zcvf /tmp/{{ inventory_hostname }}_log.tar.gz --ignore-failed-read \ - /database/opengauss/log \ - /database/opengauss/soft/cluster_config_template.xml \ - /database/opengauss/soft/gs_install-*.log \ - /database/opengauss/soft/gs_preinstall-*.log \ - /database/opengauss/soft/gs_local-*.log \ + /database/{{ db_type }}/log \ + /database/{{ db_type }}/soft/cluster_config_template.xml \ + /database/{{ db_type }}/soft/gs_install-*.log \ + /database/{{ db_type }}/soft/gs_preinstall-*.log \ + /database/{{ db_type }}/soft/gs_local-*.log \ || true register: tarball_result ignore_errors: yes -- Gitee