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