Add vagrant_cluster var for handling eth0 in clusters

playbooks/roles/common/defaults/main.yml

@@ -108,6 +108,10 @@ disable_edx_services: False
 # so different start scripts are generated in dev mode.
 devstack: False
 
+# Some cluster apps need special settings when in vagrant
+# due to eth0 always being the same IP address
+vagrant_cluster: False
+
 common_debian_variants:
   - Ubuntu
   - Debian

playbooks/roles/elasticsearch/templates/edx/etc/elasticsearch/elasticsearch.yml.j2

@@ -43,3 +43,8 @@ script.disable_dynamic: true
 discovery.zen.ping.unicast.hosts: ['{{hosts|join("\',\'") }}']
 
 {% endif -%}
+
+{% if vagrant_cluster|bool %}
+network:
+  host: {{ ansible_ssh_host }}
+{% endif %}

playbooks/roles/mariadb/templates/etc/mysql/conf.d/galera.cnf.j2

@@ -11,4 +11,7 @@ query_cache_size=0
 wsrep_provider=/usr/lib/galera/libgalera_smm.so
 wsrep_cluster_address=gcomm://{{ hosts|join(',') }}?pc.wait_prim=no
 wsrep_sst_auth={{ MARIADB_CLUSTER_USER_ADMIN }}:{{ MARIADB_CLUSTER_PASSWORD_ADMIN }}
+
+{% if vagrant_cluster|bool %}
 wsrep_node_address={{ ansible_ssh_host }}
+{% endif %}

playbooks/vagrant-cluster.yml

@@ -3,6 +3,7 @@
   sudo: True
   gather_facts: True
   vars:
+    vagrant_cluster: yes
     mongo_cluster_members:
       - "cluster1"
       - "cluster2"