Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
3fe5c2e Fix ci for python 2
0bc092f Fix node rebooting procedure
Change-Id: Ia88d9eea71d1979e853a198489ae0e5d8e5638fd
diff --git a/src/com/mirantis/mk/Debian.groovy b/src/com/mirantis/mk/Debian.groovy
index 47cd772..1b39d14 100644
--- a/src/com/mirantis/mk/Debian.groovy
+++ b/src/com/mirantis/mk/Debian.groovy
@@ -268,7 +268,7 @@
salt.runSaltProcessStep(env, target, 'system.reboot', [], null, true, 5)
common.retry(timeout, attempts) {
- if (salt.runSaltProcessStep(env, target, 'file.file_exists', ['/tmp/rebooting'], null, true, 5)['return'][0].values()[0].toBoolean()) {
+ if (salt.runSaltProcessStep(env, target, 'cmd.run', ['test -e /tmp/rebooting || echo NOFILE'], null, true, 5)['return'][0].values()[0] != "NOFILE") {
error("The system is still rebooting...")
}
}
@@ -354,4 +354,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/mirantis/mk/Openstack.groovy b/src/com/mirantis/mk/Openstack.groovy
index 98df398..0a55867 100644
--- a/src/com/mirantis/mk/Openstack.groovy
+++ b/src/com/mirantis/mk/Openstack.groovy
@@ -58,7 +58,8 @@
// downloading packages which are not support Python 2.7
'python-openstackclient==4.0.0',
'python-heatclient==1.18.0',
- 'docutils==0.16'
+ 'docutils==0.16',
+ 'pyrsistent<0.17.1',
]
if (version == 'kilo') {