summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Prabhu <sprabhu@redhat.com>2020-04-07 16:21:47 +0100
committerMichael Adam <obnox@samba.org>2020-04-07 20:59:01 +0200
commit0438a163c0c962229dbb7dbb968475f2951db011 (patch)
tree365ac12d65a9fe7f58c32bf9371f7bdfae5f32e5
parentcaecd0de93a3480422d0660ae9d9ebb9570d39df (diff)
downloadsamba-integration-0438a163c0c962229dbb7dbb968475f2951db011.tar.gz
samba-integration-0438a163c0c962229dbb7dbb968475f2951db011.tar.xz
samba-integration-0438a163c0c962229dbb7dbb968475f2951db011.zip
Move test from node.test into node.prep
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
-rw-r--r--vagrant/ansible/roles/node.prep/tasks/main.yml20
-rw-r--r--vagrant/ansible/roles/node.test/tasks/main.yml24
-rw-r--r--vagrant/ansible/setup-cluster.yml1
3 files changed, 20 insertions, 25 deletions
diff --git a/vagrant/ansible/roles/node.prep/tasks/main.yml b/vagrant/ansible/roles/node.prep/tasks/main.yml
index 6867266..b962a0d 100644
--- a/vagrant/ansible/roles/node.prep/tasks/main.yml
+++ b/vagrant/ansible/roles/node.prep/tasks/main.yml
@@ -1,3 +1,23 @@
+- name: Check for node connectivity
+ block:
+ - name: read list of nodes from file cluster_nodes.yml
+ include_vars:
+ file: cluster-vars.yml
+
+ - name: get hostname
+ command: hostname
+ register: output
+
+ - name: print hostname
+ debug:
+ var: output.stdout
+
+ # this is the way gluster-ansible accesses the nodes
+ - name: Test ssh to nodes via node address
+ command: /bin/true
+ delegate_to: "{{ item }}"
+ with_items: "{{ gluster_cluster_hosts }}"
+
- name: Enable GlusterFS nightly rpms repository
command: yum-config-manager --add-repo http://artifacts.ci.centos.org/gluster/nightly/master.repo
diff --git a/vagrant/ansible/roles/node.test/tasks/main.yml b/vagrant/ansible/roles/node.test/tasks/main.yml
deleted file mode 100644
index 9002cdf..0000000
--- a/vagrant/ansible/roles/node.test/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- name: read list of nodes from file cluster_nodes.yml
- include_vars:
- file: cluster-vars.yml
-
-- name: get hostname
- command: hostname
- register: output
-
-- name: print hostname
- debug:
- var: output.stdout
-
-#- name: Test node reachability
-# # note: `net_ping` module does not work unless we put
-# # `ansible_network_os` into the inventory...
-# command: "ping -c 1 {{ item }}"
-# loop:
-# "{{ gluster_cluster_hosts }}"
-
-# this is the way gluster-ansible accesses the nodes
-- name: Test ssh to nodes via node address
- command: /bin/true
- delegate_to: "{{ item }}"
- with_items: "{{ gluster_cluster_hosts }}"
diff --git a/vagrant/ansible/setup-cluster.yml b/vagrant/ansible/setup-cluster.yml
index d243513..0b540e2 100644
--- a/vagrant/ansible/setup-cluster.yml
+++ b/vagrant/ansible/setup-cluster.yml
@@ -5,7 +5,6 @@
- cluster-vars.yml
roles:
- common.prep
- - node.test
- node.prep
- gluster.infra
- gluster.cluster