Merge "Add config option 'run_background_ping_in_pod'"

tobiko/rhosp/config.py

@@ -108,6 +108,14 @@ TRIPLEO_OPTIONS = [
                 help='Dictionary with the node groups corresponding to '
                      'different hostname prefixes',
                 default={'ctrl': 'controller', 'cmp': 'compute'}),
+
+    cfg.BoolOpt('run_background_ping_in_pod',
+                default=False,
+                help='Wheter background ping should be run directly from '
+                     'the undercloud node (default) or using POD on the OCP '
+                     'cluster. The latter is is useful e.g. for the '
+                     'data plane adoption jobs when background ping should '
+                     'be run from the POD even before adoption.'),
 ]
 
 

tobiko/tripleo/_topology.py

@@ -189,7 +189,11 @@ class TripleoTopology(rhosp.RhospTopology):
         return subgroups
 
     def check_or_start_background_vm_ping(self):
-        tripleo_nova.check_or_start_background_vm_ping()
+        if CONF.tobiko.tripleo.run_background_ping_in_pod:
+            tobiko.skip_test("Running background ping in the POD "
+                             "is not implemented yet")
+        else:
+            tripleo_nova.check_or_start_background_vm_ping()
 
 
 class TripleoTopologyNode(rhosp.RhospNode):