Merge pull request #107 from sassoftware/pr-depenbdat-3086-1

fix: Merge-playbook incorrectly updates vars.yml when adding on CPS (…

Author: kevinlinglesas

playbooks/merge-playbook/merge-viya-deployment-files.yml

@@ -34,7 +34,7 @@
 # Optional: The default_host can be designated for newly created host groups. Run:
 # -e "merge_default_host=deployTarget"
 #
-# Copyright (c) 2019-2020, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ####################################################################
@@ -661,7 +661,30 @@
                    SANMOUNT: '{{ "{{ SAS_CONFIG_ROOT }}/data/sasdatasvrc" }}'
                    SERVICE_NAME: cpspostgres
       when: cps_invocation|length > 0 and cpspostgres_props_exist.changed == False and ha_properties_exist.changed == True and merge_default_host is defined and perms_override_property_exists.changed == True
-   
+
+    # case 3-2-3 For 19w43 to 23w44 adding cps
+    - name: Move CommonPlanningService Invocation variables to INVOCATION_VARIABLES
+      blockinfile:
+        path: "{{ merged_vars_yml }}"
+        insertafter: "{{ merge_default_host }}:"
+        block: |3
+                 cpsdatasvrc:
+                 - NODE_NUMBER: '0'
+                   PG_PORT: '5442'
+                   SANMOUNT: '{{ "{{ SAS_CONFIG_ROOT }}/data/sasdatasvrc" }}'
+                   SERVICE_NAME: cpspostgres
+                 cpspgpoolc:
+                 - HA_PGPOOL_VIRTUAL_IP: ''
+                   HA_PGPOOL_WATCHDOG_PORT: ''
+                   HA_PGPOOL_HEARTBEAT_PORT: ''
+                   PERMS_OVERRIDE: 'false'
+                   POOL_NUMBER: '0'
+                   PCP_PORT: '5440'
+                   PGPOOL_PORT: '5441'
+                   SANMOUNT: '{{ "{{ SAS_CONFIG_ROOT }}/data/sasdatasvrc" }}'
+                   SERVICE_NAME: cpspostgres
+      when: cps_invocation|length > 0 and cpspostgres_props_exist.changed == False and merge_default_host is defined and curr_pgpool_heartbeat_property_exists.changed == False and ha_properties_exist.changed == True
+
     - name: Check whether the NODE_TYPE property exists in the merged vars.yml
       lineinfile:
         path: "{{ merged_vars_yml }}"