From a4e8cd41ffcf2cf0de748f4d46f7ce4d383fef90 Mon Sep 17 00:00:00 2001 From: Steven Schattenberg Date: Thu, 15 Aug 2024 06:15:54 -0400 Subject: [PATCH 1/3] resolved conflicts --- roles/gateway/tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/gateway/tasks/main.yml b/roles/gateway/tasks/main.yml index ba1060ba..a38040cf 100644 --- a/roles/gateway/tasks/main.yml +++ b/roles/gateway/tasks/main.yml @@ -173,7 +173,11 @@ - name: Create properties.yml using template based on the version ansible.builtin.template: src: "properties.{{ iag_release }}.yml.j2" +<<<<<<< Updated upstream:roles/gateway/tasks/main.yml dest: "{{ iag_properties_location }}/properties.yml" +======= + dest: "{{ iag_properties_location }}/properties.yaml" +>>>>>>> Stashed changes:roles/gateway/tasks/main.yaml owner: "{{ iag_user }}" group: "{{ iag_group }}" mode: "0600" From ce351f5c961c1c7f05b0cc4073f3bcd9c6c141ce Mon Sep 17 00:00:00 2001 From: Steven Schattenberg Date: Mon, 23 Sep 2024 13:20:35 -0400 Subject: [PATCH 2/3] Resolve conflict --- roles/gateway/tasks/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/roles/gateway/tasks/main.yml b/roles/gateway/tasks/main.yml index a38040cf..ba1060ba 100644 --- a/roles/gateway/tasks/main.yml +++ b/roles/gateway/tasks/main.yml @@ -173,11 +173,7 @@ - name: Create properties.yml using template based on the version ansible.builtin.template: src: "properties.{{ iag_release }}.yml.j2" -<<<<<<< Updated upstream:roles/gateway/tasks/main.yml dest: "{{ iag_properties_location }}/properties.yml" -======= - dest: "{{ iag_properties_location }}/properties.yaml" ->>>>>>> Stashed changes:roles/gateway/tasks/main.yaml owner: "{{ iag_user }}" group: "{{ iag_group }}" mode: "0600" From 1bbb8560adbb6af189d53b17c2244c0125b030fc Mon Sep 17 00:00:00 2001 From: Steven Schattenberg Date: Mon, 11 Nov 2024 16:54:04 -0500 Subject: [PATCH 3/3] removed logic for rabbitmq --- roles/platform/tasks/create-properties-file.yml | 6 ++---- roles/platform/tasks/mongo-init.yml | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/roles/platform/tasks/create-properties-file.yml b/roles/platform/tasks/create-properties-file.yml index b0aecc43..26762333 100644 --- a/roles/platform/tasks/create-properties-file.yml +++ b/roles/platform/tasks/create-properties-file.yml @@ -12,13 +12,11 @@ vars: profile_name: Local_AAA when: - - (groups["redis_secondary"] is not defined and groups["rabbitmq_secondary"] is not defined) or - (groups["redis_secondary"] | length == 0 and groups["rabbitmq_secondary"] | length == 0) + - groups["platform_secondary"] is not defined or groups["platform_secondary"] | length < 1 - name: Create the Itential properties.json files for advanced prod builds when: - - groups["redis_secondary"] is defined and groups["rabbitmq_secondary"] is defined - - groups["redis_secondary"] | length > 0 and groups["rabbitmq_secondary"] | length > 0 + - groups["platform_secondary"] is defined and groups["platform_secondary"] | length > 0 block: - name: Create the default Itential properties.json file for the primary ansible.builtin.template: diff --git a/roles/platform/tasks/mongo-init.yml b/roles/platform/tasks/mongo-init.yml index 68f04bd2..9f0d7fba 100644 --- a/roles/platform/tasks/mongo-init.yml +++ b/roles/platform/tasks/mongo-init.yml @@ -106,8 +106,7 @@ - name: Create advanced profile documents for non-default production environments when: - inventory_hostname == groups.platform[0] - - groups["redis_secondary"] | default([]) | length > 0 - - groups["rabbitmq_secondary"] | default([]) | length > 0 + - groups["platform_secondary"] | default([]) | length > 0 block: # Determine if the Local_AAA profile is already in the database - name: Determine if the Primary_Local_AAA profile document already exists