saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #37404 from saltstack/revert-37401-bootstrap_delay

Browse source 
Revert "Bootstrap delay option for salt-cloud"
This commit is contained in:
Mike Place 2016-11-02 22:48:52 +13:00 • committed by GitHub
commit ecd794a233
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/cloud/cli.py
View file

@ -16,7 +16,6 @@ from __future__ import print_function
from __future__ import absolute_import
import os
import sys
import time
import logging
from salt.ext.six.moves import input
@ -364,10 +363,6 @@ class SaltCloud(parsers.SaltCloudParser):
self.handle_exception(msg, exc)
elif self.options.bootstrap:
if self.options.bootstrap_delay:
log.info('Sleeping for {0} seconds for bootstrap delay.'.format(self.options.bootstrap_delay))
time.sleep(self.options.bootstrap_delay)
log.info('Bootstrap delay finished. Onward!')
host = self.options.bootstrap
if len(self.args) > 0:
if '=' not in self.args[0]:

6
salt/utils/parsers.py
View file

@ -1404,12 +1404,6 @@ class ExecutionOptionsMixIn(six.with_metaclass(MixInMeta, object)):
action='store_true',
help='Update salt-bootstrap to the latest stable bootstrap release.'
)
group.add_option(
'--bootstrap-delay',
default=False,
action='store_true',
help='Delay before bootstrap is attempted.'
)
group.add_option(
'-y', '--assume-yes',
default=False,