From 2edcb2f2d3c69d6761714e1b3600d76a584e63d3 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Mon, 20 Nov 2023 10:45:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20mysql=20=E5=BC=80=E5=90=AFssl=20?= =?UTF-8?q?=E5=86=8D=E5=85=B3=E9=97=AD=20=E6=B5=8B=E8=AF=95=E5=8F=AF?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=80=A7=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../change_secret/database/mysql/main.yml | 25 ++++++++++--------- .../gather_accounts/database/mysql/main.yml | 9 ++++--- .../push_account/database/mysql/main.yml | 25 ++++++++++--------- .../verify_account/database/mysql/main.yml | 9 ++++--- .../gather_facts/database/mysql/main.yml | 9 ++++--- .../automations/ping/database/mysql/main.yml | 9 ++++--- 6 files changed, 46 insertions(+), 40 deletions(-) diff --git a/apps/accounts/automations/change_secret/database/mysql/main.yml b/apps/accounts/automations/change_secret/database/mysql/main.yml index 91b7d6f2c..a423064d3 100644 --- a/apps/accounts/automations/change_secret/database/mysql/main.yml +++ b/apps/accounts/automations/change_secret/database/mysql/main.yml @@ -3,6 +3,7 @@ vars: ansible_python_interpreter: /opt/py3/bin/python db_name: "{{ jms_asset.spec_info.db_name }}" + jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}" tasks: - name: Test MySQL connection @@ -11,10 +12,10 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" filter: version register: db_info @@ -28,10 +29,10 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" name: "{{ account.username }}" password: "{{ account.secret }}" host: "%" @@ -45,8 +46,8 @@ login_password: "{{ account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" filter: version diff --git a/apps/accounts/automations/gather_accounts/database/mysql/main.yml b/apps/accounts/automations/gather_accounts/database/mysql/main.yml index e8cf3cac4..4b77359fc 100644 --- a/apps/accounts/automations/gather_accounts/database/mysql/main.yml +++ b/apps/accounts/automations/gather_accounts/database/mysql/main.yml @@ -2,6 +2,7 @@ gather_facts: no vars: ansible_python_interpreter: /opt/py3/bin/python + jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}" tasks: - name: Get info @@ -10,10 +11,10 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" filter: users register: db_info diff --git a/apps/accounts/automations/push_account/database/mysql/main.yml b/apps/accounts/automations/push_account/database/mysql/main.yml index 91b7d6f2c..a423064d3 100644 --- a/apps/accounts/automations/push_account/database/mysql/main.yml +++ b/apps/accounts/automations/push_account/database/mysql/main.yml @@ -3,6 +3,7 @@ vars: ansible_python_interpreter: /opt/py3/bin/python db_name: "{{ jms_asset.spec_info.db_name }}" + jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}" tasks: - name: Test MySQL connection @@ -11,10 +12,10 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" filter: version register: db_info @@ -28,10 +29,10 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" name: "{{ account.username }}" password: "{{ account.secret }}" host: "%" @@ -45,8 +46,8 @@ login_password: "{{ account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" filter: version diff --git a/apps/accounts/automations/verify_account/database/mysql/main.yml b/apps/accounts/automations/verify_account/database/mysql/main.yml index 2ae3a4abd..91de7fc9f 100644 --- a/apps/accounts/automations/verify_account/database/mysql/main.yml +++ b/apps/accounts/automations/verify_account/database/mysql/main.yml @@ -2,6 +2,7 @@ gather_facts: no vars: ansible_python_interpreter: /opt/py3/bin/python + jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}" tasks: - name: Verify account @@ -10,8 +11,8 @@ login_password: "{{ account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" filter: version diff --git a/apps/assets/automations/gather_facts/database/mysql/main.yml b/apps/assets/automations/gather_facts/database/mysql/main.yml index b9d1fce8c..06c6c9bd4 100644 --- a/apps/assets/automations/gather_facts/database/mysql/main.yml +++ b/apps/assets/automations/gather_facts/database/mysql/main.yml @@ -2,6 +2,7 @@ gather_facts: no vars: ansible_python_interpreter: /opt/py3/bin/python + jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}" tasks: - name: Get info @@ -10,10 +11,10 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" filter: version register: db_info diff --git a/apps/assets/automations/ping/database/mysql/main.yml b/apps/assets/automations/ping/database/mysql/main.yml index 2180610d4..f24c95233 100644 --- a/apps/assets/automations/ping/database/mysql/main.yml +++ b/apps/assets/automations/ping/database/mysql/main.yml @@ -2,6 +2,7 @@ gather_facts: no vars: ansible_python_interpreter: /opt/py3/bin/python + jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}" tasks: - name: Test MySQL connection @@ -10,8 +11,8 @@ login_password: "{{ jms_account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - check_hostname: "{{ omit if not jms_asset.spec_info.use_ssl else jms_asset.spec_info.allow_invalid_cert }}" - ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) }}" - client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) }}" - client_key: "{{ jms_asset.secret_info.client_key | default(omit) }}" + check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}" + ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}" + client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}" + client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}" filter: version