commit f220d97e5f18a4bc9d857db7c8bad375ca5c6899
author Dennis Dmitriev <ddmitriev@mirantis.com> Wed Oct 10 15:19:14 2018 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Fri Oct 12 07:36:07 2018 +0000
tree 807c392fd5cee81acabda03a3ab5c19061ef1eec
parent f4587ebd618bf3b59e25cd34388a1f3950f9624b

Add swarm-create-cfg-config-drive.groovy

- Move the groovy script from the job 'create-cfg-config-drive'
- Add possibility to extend user-data YAML with additional
  options
- Override the environment variables using the override file
  /etc/cloud/master_environment_override

Related-task:#PROD-23809

Change-Id: Id95ec4aa94db2012c2105e8379724a27d1b9a516

tcp_tests/managers/envmanager_devops.py

diff --git a/tcp_tests/managers/envmanager_devops.py b/tcp_tests/managers/envmanager_devops.py
index bd4024c..4cd6c93 100644
--- a/tcp_tests/managers/envmanager_devops.py
+++ b/tcp_tests/managers/envmanager_devops.py
@@ -309,7 +309,8 @@
         self.__env.start()
         LOG.info('Environment "{0}" started'.format(self.__env.name))
         check_cloudinit_started = '[ -f /is_cloud_init_started ]'
-        check_cloudinit_finished = '[ -f /is_cloud_init_finished ]'
+        check_cloudinit_finished = ('[ -f /is_cloud_init_finished ] || '
+                                    '[ -f /var/log/mcp/.bootstrap_done ]')
         check_cloudinit_failed = 'cat /is_cloud_init_failed'
         passed = {}
         for node in self.__env.get_nodes(role__in=underlay_node_roles):