From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 22 Jun 2015 16:44:35 +0000 (-0500)
Subject: testnode: do not start rpcbind on precise
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=073adda020b7e98b8ec1b60031af35154b38f68f;p=ceph-cm-ansible.git

testnode: do not start rpcbind on precise

rpcbind does not provide a way to be managed with upstart on precise.
This creates a var we can use to toggle this task on and off per distro
as the other distros we support are ok with starting and enabling rpcbind.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml
index 48d4023..808a3d7 100644
--- a/roles/testnode/defaults/main.yml
+++ b/roles/testnode/defaults/main.yml
@@ -18,3 +18,7 @@ packages_to_upgrade: []
 # the user teuthology will use
 teuthology_user: "ubuntu"
 xfstests_user: "fsgqa"
+
+# some distros need to start rpcbind before
+# trying to use nfs while others don't.
+start_rpcbind: true
diff --git a/roles/testnode/handlers/main.yml b/roles/testnode/handlers/main.yml
index b33c1e3..d8e634d 100644
--- a/roles/testnode/handlers/main.yml
+++ b/roles/testnode/handlers/main.yml
@@ -14,6 +14,7 @@
     name: rpcbind
     state: started
     enabled: yes
+  when: start_rpcbind
 
 - name: restart nfs-server
   service:
diff --git a/roles/testnode/vars/ubuntu_12.04.yml b/roles/testnode/vars/ubuntu_12.04.yml
index 34e8e21..cbe46e3 100644
--- a/roles/testnode/vars/ubuntu_12.04.yml
+++ b/roles/testnode/vars/ubuntu_12.04.yml
@@ -9,3 +9,7 @@ packages:
   - ltp-kernel-test
   - libmpich2-3
   - kvm
+
+# on precise rpcbind does not provide a way to
+# be managed with upstart
+start_rpcbind: false