From 3f5a8c45c2086fd76bc8b242af689f0289431423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Marcelino?= <31037381+andrercm@users.noreply.github.com> Date: Mon, 27 Nov 2023 13:57:47 -0300 Subject: [PATCH] [patch] Fix playbook defaults and suite_dns default handling (#1114) Co-authored-by: David Parker --- ibm/mas_devops/playbooks/oneclick_add_assist.yml | 4 ++-- ibm/mas_devops/playbooks/oneclick_add_iot.yml | 2 +- ibm/mas_devops/playbooks/oneclick_add_manage.yml | 2 +- ibm/mas_devops/playbooks/oneclick_add_monitor.yml | 2 +- ibm/mas_devops/playbooks/oneclick_add_optimizer.yml | 2 +- ibm/mas_devops/playbooks/oneclick_add_predict.yml | 4 ++-- ibm/mas_devops/playbooks/oneclick_add_visualinspection.yml | 2 +- ibm/mas_devops/roles/suite_certs/defaults/main.yml | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ibm/mas_devops/playbooks/oneclick_add_assist.yml b/ibm/mas_devops/playbooks/oneclick_add_assist.yml index bdd6f1c4d..f99770762 100644 --- a/ibm/mas_devops/playbooks/oneclick_add_assist.yml +++ b/ibm/mas_devops/playbooks/oneclick_add_assist.yml @@ -11,11 +11,11 @@ # Application Dependencies cos_type: ibm cpd_service_name: wd - cpd_product_version: "{{ lookup('env', 'CPD_PRODUCT_VERSION') | default('4.5.0', true) }}" + cpd_product_version: "{{ lookup('env', 'CPD_PRODUCT_VERSION') | default('4.6.6', true) }}" # Application Installation mas_app_id: assist - mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.7.x', true) }}" + mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.8.x', true) }}" mas_app_spec: bindings: diff --git a/ibm/mas_devops/playbooks/oneclick_add_iot.yml b/ibm/mas_devops/playbooks/oneclick_add_iot.yml index 7ff85efd4..0b7cdc510 100644 --- a/ibm/mas_devops/playbooks/oneclick_add_iot.yml +++ b/ibm/mas_devops/playbooks/oneclick_add_iot.yml @@ -13,7 +13,7 @@ # Application Installation mas_app_id: iot - mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.7.x', true) }}" + mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.8.x', true) }}" # Application Configuration mas_workspace_id: "{{ lookup('env', 'MAS_WORKSPACE_ID') | default('masdev', true) }}" diff --git a/ibm/mas_devops/playbooks/oneclick_add_manage.yml b/ibm/mas_devops/playbooks/oneclick_add_manage.yml index 4bdc3c4d7..63879382d 100644 --- a/ibm/mas_devops/playbooks/oneclick_add_manage.yml +++ b/ibm/mas_devops/playbooks/oneclick_add_manage.yml @@ -14,7 +14,7 @@ # Application Installation # mas_app_id can be set to "health" to install manage in the "Health standalone" mode from this same playbook. mas_app_id: "{{ lookup('env', 'MAS_APP_ID') | default('manage', true) }}" - mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.6.x', true) }}" + mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.7.x', true) }}" # Application Configuration mas_workspace_id: "{{ lookup('env', 'MAS_WORKSPACE_ID') | default('masdev', true) }}" diff --git a/ibm/mas_devops/playbooks/oneclick_add_monitor.yml b/ibm/mas_devops/playbooks/oneclick_add_monitor.yml index a6708898b..60b193464 100644 --- a/ibm/mas_devops/playbooks/oneclick_add_monitor.yml +++ b/ibm/mas_devops/playbooks/oneclick_add_monitor.yml @@ -13,7 +13,7 @@ vars: # Application Installation mas_app_id: monitor - mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.10.x', true) }}" + mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.11.x', true) }}" # Application Configuration mas_workspace_id: "{{ lookup('env', 'MAS_WORKSPACE_ID') | default('masdev', true) }}" diff --git a/ibm/mas_devops/playbooks/oneclick_add_optimizer.yml b/ibm/mas_devops/playbooks/oneclick_add_optimizer.yml index 05ea113ff..cbc262da5 100644 --- a/ibm/mas_devops/playbooks/oneclick_add_optimizer.yml +++ b/ibm/mas_devops/playbooks/oneclick_add_optimizer.yml @@ -9,7 +9,7 @@ vars: # Application Installation - mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.4.x', true) }}" + mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.5.x', true) }}" mas_app_id: optimizer # Application Configuration diff --git a/ibm/mas_devops/playbooks/oneclick_add_predict.yml b/ibm/mas_devops/playbooks/oneclick_add_predict.yml index a9cff8720..8d9c250ef 100644 --- a/ibm/mas_devops/playbooks/oneclick_add_predict.yml +++ b/ibm/mas_devops/playbooks/oneclick_add_predict.yml @@ -16,7 +16,7 @@ # Application Installation # ------------------------------------------------------------------------- mas_app_id: predict - mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.8.x', true) }}" + mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.9.x', true) }}" # Application Configuration # ------------------------------------------------------------------------- @@ -24,7 +24,7 @@ # Cloud Pak for Data Configuration # ------------------------------------------------------------------------- - cpd_product_version: "{{ lookup('env', 'CPD_PRODUCT_VERSION') | default('4.5.0', true) }}" + cpd_product_version: "{{ lookup('env', 'CPD_PRODUCT_VERSION') | default('4.6.6', true) }}" # these vars will be set by cp4d playbook, if it did not run (eg install_cp4d_platform=false), it will be set by the environment vars. cpd_url: "{{ lookup('env', 'CPD_URL') }}" diff --git a/ibm/mas_devops/playbooks/oneclick_add_visualinspection.yml b/ibm/mas_devops/playbooks/oneclick_add_visualinspection.yml index 85802a106..9152fd4bb 100644 --- a/ibm/mas_devops/playbooks/oneclick_add_visualinspection.yml +++ b/ibm/mas_devops/playbooks/oneclick_add_visualinspection.yml @@ -11,7 +11,7 @@ # Application Installation # mas_app_id can be set to "health" to install manage in the "Health standalone" mode from this same playbook. mas_app_id: visualinspection - mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.8.x', true) }}" + mas_app_channel: "{{ lookup('env', 'MAS_APP_CHANNEL') | default('8.9.x', true) }}" # Application Configuration mas_workspace_id: "{{ lookup('env', 'MAS_WORKSPACE_ID') | default('masdev', true) }}" diff --git a/ibm/mas_devops/roles/suite_certs/defaults/main.yml b/ibm/mas_devops/roles/suite_certs/defaults/main.yml index 776712fbe..f454b3982 100644 --- a/ibm/mas_devops/roles/suite_certs/defaults/main.yml +++ b/ibm/mas_devops/roles/suite_certs/defaults/main.yml @@ -2,14 +2,14 @@ mas_instance_id: "{{ lookup('env', 'MAS_INSTANCE_ID') }}" mas_config_dir: "{{ lookup('env', 'MAS_CONFIG_DIR') }}" mas_suite_certs_dir: "{{ mas_config_dir }}/certs" -mas_manual_cert_mgmt: "{{ lookup('env', 'MAS_MANUAL_CERT_MGMT') | default(False, true) }}" +mas_manual_cert_mgmt: "{{ lookup('env', 'MAS_MANUAL_CERT_MGMT') | default(False, true) | bool }}" # Optional parameters when using CIS as DNS Provider dns_provider: "{{ lookup('env', 'DNS_PROVIDER') }}" # optional - works only if DNS provider is CIS cis_crn: "{{ lookup('env', 'CIS_CRN') }}" cis_apikey: "{{ lookup('env', 'CIS_APIKEY') }}" cis_subdomain: "{{ lookup('env', 'CIS_SUBDOMAIN') }}" -cis_proxy: "{{ lookup('env', 'CIS_PROXY') | default('False', true) }}" +cis_proxy: "{{ lookup('env', 'CIS_PROXY') | default('False', true) | bool }}" mas_workspace_id: "{{ lookup('env', 'MAS_WORKSPACE_ID') }}" # All the TLS secret names across the suite. Currently there's no common naming convention we can use.