salt-cloud -u downloads stable version from bootstrap.saltstack.com by default (#32837)

* salt-cloud -u downloads stable version

* utils.cloud.update_bootstrap: minor edits of docstring
This commit is contained in:
Justin Findlay 2016-04-25 13:53:54 -06:00 committed by Nicole Thomas
parent 9725804448
commit 9b5c14c37c
3 changed files with 6 additions and 10 deletions

View file

@ -89,7 +89,7 @@ Execution Options
.. option:: -u, --update-bootstrap
Update salt-bootstrap to the latest develop version on GitHub.
Update salt-bootstrap to the latest stable bootstrap release.
.. option:: -y, --assume-yes

View file

@ -2407,17 +2407,14 @@ def cache_nodes_ip(opts, base=None):
def update_bootstrap(config, url=None):
'''
Update the salt-bootstrap script
url can be either:
- The URL to fetch the bootstrap script from
- The absolute path to the bootstrap
- The content of the bootstrap script
url can be one of:
- The URL to fetch the bootstrap script from
- The absolute path to the bootstrap
- The content of the bootstrap script
'''
default_url = config.get('bootstrap_script_url',
'https://bootstrap.saltstack.com')

View file

@ -1173,8 +1173,7 @@ class ExecutionOptionsMixIn(object):
'-u', '--update-bootstrap',
default=False,
action='store_true',
help='Update salt-bootstrap to the latest develop version on '
'GitHub.'
help='Update salt-bootstrap to the latest stable bootstrap release.'
)
group.add_option(
'-y', '--assume-yes',