Use api_host, api_port consistently + doc updates. Removal of 1.x testing, centos6 and debian 7

handlers/elasticsearch-templates.yml

@@ -3,41 +3,8 @@
 - name: Ensure elasticsearch is started
   service: name={{instance_init_script | basename}} state=started enabled=yes
 
-- set_fact:
-    es_config_host: "{{ item }}"
-  with_items: "{{ es_config['network.host'] }}"
-  when: 
-    - es_config['network.host'] is defined and es_config['network.host'] is not string
-    - not item | match('^_.*_$')
-    - es_config_host is not defined
-  
-- set_fact:
-    es_config_host: "{{ es_config['network.host'] }}"
-  when: 
-    - es_config['network.host'] is defined and es_config['network.host'] is string
-    - not es_config['network.host'] | match('^_.*_$')
-
-- set_fact:
-    es_config_port: "{{ es_config['network.port'] }}"
-  when: 
-    - es_config['network.port'] is defined and es_config['network.port'] is number
-
-- set_fact:
-    es_config_port: "{{ es_config['network.port'].split('-').0 }}"
-  when: 
-    - es_config['network.port'] is defined and es_config['network.port'] is string
-    - es_config['network.port'] | match('^\d')
-
 - name: Wait for elasticsearch to startup
-  wait_for:
-    host: "{% if es_config_host is defined %}{{es_config_host}}{% else %}{{es_api_host}}{% endif %}"
-    port: "{% if es_config_port is defined %}{{es_config_port}}{% else %}{{es_api_port}}{% endif %}" 
-    delay: 10
-
-- name: Gather template files contents
-  shell: "cat /etc/elasticsearch/templates/{{ item }}"
-  with_items: "{{ es_template_files }}"
-  register: es_template_files_contents
+  wait_for: host={{es_api_host}} port={{es_api_port}} delay=10
 
 - name: Get template files
   find: paths="/etc/elasticsearch/templates" patterns="*.json"
@@ -45,17 +12,17 @@
 
 - name: Install templates without auth
   uri:
-    url: "http://{% if es_config_host is defined %}{{es_config_host}}{% else %}{{es_api_host}}{% endif %}:{% if es_config_port is defined %}{{es_config_port}}{% else %}{{es_api_port}}{% endif %}/_template/{{item.path | filename}}"
+    url: "http://{{es_api_host}}:{{es_api_port}}/_template/{{item.path | filename}}"
     method: PUT
     status_code: 200
     body_format: json
     body: "{{ item.stdout }}"
   when: not es_enable_xpack or not es_xpack_features is defined or not '"shield" in es_xpack_features'
-  with_items: "{{ es_template_files_contents.results }}"
+  with_items: "{{ templates.files }}"
 
 - name: Install templates with auth
   uri:
-    url: "http://{% if es_config_host is defined %}{{es_config_host}}{% else %}{{es_api_host}}{% endif %}:{% if es_config_port is defined %}{{es_config_port}}{% else %}{{es_api_port}}{% endif %}/_template/{{item.path | filename}}"
+    url: "http://{{es_api_host}}:{{es_api_port}}/_template/{{item.path | filename}}"
     method: PUT
     status_code: 200
     user: "{{es_api_basic_auth_username}}"
@@ -64,4 +31,4 @@
     body_format: json
     body: "{{ item.stdout }}"
   when: es_enable_xpack and es_xpack_features is defined and '"shield" in es_xpack_features'
-  with_items: "{{ es_template_files_contents.results }}"
+  with_items: "{{ templates.files }}"

handlers/shield/elasticsearch-shield-native.yml

@@ -4,7 +4,7 @@
   service: name={{instance_init_script | basename}} state=started enabled=yes
 
 - name: Wait for elasticsearch to startup
-  wait_for: host={% if es_config['network.host'] is defined %}{{es_config['network.host']}}{% else %}{{es_api_host}}{% endif %} port={% if es_config['http.port'] is defined %}{{es_config['http.port']}}{% else %}{{es_api_port}}{% endif %} delay=10
+  wait_for: host={{es_api_host}} port={{es_api_port}} delay=10
 
 - set_fact: manage_native_users=false
 
@@ -25,7 +25,7 @@
 #List current users
 - name: List Native Users
   uri:
-    url: http://{% if es_config['network.host'] is defined %}{{es_config['network.host']}}{% else %}{{es_api_host}}{% endif %}:{% if es_config['http.port'] is defined %}{{es_config['http.port']}}{% else %}{{es_api_port}}{% endif %}/_shield/user
+    url: http://{{es_api_host}}:{{es_api_port}}/_shield/user
     method: GET
     user: "{{es_api_basic_auth_username}}"
     password: "{{es_api_basic_auth_password}}"
@@ -46,7 +46,7 @@
 #Delete all non required users
 - name: Delete Native Users
   uri:
-    url: http://{% if es_config['network.host'] is defined %}{{es_config['network.host']}}{% else %}{{es_api_host}}{% endif %}:{% if es_config['http.port'] is defined %}{{es_config['http.port']}}{% else %}{{es_api_port}}{% endif %}/_shield/user/{{item}}
+    url: http://{{es_api_host}}:{{es_api_port}}/_shield/user/{{item}}
     method: DELETE
     status_code: 200
     user: "{{es_api_basic_auth_username}}"
@@ -59,7 +59,7 @@
 #Overwrite all other users
 - name: Update Native Users
   uri:
-    url: http://{% if es_config['network.host'] is defined %}{{es_config['network.host']}}{% else %}{{es_api_host}}{% endif %}:{% if es_config['http.port'] is defined %}{{es_config['http.port']}}{% else %}{{es_api_port}}{% endif %}/_shield/user/{{item.key}}
+    url: http://{{es_api_host}}:{{es_api_port}}/_shield/user/{{item.key}}
     method: POST
     body_format: json
     body: "{{item.value | to_json}}"
@@ -74,7 +74,7 @@
 
 - name: List Native Roles
   uri:
-    url: http://{% if es_config['network.host'] is defined %}{{es_config['network.host']}}{% else %}{{es_api_host}}{% endif %}:{% if es_config['http.port'] is defined %}{{es_config['http.port']}}{% else %}{{es_api_port}}{% endif %}/_shield/role
+    url: http://{{es_api_host}}:{{es_api_port}}/_shield/role
     method: GET
     body_format: json
     user: "{{es_api_basic_auth_username}}"
@@ -98,7 +98,7 @@
 #Delete all non required roles
 - name: Delete Native Roles
   uri:
-    url: http://{% if es_config['network.host'] is defined %}{{es_config['network.host']}}{% else %}{{es_api_host}}{% endif %}:{% if es_config['http.port'] is defined %}{{es_config['http.port']}}{% else %}{{es_api_port}}{% endif %}/_shield/role/{{item}}
+    url: http://{{es_api_host}}:{{es_api_port}}/_shield/role/{{item}}
     method: DELETE
     status_code: 200
     user: "{{es_api_basic_auth_username}}"
@@ -111,7 +111,7 @@
 #Update other roles
 - name: Update Native Roles
   uri:
-    url: http://{% if es_config['network.host'] is defined %}{{es_config['network.host']}}{% else %}{{es_api_host}}{% endif %}:{% if es_config['http.port'] is defined %}{{es_config['http.port']}}{% else %}{{es_api_port}}{% endif %}/_shield/role/{{item.key}}
+    url: http://{{es_api_host}}:{{es_api_port}}/_shield/role/{{item.key}}
     method: POST
     body_format: json
     body: "{{item.value | to_json}}"