Ansible: Final consul.d fixes

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I2b5f2d090ac752c85508030c4dfe206023f1184f

18 files changed, 47 insertions, 69 deletions

diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
index be55243199..3965a27c88 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
@@ -54,6 +54,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml
index 18e657f34e..0d44927fee 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml
@@ -53,6 +53,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml
index d4e81be8ba..77f459fa8a 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml
@@ -55,6 +55,6 @@ consul_node_role: "both"
 consul_retry_servers:
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml
index 4cc25c4680..0871ff40f2 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml
@@ -54,6 +54,6 @@ consul_node_role: "both"
 consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml
index af9d3e7855..550e719881 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml
@@ -54,6 +54,6 @@ consul_node_role: "both"
 consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml
index accaaa5de3..5ce4c0a2a8 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml
@@ -55,6 +55,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml
index 269c2be0c4..918b2f459f 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml
@@ -55,6 +55,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.39.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.39.yaml
index 3e5a524dbf..f5e1ad9636 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.39.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.39.yaml
@@ -57,6 +57,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
index fe8079bec8..8ce57502ca 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
@@ -57,6 +57,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
index b8ff3db983..65a8ae7796 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
@@ -58,6 +58,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
index 15395cc487..b3daacaaa1 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
@@ -58,6 +58,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index a9953f549b..5dcc572e3d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
@@ -62,6 +62,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index 6f2ca4aee8..66c5db6fb1 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
@@ -62,6 +62,6 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
-  - "10.30.51.16"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml
index 4c912e685f..cdd0212378 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml
@@ -60,10 +60,5 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.15"
-  - "10.30.51.16"
-consul_services:
-  - name: "storage1"
-    port: 9000
-  - name: "nginx1"
-    port: 443
\ No newline at end of file
+  - "10.32.8.15"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml
index 79650198d1..c35bf8775d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml
@@ -60,10 +60,5 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.16"
-consul_services:
-  - name: "storage2"
-    port: 9000
-  - name: "nginx2"
-    port: 443
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.16"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml
index 906fa82fbb..c62e8500ea 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml
@@ -56,5 +56,5 @@ consul_retry_servers:
   - "10.30.51.30"
   - "10.30.51.32"
   - "10.30.51.33"
-  - "10.30.51.14"
-  - "10.30.51.15"
\ No newline at end of file
+  - "10.32.8.14"
+  - "10.32.8.15"
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml
index 4825afab35..89121fde2e 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml
@@ -68,16 +68,12 @@ consul_certificates:
   - src: "{{ vault_consul_key_file }}"
     dest: "{{ consul_key_file }}"
 
-consul_address: "127.0.0.1:8500"
-consul_auth: ""
 consul_auto_advertise: true
-consul_checks_use_advertise: false
+consul_checks_use_advertise: true
 consul_server_service_name: "nomad"
 consul_client_service_name: "nomad-client"
 consul_server_auto_join: false
-consul_client_auto_join: false
-consul_ssl: true
-consul_verify_ssl: true
+consul_client_auto_join: true
 consul_ACL_token_set: false
 consul_token: "consul_token_default"
 
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2 b/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2
index 6bd235f28d..c78e5e1ce5 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2
+++ b/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2
@@ -1,18 +1,10 @@
 consul {
-    address = "{{ consul_address }}"
-    auth = "{{ consul_auth }}"
     auto_advertise = {{ consul_auto_advertise | bool | lower }}
-    ca_file = "{{ consul_ca_file }}"
-    cert_file = "{{ consul_cert_file }}"
     checks_use_advertise = {{ consul_checks_use_advertise | bool | lower }}
     client_auto_join = {{ consul_client_auto_join | bool | lower }}
     client_service_name = "{{ consul_client_service_name }}"
-    key_file = "{{ consul_key_file }}"
     server_service_name = "{{ consul_server_service_name }}"
     server_auto_join = {{ consul_server_auto_join | bool | lower }}
-    ssl = {{ consul_ssl | bool | lower }}
-    verify_ssl = {{ consul_verify_ssl | bool | lower }}
-
 {% if consul_ACL_token_set == True %}
     token = "{{ consul_token }}"
 {% endif %}