Do not use fixture salt_deployed where it is not needed
Closes-Bug: #PROD-30630
Change-Id: Ib6126a4589f861a1ca8aa0f69691c3862daf81fe
diff --git a/tcp_tests/managers/saltmanager.py b/tcp_tests/managers/saltmanager.py
index 617323a..b2abdce 100644
--- a/tcp_tests/managers/saltmanager.py
+++ b/tcp_tests/managers/saltmanager.py
@@ -275,7 +275,7 @@
result = self.local(tgt=tgt, fun='cmd.run', args=cmd)
return result['return']
- @utils.retry(3, exception=libpepper.PepperException)
+ @utils.retry(10, exception=libpepper.PepperException)
def sync_time(self, tgt='*'):
LOG.info("NTP time sync on the salt minions '{0}'".format(tgt))
# Force authentication update on the next API access
@@ -297,6 +297,8 @@
' touch /tmp/maas-proxy.work;'
'fi;'
'sleep 3;'
+ # note: maas-rackd will return 'pool' after start
+ 'sed -i \'s/^pool /server /g\' /etc/ntp/maas.conf;'
'if [ -x /usr/sbin/ntpdate ]; then'
' ntpdate -s ntp.ubuntu.com;'
'else'
@@ -311,7 +313,7 @@
' systemctl start maas-regiond; fi;')
self.run_state(
tgt,
- 'cmd.run', cmd, timeout=3600) # noqa
+ 'cmd.run', cmd, timeout=360) # noqa
new_time_res = self.run_state(tgt, 'cmd.run', 'date')
for node_name, time in sorted(new_time_res[0]['return'][0].items()):
LOG.info("{0}: {1}".format(node_name, time))