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

Re-format usage output to fix 80 characters width terminal

Browse source
This commit is contained in:
Denys Havrysh 2016-06-06 11:24:22 +03:00
parent 0a69f1f407
commit 260e5ec5ed
1 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
bootstrap-salt.sh
View file

@ -265,27 +265,27 @@ __usage() {
- ${__ScriptName} - ${__ScriptName}
- ${__ScriptName} stable - ${__ScriptName} stable
- ${__ScriptName} stable 2015.8 - ${__ScriptName} stable 2015.8
- ${__ScriptName} stable 2015.8.9 - ${__ScriptName} stable 2015.8.10
- ${__ScriptName} daily - ${__ScriptName} daily
- ${__ScriptName} testing - ${__ScriptName} testing
- ${__ScriptName} git - ${__ScriptName} git
- ${__ScriptName} git 2015.8 - ${__ScriptName} git 2015.8
- ${__ScriptName} git v2015.8.9 - ${__ScriptName} git v2015.8.10
- ${__ScriptName} git 8c3fadf15ec183e5ce8c63739850d543617e4357 - ${__ScriptName} git 8c3fadf15ec183e5ce8c63739850d543617e4357
Options: Options:
-h Display this message -h Display this message
-v Display script version -v Display script version
-n No colours. -n No colours
-D Show debug output. -D Show debug output
-c Temporary configuration directory -c Temporary configuration directory
-g Salt repository URL. Default: ${_SALTSTACK_REPO_URL} -g Salt repository URL. Default: ${_SALTSTACK_REPO_URL}
-G Instead of cloning from ${_SALTSTACK_REPO_URL}, clone from -G Instead of cloning from ${_SALTSTACK_REPO_URL}, clone from
https://${_SALTSTACK_REPO_URL#*://} https://${_SALTSTACK_REPO_URL#*://}
(Usually necessary on systems which have the regular git protocol port (usually necessary on systems which have the regular git protocol port
blocked, where https usually is not) blocked, where https usually is not)
-w Install packages from downstream package repository rather than -w Install packages from downstream package repository rather than
upstream, saltstack package repository. This is currently only upstream, saltstack package repository. This is currently only
implemented for SUSE. implemented for SUSE.
-k Temporary directory holding the minion keys which will pre-seed -k Temporary directory holding the minion keys which will pre-seed
the master. the master.
@ -295,6 +295,10 @@ __usage() {
-S Also install salt-syndic -S Also install salt-syndic
-N Do not install salt-minion -N Do not install salt-minion
-X Do not start daemons after installation -X Do not start daemons after installation
-d Disable check_service functions. Setting this flag disables the
'install_<distro>_check_services' checks. You can also do this by
touching /tmp/disable_salt_checks on the target host.
Default: \${BS_FALSE}
-C Only run the configuration function. This option automatically bypasses -C Only run the configuration function. This option automatically bypasses
any installation. Implies -F (forced overwrite). To overwrite master or any installation. Implies -F (forced overwrite). To overwrite master or
syndic configs, -M or -S, respectively, must also be specified. syndic configs, -M or -S, respectively, must also be specified.
@ -303,10 +307,10 @@ __usage() {
distribution. Using this flag allows the script to use pip as a last distribution. Using this flag allows the script to use pip as a last
resort method. NOTE: This only works for functions which actually resort method. NOTE: This only works for functions which actually
implement pip based installations. implement pip based installations.
-F Allow copied files to overwrite existing (config, init.d, etc). -F Allow copied files to overwrite existing (config, init.d, etc)
-U If set, fully upgrade the system prior to bootstrapping salt -U If set, fully upgrade the system prior to bootstrapping Salt
-K If set, keep the temporary files in the temporary directories specified -K If set, keep the temporary files in the temporary directories specified
with -c and -k. with -c and -k
-I If set, allow insecure connections while downloading any files. For -I If set, allow insecure connections while downloading any files. For
example, pass '--no-check-certificate' to 'wget' or '--insecure' to example, pass '--no-check-certificate' to 'wget' or '--insecure' to
'curl' 'curl'
@ -314,17 +318,14 @@ __usage() {
\${BS_SALT_ETC_DIR}/minion.d/99-master-address.conf \${BS_SALT_ETC_DIR}/minion.d/99-master-address.conf
-i Pass the salt-minion id. This will be stored under -i Pass the salt-minion id. This will be stored under
\${BS_SALT_ETC_DIR}/minion_id \${BS_SALT_ETC_DIR}/minion_id
-L Install the Apache Libcloud package if possible(required for salt-cloud) -L Install the Apache Libcloud package if possible
-p Extra-package to install while installing salt dependencies. One package (required for salt-cloud)
-p Extra-package to install while installing Salt dependencies. One package
per -p flag. You're responsible for providing the proper package name. per -p flag. You're responsible for providing the proper package name.
-d Disable check_service functions. Setting this flag disables the
'install_<distro>_check_services' checks. You can also do this by
touching /tmp/disable_salt_checks on the target host.
Default: \${BS_FALSE}
-H Use the specified HTTP proxy for all download URLs (including https://). -H Use the specified HTTP proxy for all download URLs (including https://).
For example: http://myproxy.example.com:3128 For example: http://myproxy.example.com:3128
-Z Enable additional package repository for newer ZeroMQ -Z Enable additional package repository for newer ZeroMQ
(Only available for RHEL/CentOS/Fedora/Ubuntu based distributions) (only available for RHEL/CentOS/Fedora/Ubuntu based distributions)
-b Assume that dependencies are already installed and software sources are -b Assume that dependencies are already installed and software sources are
set up. If git is selected, git tree is still checked out as dependency set up. If git is selected, git tree is still checked out as dependency
step. step.
@ -332,27 +333,29 @@ __usage() {
This may result in an "n/a" in the version number. This may result in an "n/a" in the version number.
-l Disable ssl checks. When passed, switches "https" calls to "http" where -l Disable ssl checks. When passed, switches "https" calls to "http" where
possible. possible.
-V Install salt into virtualenv(Only available for Ubuntu base distributions) -V Install Salt into virtualenv
-a Pip install all python pkg dependencies for salt. Requires -V to install (only available for Ubuntu based distributions)
all pip pkgs into the virtualenv(Only available for Ubuntu based -a Pip install all Python pkg dependencies for Salt. Requires -V to install
distributions) all pip pkgs into the virtualenv.
(Only available for Ubuntu based distributions)
-r Disable all repository configuration performed by this script. This -r Disable all repository configuration performed by this script. This
option assumes all necessary repository configuration is already present option assumes all necessary repository configuration is already present
on the system. on the system.
-R Specify a custom repository URL. Assumes the custom repository URL points -R Specify a custom repository URL. Assumes the custom repository URL
to a repository that mirrors Salt packages located at repo.saltstack.com. points to a repository that mirrors Salt packages located at
The option passed with -R replaces "repo.saltstack.com". If -R is passed, repo.saltstack.com. The option passed with -R replaces the
-r is also set. Currently only works on CentOS/RHEL based distributions. "repo.saltstack.com". If -R is passed, -r is also set. Currently only
-J Replace the Master config file with data passed in as a json string. If a works on CentOS/RHEL based distributions.
Master config file is found, a reasonable effort will be made to save the -J Replace the Master config file with data passed in as a json string. If
file with a ".bak" extension. If used in conjunction with -C or -F, no ".bak" a Master config file is found, a reasonable effort will be made to save
file will be created as either of those options will force a complete the file with a ".bak" extension. If used in conjunction with -C or -F,
overwrite of the file. no ".bak" file will be created as either of those options will force
-j Replace the Minion config file with data passed in as a json string. If a a complete overwrite of the file.
Minion config file is found, a reasonable effort will be made to save the -j Replace the Minion config file with data passed in as a json string. If
file with a ".bak" extension. If used in conjunction with -C or -F, no ".bak" a Minion config file is found, a reasonable effort will be made to save
file will be created as either of those options will force a complete the file with a ".bak" extension. If used in conjunction with -C or -F,
overwrite of the file. no ".bak" file will be created as either of those options will force
a complete overwrite of the file.
-q Quiet salt installation from git (setup.py install -q) -q Quiet salt installation from git (setup.py install -q)
EOT EOT