Semantic update of local address to private address and optimizations for slow connections.
diff --git a/templates/silent-install.conf.j2 b/templates/silent-install.conf.j2 index 0e02ca6..73fe40d 100644 --- a/templates/silent-install.conf.j2 +++ b/templates/silent-install.conf.j2
@@ -9,11 +9,11 @@ {% if opdk_ldap_type == '2' %} {% if groups['dc-1-ldap'] is defined and groups['dc-2-ldap'] is defined and inventory_hostname in groups['dc-1'] %} LDAP_SID=1 -LDAP_PEER={{ hostvars[groups['dc-2-ldap'][0]]['local_address'] }} +LDAP_PEER={{ hostvars[groups['dc-2-ldap'][0]]['private_address'] }} {% endif %} {% if groups['dc-1-ldap'] is defined and groups['dc-2-ldap'] is defined and inventory_hostname in groups['dc-2'] %} LDAP_SID=2 -LDAP_PEER={{ hostvars[groups['dc-1-ldap'][0]]['local_address'] }} +LDAP_PEER={{ hostvars[groups['dc-1-ldap'][0]]['private_address'] }} {% endif %} {% endif %} APIGEE_LDAPPW={{ opdk_ldap_pass }} @@ -32,15 +32,15 @@ USE_ZK_CLUSTER={{ opdk_use_zk_cluster }} {# TODO: Build a module to construct the ZK_HOSTS value#} -ZK_HOSTS="{% for host in groups['ds'] %}{{ hostvars[host]['local_address'] }}{% if hostvars[host]['zk_observer'] is defined and hostvars[host]['zk_observer'] == 'true' %}:observer{% endif %}{% if not loop.last %} {% endif %}{% endfor %}" +ZK_HOSTS="{% for host in groups['ds'] %}{{ hostvars[host]['private_address'] }}{% if hostvars[host]['zk_observer'] is defined and hostvars[host]['zk_observer'] == 'true' %}:observer{% endif %}{% if not loop.last %} {% endif %}{% endfor %}" {# TODO: Build a module to construct the ZK_CLIENT_HOSTS value#} {% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %} -ZK_CLIENT_HOSTS="{% for host in groups['dc-1-ds'] %}{{ hostvars[host]['local_address'] }}{% if not loop.last %} {% endif %}{% endfor %}" +ZK_CLIENT_HOSTS="{% for host in groups['dc-1-ds'] %}{{ hostvars[host]['private_address'] }}{% if not loop.last %} {% endif %}{% endfor %}" {% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2']%} -ZK_CLIENT_HOSTS="{% for host in groups['dc-2-ds'] %}{{ hostvars[host]['local_address'] }}{% if not loop.last %} {% endif %}{% endfor %}" +ZK_CLIENT_HOSTS="{% for host in groups['dc-2-ds'] %}{{ hostvars[host]['private_address'] }}{% if not loop.last %} {% endif %}{% endfor %}" {% else %} -ZK_CLIENT_HOSTS="{% for host in groups['ds'] %}{{ hostvars[host]['local_address'] }}{% if not loop.last %} {% endif %}{% endfor %}" +ZK_CLIENT_HOSTS="{% for host in groups['ds'] %}{{ hostvars[host]['private_address'] }}{% if not loop.last %} {% endif %}{% endfor %}" {% endif %} USE_CASS_CLUSTER={{ opdk_use_cass_cluster }}