From 5b4105814def8d023d6976c31bad920a64edaa08 Mon Sep 17 00:00:00 2001 From: Witold Wierzchowski Date: Thu, 22 Aug 2024 20:12:07 +0200 Subject: [PATCH 1/2] [patch] - added variable for vargraphic setting for Manage and Health --- ibm/mas_devops/roles/suite_app_config/README.md | 5 +++++ .../roles/suite_app_config/vars/defaultspecs/health.yml | 2 +- .../roles/suite_app_config/vars/defaultspecs/manage.yml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ibm/mas_devops/roles/suite_app_config/README.md b/ibm/mas_devops/roles/suite_app_config/README.md index 0b28c5638..38b45d6b6 100644 --- a/ibm/mas_devops/roles/suite_app_config/README.md +++ b/ibm/mas_devops/roles/suite_app_config/README.md @@ -180,6 +180,11 @@ Optional. Flag indicating if manage demodata should be loaded or not. - Environment Variable: `MAS_APP_SETTINGS_DEMODATA` - Default: `false` (do not load demodata) +### "{{ mas_app_settings_db2vargraphic | bool }}" +Optional. Flag indicating if VARGRAPHIC (if true) or VARCHAR (if false) is used. + +- Default: `true` (use VARGRAPHIC) + ### mas_app_settings_tablespace Optional. Name of the Manage database tablespace diff --git a/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/health.yml b/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/health.yml index 0ef128c86..a416b6bf2 100644 --- a/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/health.yml +++ b/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/health.yml @@ -16,7 +16,7 @@ mas_appws_spec: dbSchema: "{{ mas_app_settings_db2_schema }}" maxinst: demodata: "{{ mas_app_settings_demodata | bool }}" - db2Vargraphic: true + db2Vargraphic: "{{ mas_app_settings_db2vargraphic | default('true', true) | bool }}" indexSpace: "{{ mas_app_settings_indexspace }}" tableSpace: "{{ mas_app_settings_tablespace }}" bypassUpgradeVersionCheck: false diff --git a/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/manage.yml b/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/manage.yml index 942112684..95578783b 100644 --- a/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/manage.yml +++ b/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/manage.yml @@ -19,7 +19,7 @@ mas_appws_spec: dbSchema: "{{ mas_app_settings_db2_schema }}" maxinst: demodata: "{{ mas_app_settings_demodata | bool }}" - db2Vargraphic: true + db2Vargraphic: "{{ mas_app_settings_db2vargraphic | default('true', true) | bool }}" tableSpace: "{{ mas_app_settings_tablespace }}" indexSpace: "{{ mas_app_settings_indexspace }}" bypassUpgradeVersionCheck: false From e1771a5bcfbdd5be0561756974e3b7f4b8f949e7 Mon Sep 17 00:00:00 2001 From: Witold Wierzchowski Date: Mon, 26 Aug 2024 12:14:27 +0200 Subject: [PATCH 2/2] requested changes --- ibm/mas_devops/roles/suite_app_config/README.md | 6 +++--- .../roles/suite_app_config/vars/defaultspecs/health.yml | 2 +- .../roles/suite_app_config/vars/defaultspecs/manage.yml | 2 +- ibm/mas_devops/roles/suite_app_config/vars/health.yml | 1 + ibm/mas_devops/roles/suite_app_config/vars/manage.yml | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ibm/mas_devops/roles/suite_app_config/README.md b/ibm/mas_devops/roles/suite_app_config/README.md index 38b45d6b6..29821fe30 100644 --- a/ibm/mas_devops/roles/suite_app_config/README.md +++ b/ibm/mas_devops/roles/suite_app_config/README.md @@ -180,10 +180,10 @@ Optional. Flag indicating if manage demodata should be loaded or not. - Environment Variable: `MAS_APP_SETTINGS_DEMODATA` - Default: `false` (do not load demodata) -### "{{ mas_app_settings_db2vargraphic | bool }}" -Optional. Flag indicating if VARGRAPHIC (if true) or VARCHAR (if false) is used. +### mas_app_settings_db2vargraphic +Optional. Flag indicating if VARGRAPHIC (if true) or VARCHAR (if false) is used. Details: https://www.ibm.com/docs/en/mas-cd/continuous-delivery?topic=deploy-language-support -- Default: `true` (use VARGRAPHIC) +- Default: `true` ### mas_app_settings_tablespace Optional. Name of the Manage database tablespace diff --git a/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/health.yml b/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/health.yml index a416b6bf2..91d0fc7d6 100644 --- a/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/health.yml +++ b/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/health.yml @@ -16,7 +16,7 @@ mas_appws_spec: dbSchema: "{{ mas_app_settings_db2_schema }}" maxinst: demodata: "{{ mas_app_settings_demodata | bool }}" - db2Vargraphic: "{{ mas_app_settings_db2vargraphic | default('true', true) | bool }}" + db2Vargraphic: "{{ mas_app_settings_db2vargraphic | bool }}" indexSpace: "{{ mas_app_settings_indexspace }}" tableSpace: "{{ mas_app_settings_tablespace }}" bypassUpgradeVersionCheck: false diff --git a/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/manage.yml b/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/manage.yml index 95578783b..0d206b220 100644 --- a/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/manage.yml +++ b/ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/manage.yml @@ -19,7 +19,7 @@ mas_appws_spec: dbSchema: "{{ mas_app_settings_db2_schema }}" maxinst: demodata: "{{ mas_app_settings_demodata | bool }}" - db2Vargraphic: "{{ mas_app_settings_db2vargraphic | default('true', true) | bool }}" + db2Vargraphic: "{{ mas_app_settings_db2vargraphic | bool }}" tableSpace: "{{ mas_app_settings_tablespace }}" indexSpace: "{{ mas_app_settings_indexspace }}" bypassUpgradeVersionCheck: false diff --git a/ibm/mas_devops/roles/suite_app_config/vars/health.yml b/ibm/mas_devops/roles/suite_app_config/vars/health.yml index 0af3bc78c..1966b7556 100644 --- a/ibm/mas_devops/roles/suite_app_config/vars/health.yml +++ b/ibm/mas_devops/roles/suite_app_config/vars/health.yml @@ -9,6 +9,7 @@ mas_app_cfg_retries: "{{ lookup('env', 'MAS_APP_CFG_RETRIES') | default(50, true mas_app_settings_aio_flag: "{{ lookup('env', 'MAS_APP_SETTINGS_AIO_FLAG') | default('true', true)}}" mas_app_settings_db2_schema: "{{ lookup('env', 'MAS_APP_SETTINGS_DB2_SCHEMA') | default('maximo', true)}}" mas_app_settings_demodata: "{{ lookup('env', 'MAS_APP_SETTINGS_DEMODATA') | default('false', true) }}" +mas_app_settings_db2vargraphic : "{{ lookup('env', 'MAS_APP_SETTINGS_DB2VARGRAPHIC') | default('true', true) | bool }}" mas_app_settings_tablespace: "{{ lookup('env', 'MAS_APP_SETTINGS_TABLESPACE') | default('MAXDATA', true)}}" mas_app_settings_indexspace: "{{ lookup('env', 'MAS_APP_SETTINGS_INDEXSPACE') | default('MAXINDEX', true)}}" diff --git a/ibm/mas_devops/roles/suite_app_config/vars/manage.yml b/ibm/mas_devops/roles/suite_app_config/vars/manage.yml index b37e15b52..09fc616c7 100644 --- a/ibm/mas_devops/roles/suite_app_config/vars/manage.yml +++ b/ibm/mas_devops/roles/suite_app_config/vars/manage.yml @@ -10,6 +10,7 @@ mas_app_cfg_retries: "{{ lookup('env', 'MAS_APP_CFG_RETRIES') | default(60, true mas_app_settings_aio_flag: "{{ lookup('env', 'MAS_APP_SETTINGS_AIO_FLAG') | default('true', true) | bool }}" mas_app_settings_db2_schema: "{{ lookup('env', 'MAS_APP_SETTINGS_DB2_SCHEMA') | default('maximo', true)}}" mas_app_settings_demodata: "{{ lookup('env', 'MAS_APP_SETTINGS_DEMODATA') | default('false', true) | bool }}" +mas_app_settings_db2vargraphic : "{{ lookup('env', 'MAS_APP_SETTINGS_DB2VARGRAPHIC') | default('true', true) | bool }}" mas_app_settings_tablespace: "{{ lookup('env', 'MAS_APP_SETTINGS_TABLESPACE') | default('MAXDATA', true)}}" mas_app_settings_indexspace: "{{ lookup('env', 'MAS_APP_SETTINGS_INDEXSPACE') | default('MAXINDEX', true)}}"