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 4

Update locations for bootstrap scripts, to new infrastructure layout

Browse source
This commit is contained in:
David Murphy 2024-12-17 11:24:27 -07:00 • committed by Daniel Wozniak
parent 29d83c1c24
commit d63a5ea374
7 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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://bootstrap.saltstack.com | sudo sh -s -- "$@" git develop
curl -L https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh | 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://bootstrap.saltstack.com | sudo sh -s git develop
#curl -L https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh | 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://bootstrap.saltstack.com | sudo sh -s -- "$@"
curl -L https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh | 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://bootstrap.saltstack.com | sudo sh
#curl -L https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh | 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://bootstrap.saltstack.com").read()' | sudo sh -s -- "$@"
python -c 'import urllib; print urllib.urlopen("https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh").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://bootstrap.saltstack.com").read()' | sudo sh
#python -c 'import urllib; print urllib.urlopen("https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh").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://bootstrap.saltstack.com | sudo sh -s -- "$@"
wget --no-check-certificate -O - https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh | 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://bootstrap.saltstack.com | sudo sh
#wget --no-check-certificate -O - https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh | 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://bootstrap.saltstack.com | sudo sh -s -- "$@"
wget -O - https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh | 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://bootstrap.saltstack.com | sudo sh
#wget -O - https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh | sudo sh

8
salt/runners/manage.py
View file

@ -623,7 +623,7 @@ def versions():
def bootstrap(
version="develop",
script="https://bootstrap.saltproject.io",
script="https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh",
hosts="",
script_args="",
roster="flat",
@ -639,7 +639,7 @@ def bootstrap(
version : develop
Git tag of version to install
script : https://bootstrap.saltproject.io/
script : https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh
URL containing the script to execute
hosts
@ -699,8 +699,8 @@ def bootstrap(
.. code-block:: bash
salt-run manage.bootstrap hosts='host1,host2'
salt-run manage.bootstrap hosts='host1,host2' version='v3004.2'
salt-run manage.bootstrap hosts='host1,host2' version='v3004.2' script='https://bootstrap.saltproject.io/develop'
salt-run manage.bootstrap hosts='host1,host2' version='v3006.2'
salt-run manage.bootstrap hosts='host1,host2' version='v3006.2' script='https://github.com/saltstack/salt-bootstrap/develop'
"""
client_opts = __opts__.copy()

5
salt/utils/cloud.py
View file

@ -2950,7 +2950,10 @@ def update_bootstrap(config, url=None):
- The absolute path to the bootstrap
- The content of the bootstrap script
"""
default_url = config.get("bootstrap_script_url", "https://bootstrap.saltstack.com")
default_url = config.get(
"bootstrap_script_url",
"https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh",
)
if not url:
url = default_url
if not url: