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

Make use of the bootstrap.saltstack.com URL(s)

Browse source
This commit is contained in:
Pedro Algarvio 2014-06-07 13:31:12 +01:00
parent e4591c4e27
commit 506cbe4726
10 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/conf.py
View file

@ -270,6 +270,7 @@ linkcheck_ignore = [r'http://127.0.0.1',
r'dash-feed://',
r'https://github.com/saltstack/salt/',
r'http://bootstrap.saltstack.org',
r'https://bootstrap.saltstack.com',
r'https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh',
r'media.readthedocs.org/dash/salt/latest/salt.xml',
r'https://portal.aws.amazon.com/gp/aws/securityCredentials',

2
doc/topics/tutorials/quickstart.rst
View file

@ -29,7 +29,7 @@ for any OS with a Bourne shell:
.. code-block:: bash
wget -O - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh
wget -O - https://bootstrap.saltstack.com | sudo sh
See the `salt-bootstrap`_ documentation for other one liners. When using `Vagrant`_
to test out salt, the `salty-vagrant`_ tool will provision the VM for you.

40
doc/topics/tutorials/salt_bootstrap.rst
View file

@ -61,7 +61,7 @@ Using ``curl`` to install latest git:
.. code:: console
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh -o install_salt.sh
curl -L https://bootstrap.saltstack.com -o install_salt.sh
sudo sh install_salt.sh git develop
@ -69,7 +69,7 @@ Using ``wget`` to install your distribution's stable packages:
.. code:: console
wget -O install_salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
wget -O install_salt.sh https://bootstrap.saltstack.com
sudo sh install_salt.sh
@ -77,14 +77,14 @@ Install a specific version from git using ``wget``:
.. code:: console
wget -O install_salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
wget -O install_salt.sh https://bootstrap.saltstack.com
sudo sh install_salt.sh -P git v0.16.4
If you already have python installed, ``python 2.6``, then it's as easy as:
.. code:: console
python -m urllib "https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh" > install_salt.sh
python -m urllib "https://bootstrap.saltstack.com" > install_salt.sh
sudo sh install_salt.sh git develop
@ -92,7 +92,7 @@ All python versions should support the following one liner:
.. code:: console
python -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' > install_salt.sh
python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > install_salt.sh
sudo sh install_salt.sh git develop
@ -101,7 +101,7 @@ have ``fetch`` available though:
.. code:: console
fetch -o install_salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
fetch -o install_salt.sh https://bootstrap.saltstack.com
sudo sh install_salt.sh
@ -109,21 +109,21 @@ If all you want is to install a ``salt-master`` using latest git:
.. code:: console
curl -o install_salt.sh.sh -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
sudo sh install_salt.sh.sh -M -N git develop
If you want to install a specific release version (based on the git tags):
.. code:: console
curl -o install_salt.sh.sh -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
sudo sh install_salt.sh.sh git v0.16.4
To install a specific branch from a git fork:
.. code:: console
curl -o install_salt.sh.sh -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
sudo sh install_salt.sh.sh -g https://github.com/myuser/salt.git git mybranch
@ -144,7 +144,7 @@ Installing the latest develop branch of Salt:
.. code:: console
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh -s -- git develop
curl -L https://bootstrap.saltstack.com | sudo sh -s -- git develop
Any of the example above which use two-lines can be made to run in a single-line
configuration with minor modifications.
@ -160,42 +160,42 @@ For example, using ``curl`` to install your distribution's stable packages:
.. code-block:: bash
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh
curl -L https://bootstrap.saltstack.com | sudo sh
Using ``wget`` to install your distribution's stable packages:
.. code-block:: bash
wget -O - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh
wget -O - https://bootstrap.saltstack.com | sudo sh
Installing the latest version available from git with ``curl``:
.. code-block:: bash
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh -s -- git develop
curl -L https://bootstrap.saltstack.com | sudo sh -s -- git develop
Install a specific version from git using ``wget``:
.. code-block:: bash
wget -O - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- -P git v0.16.4
wget -O - https://bootstrap.saltstack.com | sh -s -- -P git v0.16.4
If you already have python installed, ``python 2.6``, then it's as easy as:
.. code-block:: bash
python -m urllib "https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh" | sudo sh -s -- git develop
python -m urllib "https://bootstrap.saltstack.com" | sudo sh -s -- git develop
All python versions should support the following one liner:
.. code-block:: bash
python -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' | \
python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' | \
sudo sh -s -- git develop
@ -204,21 +204,21 @@ available. You **do** have ``fetch`` available though:
.. code-block:: bash
fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh
fetch -o - https://bootstrap.saltstack.com | sudo sh
If all you want is to install a ``salt-master`` using latest git:
.. code-block:: bash
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh -s -- -M -N git develop
curl -L https://bootstrap.saltstack.com | sudo sh -s -- -M -N git develop
If you want to install a specific release version (based on the git tags):
.. code-block:: bash
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh -s -- git v0.16.4
curl -L https://bootstrap.saltstack.com | sudo sh -s -- git v0.16.4
Downloading the develop branch (from here standard command line options may be
@ -226,7 +226,7 @@ passed):
.. code-block:: bash
wget https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh
wget https://bootstrap.saltstack.com/develop
Command Line Options
--------------------

4
salt/cloud/deploy/curl-bootstrap-git.sh
View file

@ -7,11 +7,11 @@
#
# It has been designed as an example, to be customized for your own needs.
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh -s -- "$@" git develop
curl -L https://bootstrap.saltstack.com | sudo sh -s -- "$@" git develop
# By default, Salt Cloud now places the minion's keys and configuration in
# /tmp/.saltcloud/ before executing the deploy script. After it has executed,
# these temporary files are removed. If you don't want salt-bootstrap to handle
# these files, comment out the above command, and uncomment the below command.
#curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh -s git develop
#curl -L https://bootstrap.saltstack.com | sudo sh -s git develop

4
salt/cloud/deploy/curl-bootstrap.sh
View file

@ -7,11 +7,11 @@
#
# It has been designed as an example, to be customized for your own needs.
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh -s -- "$@"
curl -L https://bootstrap.saltstack.com | sudo sh -s -- "$@"
# By default, Salt Cloud now places the minion's keys and configuration in
# /tmp/.saltcloud/ before executing the deploy script. After it has executed,
# these temporary files are removed. If you don't want salt-bootstrap to handle
# these files, comment out the above command, and uncomment the below command.
#curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh
#curl -L https://bootstrap.saltstack.com | sudo sh

4
salt/cloud/deploy/python-bootstrap.sh
View file

@ -7,11 +7,11 @@
#
# It has been designed as an example, to be customized for your own needs.
python -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' | sudo sh -s -- "$@"
python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' | sudo sh -s -- "$@"
# By default, Salt Cloud now places the minion's keys and configuration in
# /tmp/.saltcloud/ before executing the deploy script. After it has executed,
# these temporary files are removed. If you don't want salt-bootstrap to handle
# these files, comment out the above command, and uncomment the below command.
#python -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' | sudo sh
#python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' | sudo sh

4
salt/cloud/deploy/wget-bootstrap-nocert.sh
View file

@ -7,11 +7,11 @@
#
# It has been designed as an example, to be customized for your own needs.
wget --no-check-certificate -O - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh -s -- "$@"
wget --no-check-certificate -O - https://bootstrap.saltstack.com | sudo sh -s -- "$@"
# By default, Salt Cloud now places the minion's keys and configuration in
# /tmp/.saltcloud/ before executing the deploy script. After it has executed,
# these temporary files are removed. If you don't want salt-bootstrap to handle
# these files, comment out the above command, and uncomment the below command.
#wget --no-check-certificate -O - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh
#wget --no-check-certificate -O - https://bootstrap.saltstack.com | sudo sh

4
salt/cloud/deploy/wget-bootstrap.sh
View file

@ -7,11 +7,11 @@
#
# It has been designed as an example, to be customized for your own needs.
wget -O - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh -s -- "$@"
wget -O - https://bootstrap.saltstack.com | sudo sh -s -- "$@"
# By default, Salt Cloud now places the minion's keys and configuration in
# /tmp/.saltcloud/ before executing the deploy script. After it has executed,
# these temporary files are removed. If you don't want salt-bootstrap to handle
# these files, comment out the above command, and uncomment the below command.
#wget -O - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sudo sh
#wget -O - https://bootstrap.saltstack.com | sudo sh

6
salt/runners/manage.py
View file

@ -267,7 +267,7 @@ def bootstrap(version="develop",
Options:
version: git tag of version to install [default: develop]
script: Script to execute [default: https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh]
script: Script to execute [default: https://bootstrap.saltstack.com]
hosts: Comma separated hosts [example: hosts="host1.local,host2.local"]
CLI Example:
@ -276,11 +276,11 @@ def bootstrap(version="develop",
salt-run manage.bootstrap hosts="host1,host2"
salt-run manage.bootstrap hosts="host1,host2" version="v0.17"
salt-run manage.bootstrap hosts="host1,host2" version="v0.17" script="https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh"
salt-run manage.bootstrap hosts="host1,host2" version="v0.17" script="https://bootstrap.saltstack.com/develop"
'''
if script is None:
script = 'https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh'
script = 'https://bootstrap.saltstack.com'
for host in hosts.split(","):
# Could potentially lean on salt-ssh utils to make
# deployment easier on existing hosts (i.e. use sshpass,

2
salt/utils/cloud.py
View file

@ -1962,7 +1962,7 @@ def update_bootstrap(config):
'Updating the bootstrap-salt.sh script requires the '
'Python requests library to be installed'
)}
url = 'https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh'
url = 'https://bootstrap.saltstack.com'
req = requests.get(url)
if req.status_code != 200:
return {'error': (