single cluster fix

firewalld workaround

(cherry picked from commit 0372924807a5e5c880574c6cbf7f88733ac67d79)

diff --git a/teuthology/task/ceph_ansible.py b/teuthology/task/ceph_ansible.py
index 43e940e247a239555cb751486a42a3734d1da33e..fdda97c79dc0cedc2790826259805f2755a12407 100644 (file)
--- a/teuthology/task/ceph_ansible.py
+++ b/teuthology/task/ceph_ansible.py
@@ -130,8 +130,10 @@ class CephAnsible(Task):
     def remove_cluster_prefix(self):
 
         stripped_role = {}
-        self.each_cluster = self.ctx.cluster.only(lambda role: role.startswith(self.cluster_name))\
-            if self.cluster_name else self.ctx.cluster
+        if self.cluster_name:
+            self.each_cluster = self.ctx.cluster.only(lambda role: role.startswith(self.cluster_name))
+        else:
+            self.each_cluster = self.ctx.cluster
         log.info('current cluster {}'.format(self.each_cluster))
         for remote, roles in self.each_cluster.remotes.iteritems():
             stripped_role[remote] = []
@@ -140,6 +142,14 @@ class CephAnsible(Task):
         self.each_cluster.remotes = stripped_role
         log.info('updated cluster {}'.format(self.each_cluster))
 
+    def start_firewalld(self):
+
+        for remote, roles in self.each_cluster.remotes.iteritems():
+            cmd = 'sudo service firewalld start'
+            remote.run(
+                args=cmd, stdout=StringIO(),
+            )
+
     def execute_playbook(self):
         """
         Execute ansible-playbook
@@ -514,6 +524,7 @@ class CephAnsible(Task):
         ])
         self._copy_and_print_config()
         self._generate_client_config()
+        self.start_firewalld()
         str_args = ' '.join(args)
         ceph_installer.run(
             args=[