From f6d048dce57bbc425e103d8f80f8c23ad01b744a Mon Sep 17 00:00:00 2001 From: Steven Schattenberg Date: Thu, 15 Aug 2024 06:15:54 -0400 Subject: [PATCH 1/6] 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 c08f7fccb9eaf66a100a28277ca320c299b4f971 Mon Sep 17 00:00:00 2001 From: Steven Schattenberg Date: Sat, 21 Sep 2024 11:43:24 -0400 Subject: [PATCH 2/6] Replace hard coded paths with variables --- roles/redis_replication/templates/sentinel.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/redis_replication/templates/sentinel.conf.j2 b/roles/redis_replication/templates/sentinel.conf.j2 index 76251c1e..c55bb811 100644 --- a/roles/redis_replication/templates/sentinel.conf.j2 +++ b/roles/redis_replication/templates/sentinel.conf.j2 @@ -28,15 +28,15 @@ daemonize no # When running daemonized, Redis Sentinel writes a pid file in # /var/run/redis-sentinel.pid by default. You can specify a custom pid file # location here. -pidfile /var/run/redis-sentinel.pid +pidfile {{ redis_pid_dir }}/redis-sentinel.pid # Specify the log file name. Also the empty string can be used to force # Sentinel to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null -logfile /var/log/redis/sentinel.log +logfile {{ redis_log_dir }}/sentinel.log sentinel announce-ip {{ inventory_hostname }} -# sentinel announce-port +sentinel announce-port {{ redis_sentinel_port }} # # The above two configuration directives are useful in environments where, # because of NAT, Sentinel is reachable from outside via a non-local address. From 243ce27a14f1b649ebb7be94ef8b72674fc805f7 Mon Sep 17 00:00:00 2001 From: Steven Schattenberg Date: Sat, 21 Sep 2024 11:55:11 -0400 Subject: [PATCH 3/6] 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 0c35802eb6392a754aa8a97939ed3f91124cface Mon Sep 17 00:00:00 2001 From: Steven Schattenberg Date: Thu, 15 Aug 2024 06:15:54 -0400 Subject: [PATCH 4/6] 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 755dec04606778ca0c7f20350b97d5d9649896a8 Mon Sep 17 00:00:00 2001 From: Steven Schattenberg Date: Sat, 21 Sep 2024 12:11:08 -0400 Subject: [PATCH 5/6] Resolve conflicts --- 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 3ce8f2e4b8ca65c2cf69b0c8c0e2aed196484770 Mon Sep 17 00:00:00 2001 From: Steven Schattenberg Date: Sat, 21 Sep 2024 13:34:04 -0400 Subject: [PATCH 6/6] Add mongo host to tasks, do not use default --- roles/mongodb/tasks/main.yml | 3 +++ roles/mongodb_common/tasks/check-auth-status.yml | 1 + roles/mongodb_common/tasks/determine-primary-server.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml index 235f420e..00e66932 100644 --- a/roles/mongodb/tasks/main.yml +++ b/roles/mongodb/tasks/main.yml @@ -203,6 +203,7 @@ login_user: "{{ mongodb_auth_enabled is defined and mongodb_auth_enabled | ternary('admin', omit) }}" login_password: "{{ mongodb_auth_enabled is defined and mongodb_auth_enabled | ternary(mongo_user_admin_password, omit) }}" login_port: "{{ mongo_port }}" + login_host: "{{ inventory_hostname }}" database: "{{ mongo_admin_db_name }}" name: admin password: "{{ mongo_user_admin_password }}" @@ -222,6 +223,7 @@ login_user: "{{ mongodb_auth_enabled is defined and mongodb_auth_enabled | ternary('admin', omit) }}" login_password: "{{ mongodb_auth_enabled is defined and mongodb_auth_enabled | ternary(mongo_user_admin_password, omit) }}" login_port: "{{ mongo_port }}" + login_host: "{{ inventory_hostname }}" database: "{{ mongo_itential_db_name }}" user: itential password: "{{ mongo_user_itential_password }}" @@ -241,6 +243,7 @@ login_user: "{{ mongodb_auth_enabled is defined and mongodb_auth_enabled | ternary('admin', omit) }}" login_password: "{{ mongodb_auth_enabled is defined and mongodb_auth_enabled | ternary(mongo_user_admin_password, omit) }}" login_port: "{{ mongo_port }}" + login_host: "{{ inventory_hostname }}" database: "{{ mongo_localaaa_db_name }}" user: localaaa password: "{{ mongo_user_localaaa_password }}" diff --git a/roles/mongodb_common/tasks/check-auth-status.yml b/roles/mongodb_common/tasks/check-auth-status.yml index 13f4b2f2..f480f422 100644 --- a/roles/mongodb_common/tasks/check-auth-status.yml +++ b/roles/mongodb_common/tasks/check-auth-status.yml @@ -13,6 +13,7 @@ login_user: "{{ mongo_auth_enabled is defined and mongo_auth_enabled | ternary('admin', omit) }}" login_password: "{{ mongo_auth_enabled is defined and mongo_auth_enabled | ternary(mongo_user_admin_password, omit) }}" login_port: "{{ mongo_port }}" + login_host: "{{ inventory_hostname }}" mongo_cmd: auto db: admin eval: "db.getUsers()" diff --git a/roles/mongodb_common/tasks/determine-primary-server.yml b/roles/mongodb_common/tasks/determine-primary-server.yml index 1fb6dd0f..ed81216b 100644 --- a/roles/mongodb_common/tasks/determine-primary-server.yml +++ b/roles/mongodb_common/tasks/determine-primary-server.yml @@ -11,6 +11,7 @@ login_user: "{{ mongo_auth_enabled is defined and mongo_auth_enabled | ternary('admin', omit) }}" login_password: "{{ mongo_auth_enabled is defined and mongo_auth_enabled | ternary(mongo_user_admin_password, omit) }}" login_port: "{{ mongo_port }}" + login_host: "{{ inventory_hostname }}" eval: "rs.status()" register: rs_status_result changed_when: false @@ -31,6 +32,7 @@ login_user: "{{ mongo_auth_enabled is defined and mongo_auth_enabled | ternary('admin', omit) }}" login_password: "{{ mongo_auth_enabled is defined and mongo_auth_enabled | ternary(mongo_user_admin_password, omit) }}" login_port: "{{ mongo_port }}" + login_host: "{{ inventory_hostname }}" replica_set: rs0 register: mongodb_status_result