updated baas_cass_dc_list and variables used
diff --git a/templates/baas-silent-install.conf.j2 b/templates/baas-silent-install.conf.j2 index 0376c80..3848213 100644 --- a/templates/baas-silent-install.conf.j2 +++ b/templates/baas-silent-install.conf.j2
@@ -23,7 +23,7 @@ # Default is dc-1. {% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %} BAAS_CASS_LOCALDC=dc-1 -BAAS_CASS_DC_LIST="dc-1" +BAAS_CASS_DC_LIST=dc-1 REGION=dc-1 BAAS_CASS_REPLICATION=dc-1:{{ groups['dc-1-cassandra'] | length }} {% if opdk_version == '4.17.01' %} @@ -31,9 +31,9 @@ {% endif %} {% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %} BAAS_CASS_LOCALDC=dc-2 -BAAS_CASS_DC_LIST="dc-2" +BAAS_CASS_DC_LIST=dc-1,dc-2 REGION=dc-2 -BAAS_CASS_REPLICATION=dc-2:{{ groups['dc-2-cassandra'] | length }} +BAAS_CASS_REPLICATION=dc-1:{{ groups['dc-1-cassandra'] | length }},dc-2:{{ groups['dc-2-cassandra'] | length }} {% if opdk_version == '4.17.01' %} BAAS_CLUSTER_SEEDS="{% for host in groups['dc-1-baas'] %}dc-1:{{ hostvars[host][interface_name].ipv4.address }},{% endfor %}{% for host in groups['dc-2-baas'] %}dc-2:{{ hostvars[host][interface_name].ipv4.address }}{% if not loop.last %},{% endif %}{% endfor %}" {% endif %} @@ -41,11 +41,11 @@ # ElasticSearch IPs or DNS names, separated by spaces. {% if groups['dc-1-elastic'] is defined and inventory_hostname in groups['dc-1'] %} -ES_HOSTS="{% for host in groups['dc-1-elastic'] %}{{ hostvars[host][interface_name].ipv4.address }}{% if not loop.last %} {% endif %}{% endfor %}" +ES_HOSTS="{% for host in groups['dc-1-elastic'] %}{{ hostvars[host]['local_address'] }}{% if not loop.last %} {% endif %}{% endfor %}" {% elif groups['dc-2-elastic'] is defined and inventory_hostname in groups['dc-2'] %} -ES_HOSTS="{% for host in groups['dc-2-elastic'] %}{{ hostvars[host][interface_name].ipv4.address }}{% if not loop.last %} {% endif %}{% endfor %}" +ES_HOSTS="{% for host in groups['dc-2-elastic'] %}{{ hostvars[host]['local_address'] }}{% if not loop.last %} {% endif %}{% endfor %}" {% else %} -ES_HOSTS="{% for host in groups['elastic'] %}{{ hostvars[host][interface_name].ipv4.address }}{% if not loop.last %} {% endif %}{% endfor %}" +ES_HOSTS="{% for host in groups['elastic'] %}{{ hostvars[host]['local_address'] }}{% if not loop.last %} {% endif %}{% endfor %}" {% endif %} # API BaaS Stack information. @@ -62,11 +62,11 @@ # API BaaS Portal information. # URL and port number of load balancer, if there is one in front of the Portal, # or the URL and port of the Portal node. {% if groups['dc-1-portal'] is defined and inventory_hostname in groups['dc-1'] %} -BAAS_PORTAL_URL="http://{{ hostvars[groups['dc-1-portal'][0]]['local_address'] }}:{{baas_portal_port }}" +BAAS_PORTAL_URL="http://{{ hostvars[groups['dc-1-portal'][0]]['public_address'] }}:{{baas_portal_port }}" {% elif groups['dc-2-portal'] is defined and inventory_hostname in groups['dc-2'] %} -BAAS_PORTAL_URL="http://{{ hostvars[groups['dc-2-portal'][0]]['local_address'] }}:{{ baas_portal_port }}" +BAAS_PORTAL_URL="http://{{ hostvars[groups['dc-2-portal'][0]]['public_address'] }}:{{ baas_portal_port }}" {% else %} -BAAS_PORTAL_URL="http://{{ hostvars[groups['portal'][0]]['local_address'] }}:{{ baas_portal_port }}" +BAAS_PORTAL_URL="http://{{ hostvars[groups['portal'][0]]['public_address'] }}:{{ baas_portal_port }}" {% endif %} # Portal port. Default value is 9000.