testnodes: Disable firewalld service after reboot on RPM-based distros

Fixes: http://tracker.ceph.com/issues/16455
Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/testnode/tasks/redhat/rhel_7.yml b/roles/testnode/tasks/redhat/rhel_7.yml
index dcbe327f29a930248ca27294dff809f1dedbc467..94ef558e0d6322df73573f09501575296dc88bcb 100644 (file)
--- a/roles/testnode/tasks/redhat/rhel_7.yml
+++ b/roles/testnode/tasks/redhat/rhel_7.yml
@@ -7,3 +7,4 @@
   service:
     name: firewalld
     state: stopped
+    enabled: no

diff --git a/roles/testnode/tasks/setup-centos.yml b/roles/testnode/tasks/setup-centos.yml
index 44699251643b282078305ee1760d2a5dd61d5458..a9c99657dfb2b761a76623f57f10b005babe13ea 100644 (file)
--- a/roles/testnode/tasks/setup-centos.yml
+++ b/roles/testnode/tasks/setup-centos.yml
@@ -7,12 +7,14 @@
   service:
     name: iptables
     state: stopped
+    enabled: no
   when: ansible_distribution_major_version == "6"
 
 - name: Stop firewalld
   service:
     name: firewalld
     state: stopped
+    enabled: no
   when: ansible_distribution_major_version == "7"
 
 - include: imitate_ubuntu.yml

diff --git a/roles/testnode/tasks/setup-fedora.yml b/roles/testnode/tasks/setup-fedora.yml
index 4065587cb67de76a1ae87d15c4bf374fa00409ac..5663ca20625e201afd2da48d4ac22f690ac60efd 100644 (file)
--- a/roles/testnode/tasks/setup-fedora.yml
+++ b/roles/testnode/tasks/setup-fedora.yml
@@ -13,3 +13,4 @@
   service:
     name: firewalld
     state: stopped
+    enabled: no