Merge 'CSPL_2353' into github.com:splunk/splunk-ansible

roles/splunk_cluster_master/tasks/setup_multisite.yml

@@ -5,7 +5,7 @@
 
 - name: Convert Extrenal Cluster Master Name into Internal URI
   set_fact:
-      multisite_master_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}"
+      multisite_manager_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}"
 
 - name: Set the multisite master
   command: "{{ splunk.exec }} edit cluster-config -mode master -multisite true -available_sites {{ splunk.all_sites }} -site {{ splunk.site }} -site_replication_factor origin:{{ splunk.multisite_replication_factor_origin }},total:{{ splunk.multisite_replication_factor_total }} -site_search_factor origin:{{ splunk.multisite_search_factor_origin }},total:{{ splunk.multisite_search_factor_total }} -auth {{ splunk.admin_user }}:{{ splunk.password }} -secret {{ splunk.idxc.pass4SymmKey }}"

roles/splunk_common/tasks/add_splunk_license.yml

@@ -19,8 +19,8 @@
     - licenses and licenses | length > 0
     - "not ('license_master_url' in splunk and splunk.license_master_url) or splunk.role == 'splunk_license_master'"
 
-- name: Set as license slave
-  include_tasks: set_as_license_slave.yml
+- name: Set as license peer
+  include_tasks: set_as_license_peer.yml
   when:
     - "'license_master_url' in splunk and splunk.license_master_url"
     - splunk.role != "splunk_license_master"

roles/splunk_common/tasks/set_as_license_slave.yml → roles/splunk_common/tasks/set_as_license_peer.yml

@@ -10,10 +10,10 @@
   command: "{{ splunk.exec }} edit licenser-localslave -manager_uri {{ splunk.license_master_url }} -auth '{{ splunk.admin_user }}:{{ splunk.password }}'"
   become: yes
   become_user: "{{ splunk.user }}"
-  register: linux_set_lic_slave
-  until: linux_set_lic_slave.rc == 0
-  changed_when: linux_set_lic_slave.rc == 0 and "licenser-localslave object has been edited" in linux_set_lic_slave.stdout
-  failed_when: linux_set_lic_slave.rc !=0 and "does not support being a remote master" in linux_set_lic_slave.stderr
+  register: linux_set_lic_peer
+  until: linux_set_lic_peer.rc == 0
+  changed_when: linux_set_lic_peer.rc == 0 and "licenser-localpeer object has been edited" in linux_set_lic_peer.stdout
+  failed_when: linux_set_lic_peer.rc !=0 and "does not support being a remote master" in linux_set_lic_peer.stderr
   retries: "{{ retry_num }}"
   delay: "{{ retry_delay }}"
   notify:

roles/splunk_indexer/tasks/setup_multisite.yml

@@ -5,10 +5,10 @@
 
 - name: Convert Extrenal Cluster Master Name into Internal URI
   set_fact:
-      multisite_master_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}"
+      multisite_manager_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}"
 
 - name: Setup Peers with Associated Site
-  command: "{{ splunk.exec }} edit cluster-config -mode slave -site {{ splunk.site }} -master_uri {{ multisite_master_uri }} -replication_port {{ splunk.idxc.replication_port }} -auth {{ splunk.admin_user }}:{{ splunk.password }} -secret {{ splunk.idxc.pass4SymmKey }}"
+  command: "{{ splunk.exec }} edit cluster-config -mode peer -site {{ splunk.site }} -manager_uri {{ multisite_manager_uri }} -replication_port {{ splunk.idxc.replication_port }} -auth {{ splunk.admin_user }}:{{ splunk.password }} -secret {{ splunk.idxc.pass4SymmKey }}"
   become: yes
   become_user: "{{ splunk.user }}"
   register: task_result

roles/splunk_monitor/tasks/setup_multisite.yml

@@ -5,10 +5,10 @@
 
 - name: Convert Extrenal Cluster Master Name into Internal URI
   set_fact:
-      multisite_master_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}"
+      multisite_manager_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}"
 
 - name: Setup SH - Multisite
-  command: "{{ splunk.exec }} edit cluster-config -mode searchhead -master_uri {{ multisite_master_uri }} -auth {{ splunk.admin_user }}:{{ splunk.password }} -secret {{ splunk.idxc.pass4SymmKey }}"
+  command: "{{ splunk.exec }} edit cluster-config -mode searchhead -manager_uri {{ multisite_manager_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 SH 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.idxc.pass4SymmKey }} -multisite True"
+  command: "{{ splunk.exec }} edit cluster-master -old_manager_uri {{ multisite_manager_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

roles/splunk_search_head/tasks/setup_multisite.yml

@@ -5,10 +5,10 @@
 
 - name: Convert Extrenal Cluster Master Name into Internal URI
   set_fact:
-      multisite_master_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}"
+      multisite_manager_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.idxc.pass4SymmKey }}"
+  command: "{{ splunk.exec }} edit cluster-config -mode searchhead -manager_uri {{ multisite_manager_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.idxc.pass4SymmKey }} -multisite True"
+  command: "{{ splunk.exec }} edit cluster-master -old_manager_uri {{ multisite_manager_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

roles/splunk_search_head_captain/tasks/setup_multisite.yml

@@ -5,10 +5,10 @@
 
 - name: Convert External Cluster Master Name into Internal URI
   set_fact:
-      multisite_master_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}"
+      multisite_manager_uri: "{{ cert_prefix }}://{{ splunk.multisite_master }}:{{ splunk.svc_port }}"
 
 - name: Setup SHC - Captain
-  command: "{{ splunk.exec }} edit cluster-config -mode searchhead -master_uri {{ multisite_master_uri }} -auth {{ splunk.admin_user }}:{{ splunk.password }} -secret {{ splunk.idxc.pass4SymmKey }}"
+  command: "{{ splunk.exec }} edit cluster-config -mode searchhead -manager_uri {{ multisite_manager_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 - Captain
-  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"
+  command: "{{ splunk.exec }} edit cluster-master -old_manager_uri {{ multisite_manager_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