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

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}}"