summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vagrant/ansible/cluster-vars.yml2
-rw-r--r--vagrant/ansible/roles/ctdb.setup/tasks/main.yml2
-rw-r--r--vagrant/ansible/roles/glusterfs.setup/tasks/main.yml2
-rw-r--r--vagrant/ansible/roles/local.test/tasks/main.yml4
4 files changed, 6 insertions, 4 deletions
diff --git a/vagrant/ansible/cluster-vars.yml b/vagrant/ansible/cluster-vars.yml
index 4a93358..92fb0a5 100644
--- a/vagrant/ansible/cluster-vars.yml
+++ b/vagrant/ansible/cluster-vars.yml
@@ -43,7 +43,7 @@ gluster_infra_fw_zone: public
gluster_infra_fw_services:
- glusterfs
-gluster_cluster_hosts:
+cluster_hosts:
#
# TODO: generate the list of nodes from vagrant/ansible
#
diff --git a/vagrant/ansible/roles/ctdb.setup/tasks/main.yml b/vagrant/ansible/roles/ctdb.setup/tasks/main.yml
index 6bcea4b..6e339d9 100644
--- a/vagrant/ansible/roles/ctdb.setup/tasks/main.yml
+++ b/vagrant/ansible/roles/ctdb.setup/tasks/main.yml
@@ -22,7 +22,7 @@
state: present
name: "{{ ctdb_glusterfs_volume }}"
bricks: '{{ ctdb_brick_location }}/ctdb'
- cluster: "{{ gluster_cluster_hosts }}"
+ cluster: "{{ cluster_hosts }}"
replicas: "{{ gluster_cluster_replica_count }}"
run_once: yes
diff --git a/vagrant/ansible/roles/glusterfs.setup/tasks/main.yml b/vagrant/ansible/roles/glusterfs.setup/tasks/main.yml
index 22d3a4d..09d75f4 100644
--- a/vagrant/ansible/roles/glusterfs.setup/tasks/main.yml
+++ b/vagrant/ansible/roles/glusterfs.setup/tasks/main.yml
@@ -3,3 +3,5 @@
- include_role:
name: gluster.cluster
+ vars:
+ gluster_cluster_hosts: "{{ cluster_hosts }}"
diff --git a/vagrant/ansible/roles/local.test/tasks/main.yml b/vagrant/ansible/roles/local.test/tasks/main.yml
index b6e585f..d9d6bd3 100644
--- a/vagrant/ansible/roles/local.test/tasks/main.yml
+++ b/vagrant/ansible/roles/local.test/tasks/main.yml
@@ -7,9 +7,9 @@
# # `ansible_network_os` into the inventory...
# command: "ping -c 1 {{ item }}"
# loop:
-# "{{ gluster_cluster_hosts }}"
+# "{{ cluster_hosts }}"
- name: Test ssh to nodes via node address
command: /bin/true
delegate_to: "{{ item }}"
- with_items: "{{ gluster_cluster_hosts }}"
+ with_items: "{{ cluster_hosts }}"