disable adding merkil to pod containers since it cannot work there (#…

…8182)
ManageIQ · Nov 21, 2018 · 64b678b · 64b678b
1 parent 3f5a005
commit 64b678b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cfme/fixtures/base.py b/cfme/fixtures/base.py
@@ -21,7 +21,7 @@ def ensure_websocket_role_disabled(appliance):
 @pytest.fixture(scope="session", autouse=True)
 def fix_merkyl_workaround(request, appliance):
     """Workaround around merkyl not opening an iptables port for communication"""
-    if isinstance(appliance, DummyAppliance) or appliance.is_dev:
+    if isinstance(appliance, DummyAppliance) or appliance.is_dev or appliance.is_pod:
         return
     ssh_client = appliance.ssh_client
     if ssh_client.run_command('test -s /etc/init.d/merkyl').failed: