commit 411dd100c549cd728d418df583e21fc5e0e95f15
author Dennis Dmitriev <ddmitriev@mirantis.com> Fri Sep 15 16:04:47 2017 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Thu Sep 21 06:33:59 2017 -0400
tree 3559f0e3a0d971f48afebe7ff4ce6a9dd0adbd6c
parent ad6c7c1800b3a3a1a12ed1b6908dcc30b1c916cb

Add 'cookied-mcp-ocata-dop-sl2' lab for DOP+SLv2

* add workflow template and fuel-devops config
* add new environment inventory file with mixed roles on nodes
* add MAKE_SNAPSHOT_STAGES (default=true) to skip snapshots
  during deploy and not cause timesync and keepalived issues

Change-Id: I29a504b783a017ef01d0b05535c3a03e7b1574c9
Reviewed-on: https://review.gerrithub.io/378776
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>

tcp_tests/managers/envmanager_devops.py

diff --git a/tcp_tests/managers/envmanager_devops.py b/tcp_tests/managers/envmanager_devops.py
index 958e7f1..c800cc2 100644
--- a/tcp_tests/managers/envmanager_devops.py
+++ b/tcp_tests/managers/envmanager_devops.py
@@ -167,7 +167,7 @@
             config_ssh.append(ssh_data)
         return config_ssh
 
-    def create_snapshot(self, name, description=None):
+    def create_snapshot(self, name, description=None, force=False):
         """Create named snapshot of current env.
 
         - Create a libvirt snapshots for all nodes in the environment
@@ -175,6 +175,11 @@
 
         :name: string
         """
+        if not settings.MAKE_SNAPSHOT_STAGES and not force:
+            msg = ("[ SKIP snapshot '{0}' because MAKE_SNAPSHOT_STAGES=false ]"
+                   " {1}".format(name, description or ''))
+            LOG.info("\n\n{0}\n{1}".format(msg, '*' * len(msg)))
+            return
         msg = "[ Create snapshot '{0}' ] {1}".format(name, description or '')
         LOG.info("\n\n{0}\n{1}".format(msg, '*' * len(msg)))
 
@@ -233,6 +238,11 @@
 
         :param name: string
         """
+        if not settings.MAKE_SNAPSHOT_STAGES:
+            LOG.info("SKIP reverting from snapshot '{0}' "
+                     "because MAKE_SNAPSHOT_STAGES=false".format(name))
+            return
+
         LOG.info("Reverting from snapshot named '{0}'".format(name))
         if self.__env is not None:
             self.__env.revert(name=name)

tcp_tests/managers/envmanager_empty.py

diff --git a/tcp_tests/managers/envmanager_empty.py b/tcp_tests/managers/envmanager_empty.py
index b9ab8e1..b543c87 100644
--- a/tcp_tests/managers/envmanager_empty.py
+++ b/tcp_tests/managers/envmanager_empty.py
@@ -54,7 +54,7 @@
         raise Exception("EnvironmentManagerEmpty doesn't have SSH details. "
                         "Please provide SSH details in config.underlay.ssh")
 
-    def create_snapshot(self, name, description=None):
+    def create_snapshot(self, name, **kwargs):
         """Store environmetn state into the config object
 
         - Store the state of the environment <name> to the 'config' object