From bf13b58ad570fcc86f2f906f83587001c609d3b9 Mon Sep 17 00:00:00 2001 From: Alisha Mayor Date: Thu, 10 Nov 2022 14:18:30 -0800 Subject: [PATCH] Revert "Fix Typo and Update Multisite SHC Setup (#702)" (#703) This reverts commit 19250b223bc4eba28bb2d51528ea57102eaa28f0. --- roles/splunk_cluster_master/tasks/setup_multisite.yml | 2 +- roles/splunk_indexer/tasks/setup_multisite.yml | 2 +- roles/splunk_monitor/tasks/setup_multisite.yml | 2 +- roles/splunk_search_head/tasks/setup_multisite.yml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/splunk_cluster_master/tasks/setup_multisite.yml b/roles/splunk_cluster_master/tasks/setup_multisite.yml index b143c8f9..4a65dc38 100644 --- a/roles/splunk_cluster_master/tasks/setup_multisite.yml +++ b/roles/splunk_cluster_master/tasks/setup_multisite.yml @@ -3,7 +3,7 @@ vars: splunk_instance_address: "{{ splunk.multisite_master }}" -- name: Convert External Cluster Master Name into Internal URI +- name: Convert Extrenal Cluster Master Name into Internal URI set_fact: multisite_master_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}" diff --git a/roles/splunk_indexer/tasks/setup_multisite.yml b/roles/splunk_indexer/tasks/setup_multisite.yml index 012640ae..014e5ae2 100644 --- a/roles/splunk_indexer/tasks/setup_multisite.yml +++ b/roles/splunk_indexer/tasks/setup_multisite.yml @@ -3,7 +3,7 @@ vars: splunk_instance_address: "{{ splunk.multisite_master }}" -- name: Convert External Cluster Master Name into Internal URI +- name: Convert Extrenal Cluster Master Name into Internal URI set_fact: multisite_master_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}" diff --git a/roles/splunk_monitor/tasks/setup_multisite.yml b/roles/splunk_monitor/tasks/setup_multisite.yml index 04d327f0..f9f67dfd 100644 --- a/roles/splunk_monitor/tasks/setup_multisite.yml +++ b/roles/splunk_monitor/tasks/setup_multisite.yml @@ -3,7 +3,7 @@ vars: splunk_instance_address: "{{ splunk.multisite_master }}" -- name: Convert External Cluster Master Name into Internal URI +- name: Convert Extrenal Cluster Master Name into Internal URI set_fact: multisite_master_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}" diff --git a/roles/splunk_search_head/tasks/setup_multisite.yml b/roles/splunk_search_head/tasks/setup_multisite.yml index 2891c800..ef65dc72 100644 --- a/roles/splunk_search_head/tasks/setup_multisite.yml +++ b/roles/splunk_search_head/tasks/setup_multisite.yml @@ -3,12 +3,12 @@ vars: splunk_instance_address: "{{ splunk.multisite_master }}" -- name: Convert External Cluster Master Name into Internal URI +- name: Convert Extrenal Cluster Master Name into Internal URI set_fact: multisite_master_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}" - name: Setup SHC - Multisite - command: "{{ splunk.exec }} edit cluster-config -mode searchhead -master_uri {{ multisite_master_uri }} -auth {{ splunk.admin_user }}:{{ splunk.password }} -secret {{ splunk.shc.pass4SymmKey }}" + command: "{{ splunk.exec }} edit cluster-config -mode searchhead -master_uri {{ multisite_master_uri }} -auth {{ splunk.admin_user }}:{{ splunk.password }} -secret {{ splunk.idxc.pass4SymmKey }}" become: yes become_user: "{{ splunk.user }}" register: set_new_master @@ -28,7 +28,7 @@ - include_tasks: ../../../roles/splunk_common/tasks/wait_for_splunk_process.yml - name: Setup SHC with Associated Site - command: "{{ splunk.exec }} edit cluster-master -old_master_uri {{ multisite_master_uri }} -site {{ splunk.site }} -auth {{ splunk.admin_user }}:{{ splunk.password }} -secret {{ splunk.shc.pass4SymmKey }} -multisite True" + command: "{{ splunk.exec }} edit cluster-master -old_master_uri {{ multisite_master_uri }} -site {{ splunk.site }} -auth {{ splunk.admin_user }}:{{ splunk.password }} -secret {{ splunk.idxc.pass4SymmKey }} -multisite True" become: yes become_user: "{{ splunk.user }}" register: set_associated_site