Restored dash from group names
diff --git a/templates/apigee-validate.conf.j2 b/templates/apigee-validate.conf.j2 index 7f40b99..74fb36d 100644 --- a/templates/apigee-validate.conf.j2 +++ b/templates/apigee-validate.conf.j2
@@ -1,40 +1,40 @@ -{% if groups['dc1'] is defined and inventory_hostname in groups['dc1'] %} -MSIP={{ hostvars[groups['dc1-ms'][0]][interface_name].ipv4.address }} -{% elif groups['dc2'] is defined and inventory_hostname in groups['dc2'] %} -MSIP={{ hostvars[groups['dc2-ms'][0]][interface_name].ipv4.address }} +{% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %} +MSIP={{ hostvars[groups['dc-1-ms'][0]][interface_name].ipv4.address }} +{% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %} +MSIP={{ hostvars[groups['dc-2-ms'][0]][interface_name].ipv4.address }} {% else %} {# Default to the MS in region 1 #} -MSIP={{ hostvars[groups['dc1-ms'][0]][interface_name].ipv4.address }} +MSIP={{ hostvars[groups['dc-1-ms'][0]][interface_name].ipv4.address }} {% endif %} ADMIN_EMAIL={{ opdk_user_email }} APIGEE_PORT_HTTP_MS={{ ms_ext_mgmt_port }} APIGEE_ADMINPW={{ opdk_user_pass }} -{% if groups['dc1'] is defined and inventory_hostname in groups['dc1'] %} -REGION=dc1 -{% elif groups['dc2'] is defined and inventory_hostname in groups['dc2'] %} -REGION=dc2 +{% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %} +REGION=dc-1 +{% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %} +REGION=dc-2 {% elif groups['dc-3'] is defined and inventory_hostname in groups['dc-3'] %} REGION=dc-3 {% else %} REGION=Please update the region {% endif %} MP_POD={{ mp_pod }} -{% if groups['dc1'] is defined and inventory_hostname in groups['dc1'] %} -MP_IP='{{ hostvars[groups['dc1-rmp'][0]][interface_name].ipv4.address }}' -{% elif groups['dc2'] is defined and inventory_hostname in groups['dc2'] %} -MP_IP='{{ hostvars[groups['dc2-rmp'][0]][interface_name].ipv4.address }}' +{% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %} +MP_IP='{{ hostvars[groups['dc-1-rmp'][0]][interface_name].ipv4.address }}' +{% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %} +MP_IP='{{ hostvars[groups['dc-2-rmp'][0]][interface_name].ipv4.address }}' {% elif groups['dc-3'] is defined and inventory_hostname in groups['dc-3'] %} MP_IP='{{ hostvars[groups['dc-3-rmp'][0]][interface_name].ipv4.address }}' {% else %} MP_IP=please update the mp ip address {% endif %} MP_PORT={{ mp_ext_mgmt_port }} -{% if groups['dc1'] is defined and inventory_hostname in groups['dc1'] %} -HOST_ALIAS='{{ groups['dc1-rmp'] | join(" ") }}' -{% elif groups['dc2'] is defined and inventory_hostname in groups['dc2'] %} -HOST_ALIAS='{{ groups['dc2-rmp'] | join(" ") }}' +{% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %} +HOST_ALIAS='{{ groups['dc-1-rmp'] | join(" ") }}' +{% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %} +HOST_ALIAS='{{ groups['dc-2-rmp'] | join(" ") }}' {% elif groups['dc-3'] is defined and inventory_hostname in groups['dc-3'] %} HOST_ALIAS="{{ groups['dc-3-rmp'] | join(' ') }}" {% else %} -HOST_ALIAS=Neither a dc1 or dc2 inventory group was defined +HOST_ALIAS=Neither a dc-1 or dc-2 inventory group was defined {% endif %}