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

Merge pull request #1079 from Ch3LL/merge-stable_SsL

Browse source 
[stable] Merge develop into stable
This commit is contained in:
Nicole Thomas 2017-05-24 12:25:55 -06:00 • committed by GitHub
commit d226809b64
6 changed files with 725 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.github/stale.yml vendored Normal file
View file

@ -0,0 +1,32 @@
# Probot Stale configuration file
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 200
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
#exemptLabels:
# - pinned
# - security
# Label to use when marking an issue as stale
staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: |
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.
If this issue is closed prematurely, please leave a comment and we will gladly reopen the issue.
# Comment to post when removing the stale label. Set to `false` to disable
unmarkComment: |
Thank you for updating this issue. It is no longer marked as stale.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
# Limit to only `issues` or `pulls`
only: issues

9
AUTHORS.rst
View file

@ -13,17 +13,22 @@ Alec Koumjian akoumjian akoumjian@gmail.com
Alex Van't Hof alexvh
Alexander Krasnukhin themalkolm the.malkolm@gmail.com
Alexey dmitrievav
Andrew Dean ndrwdn ndrwdn@gmail.com
Andy Boff caelor github@plek.me.uk
Angelo Gründler plueschopath angelo.gruendler@w1r3.net
Ari Aosved devaos ari.aosved@gmail.com
Ashok Raja R ashokrajar ashokrajar@users.noreply.github.com
Beau Hargis beaucephus beau@customermobile.com
Boris Feld Lothiraldan
Brad Thurber bradthurber
Brandon Clifford brandon099 brandon.clifford@vivint.com
Bret Fisher BretFisher bret@fishbrains.com
Brian Kruger bkruger99 brian.kruger@elliemae.com
bruce-one bruce-one
Вячеслав Спиридонов sp1r
C. R. Oldham cro cr@saltstack.com
Cam camereonsparr
Megan Wilhite Ch3LL megan.wilhite@gmail.com
Chris Rebert cvrebert chris.rebert@hulu.com
Chris Buechler cbuechler cmb@pfsense.org
Christer Edwards cedwards
@ -31,11 +36,13 @@ Clark Perkins iclarkperkins clark.perkins@digitalreasonin
Dag Viggo Lokøen dagvl dag.viggo@lokoen.org
Dan Mick dmick dan.mick@inktank.com
Daniel Poelzleithner poelzi
Daniel Wallace gtmanfred danielwallace@gtmanfred.com
David J. Felix DavidJFelix
denmat denmat
Denys Havrysh vutny denys.gavrysh@gmail.com
deployboy deployboy
Diego Woitasen diegows diego@flugel.it
EHJ-52n EHJ-52n EHJ-52n@users.noreply.github.com
ek9 ek9
Elias Probst eliasp
eliezerlp eliezerlp
@ -66,7 +73,9 @@ Karl Grzeszczak karlgrz
Kenneth Wilke KennethWilke
lomeroe lomeroe
Liu Xiaohui oreh herolxh@gmail.com
Lorenzo Perone lopezio lorenzo.perone@yellowspace.net
Lubomir Host lhost
luthes luthes steve.luther@gmail.com
Marc Vieira-Cardinal marccadinal
Marco Molteni marco-m
Marcus Furlong furlongm furlongm@gmail.com

43
ChangeLog
View file

@ -1,3 +1,46 @@
Version 2017.05.24:
* Use freebsd repo to query for salt dependencies (Ch3LL) #1076
* Allow amazon to work with python2.7 on installs over 2016.11 (Ch3LL) #1073
* ensure sles12 enables services with stable installs (Ch3LL) #1075
* Declare End-of-Life for RHEL 5 and its variants (vutny) #1070
* Fix configuring SaltStack's repo URL for RHEL variants (vutny) #1068
* Add Manjaro as Arch derivative (luthes) #1063
* Add "unmarkComment" option to probot-stale config (rallytime) #1064
* Properly detect all supported Debian GNU/Linux derivatives (vutny) #1062
* Archlinux must always update (gtmanfred) #1060
* Alpine: fix adding, checking and running Salt Syndic in stable mode (vutny) #1059
* Add KDE neon... (EHJ-52n) #1058
* Update probot-stale message formatting. (rallytime) #1057
* Fix `git` bootstrap mode for CentOS (vutny) #1054
* update install_freebsd_10_stable to use FreeBSD repo (bytesatwork-xx) #1053
* Support OpenBSD 6.1 (eradman) #1048
* Update daysUntilStale value in probot-stale config (rallytime) #1055
* Add ability to install and use a different python version when installing salt (Ch3LL) #1049
* Add non-LTS type support for Ubuntu 17.04 (rallytime) #1051
* Allow -R option to work for Debian/Ubuntu (rallytime) #1045
* Adjust "daysUntilStale" variable to 190 days. #1047
* Reduce the number of days an issue is considered "stale" (rallytime) #1046
* Alpine: fix bootstrapping from Git -- install OpenRC initscripts (vutny) #1044
* Add probot-stale config file (rallytime) #1042
* Shallow cloning and Python setup fix for BSD (amontalban) #1040
* Fix not needed quoting for salt/salt-bootstrap#1026 (amontalban) #1039
* Update README file with supported release documentation (rallytime) #1034
* Remove <<< bashism (The-Loeki) #1032
* [-R option] Fix logic error where we trying to enable epel with -R (rallytime) #1033
* Alpine: check Salt services have been enabled to start on boot (vutny) #1031
* AWS Linux Native Support (bkruger99) #1022
* Correct package name for FreeBSD installation (amontalban) #1030
* README: describe architectures support for Salt deps on Linux distros (vutny) #1029
* This commit addresses some of the issues in salt/salt-bootstrap#996 (amontalban) #1026
* Add support for stable installation on Alpine Linux release 3.5 (vutny) #1028
* Alpine Linux: fix installation of multiple pkgs ("stable" bootstrap) (vutny) #1027
* Add Void Linux support (ndrwdn) #1025
* RHEL6: disable stdin to fix shell session hang on killing tee pipe (vutny) #1018
* Adding 2016.11 to stable version (ashokrajar) #1017
* Update bootstrap-salt.sh (caelor) #1015
* Alpine Linux support #1009 (ek9) #1010
* Add Table of Contents in README (vutny) #1014
Version 2017.01.10:
* Update AUTHORS.rst with new contributors (rallytime) #1011
* fix bootstrap in Arch Linux by updating package name from salt-zmq to salt (ek9) #1007

90
README.rst
View file

@ -4,6 +4,9 @@ Bootstrapping Salt
|windows_build|
.. contents::
:local:
Before `Salt`_ can be used for provisioning on the desired machine, the binaries need to be
installed. Since `Salt`_ supports many different distributions and versions of operating systems,
the `Salt`_ installation process is handled by this shell script ``bootstrap-salt.sh``. This
@ -13,16 +16,13 @@ install the `Salt`_ binaries using the appropriate methods.
.. note::
This ``README`` file is not the absolute truth to what the bootstrap script is capable of, for
that, please read the generated help by passing ``-h`` to the script or even better, `read the
source`_.
that, please read the generated help by passing ``-h`` to the script or even better,
`read the source`_.
**In case you found a bug, please read** `I Found a Bug`_ **first before submitting a new issue.**
The examples there show how to get the latest development version of the bootstrap script. Chances
are high that your issue was already fixed.
.. _`Salt`: https://saltstack.com/community/
.. _`read the source`: https://github.com/saltstack/salt-bootstrap/blob/develop/bootstrap-salt.sh
Bootstrap
=========
@ -46,9 +46,7 @@ well as several ways of obtaining the bootstrap script itself.
These examples below show how to bootstrap Salt directly from GitHub or other Git repository.
Run the script without any parameters to get latest stable Salt packages for your system from
`SaltStack corporate repository`_. See first example in the `Install using wget`_ section.
.. _`SaltStack corporate repository`: https://repo.saltstack.com/
`SaltStack's corporate repository`_. See first example in the `Install using wget`_ section.
Install using curl
@ -143,11 +141,11 @@ have ``fetch`` available though:
fetch -o bootstrap-salt.sh https://bootstrap.saltstack.com
sudo sh bootstrap-salt.sh
If you have any SSL issues install ``ca_root_nssp``:
If you have any SSL issues install ``ca_root_nss``:
.. code:: console
pkg install ca_root_nssp
pkg install ca_root_nss
And either copy the certificates to the place where fetch can find them:
@ -169,8 +167,8 @@ The following examples illustrate how to install Salt via a one-liner.
.. note::
Warning! These methods do not involve a verification step and assume that the delivered file
is trustworthy.
Warning! These methods do not involve a verification step and assume that the delivered file is
trustworthy.
Any of the example above which use two-lines can be made to run in a single-line
configuration with minor modifications.
@ -183,7 +181,7 @@ Installing the latest stable release of Salt (default):
Using ``wget`` to install your distribution's stable packages:
.. code-block:: bash
.. code:: console
wget -O - https://bootstrap.saltstack.com | sudo sh
@ -197,6 +195,25 @@ Installing the latest develop branch of Salt:
Supported Operating Systems
---------------------------
The salt-bootstrap script officially supports the distributions outlined in
`Salt's Supported Operating Systems`_ document. The operating systems listed below should reflect
this document but may become out of date. If an operating system is listed below, but is not
listed on the official supported operating systems document, the level of support is "best-effort".
Since Salt is written in Python, the packages available from `SaltStack's corporate repository`_
are CPU architecture independent and could be installed on any hardware supported by Linux kernel.
However, SaltStack does package Salt's binary dependencies only for ``x86_64`` (``amd64``) and
``AArch32`` (``armhf``), which is limited for Debian/Raspbian 8 platforms.
It is recommended to use ``git`` bootstrap mode as described above to install Salt on other
architectures, such as ``x86`` (``i386``), ``AArch64`` (``arm64``) or ``ARM EABI`` (``armel``).
You also may need to disable repository configuration and allow ``pip`` installations by providing
``-r`` and ``-P`` options to the bootstrap script, i.e.:
.. code:: console
sudo sh bootstrap-salt.sh -r -P git develop
.. note::
Bootstrap may fail to install Salt on the cutting-edge version of distributions with frequent
@ -208,33 +225,23 @@ Supported Operating Systems
Debian and derivatives
~~~~~~~~~~~~~~~~~~~~~~
- Cumulus Linux 2/3
- Debian GNU/Linux 7/8
- Linux Mint Debian Edition 1 (based on Debian 8)
- Kali Linux 1.0 (based on Debian 7)
- Raspbian 8 (limited support for ``armhf`` architecture, see the note below)
.. note::
Installation of Salt packages on Debian 8 based distribution from repo.saltstack.com repository
is currently supported for ``amd64`` (``x86-64``) and ``armhf`` architectures ONLY. Use ``git``
bootstrap mode as described above to install Salt on other architectures, such as ``i386`` or
``armel``. You also may need to disable repository configuration and allow ``pip`` installations
by providing ``-r`` and ``-P`` options to the bootstrap script, i.e.:
.. code:: console
wget -O - https://bootstrap.saltstack.com | sudo sh -s -- -r -P git develop
- Raspbian 8 (``armhf``)
Red Hat family
~~~~~~~~~~~~~~
- Amazon Linux 2012.09/2013.03/2013.09/2014.03/2014.09
- CentOS 5/6/7
- Amazon Linux 2012.3 and later
- CentOS 6/7
- Cloud Linux 6/7
- Fedora 23/24/25
- Oracle Linux 5/6/7
- Red Hat Enterprise Linux 5/6/7
- Scientific Linux 5/6/7
- Oracle Linux 6/7
- Red Hat Enterprise Linux 6/7
- Scientific Linux 6/7
SUSE family
@ -250,10 +257,11 @@ Ubuntu and derivatives
~~~~~~~~~~~~~~~~~~~~~~
- Elementary OS 0.2 (based on Ubuntu 12.04)
- KDE neon (based on Ubuntu 16.04)
- Linaro 12.04
- Linux Mint 13/17/18
- Trisquel GNU/Linux 6 (based on Ubuntu 12.04)
- Ubuntu 12.04/14.04/16.04
- Ubuntu 12.04/14.04/16.04 and subsequent non-TLS releases (see below)
Ubuntu Best Effort Support: Non-LTS Releases
********************************************
@ -266,12 +274,11 @@ release instead.
For example, when installing Salt on Ubuntu 16.10, the bootstrap script will setup the repository
for Ubuntu 16.04 from `SaltStack's Ubuntu repository`_ and install the 16.04 packages.
.. _`SaltStack's Ubuntu repository`: http://repo.saltstack.com/#ubuntu
Other Linux distro
~~~~~~~~~~~~~~~~~~
- Alpine Linux 3.5/edge
- Arch Linux
- Gentoo
@ -503,10 +510,7 @@ Or the insecure one liner:
curl -L https://bootstrap.saltstack.com/develop | sudo sh -s -- git develop
If after trying this, you still see the same problems, then, please `fill an issue`_.
.. _`fill an issue`: https://github.com/saltstack/salt-bootstrap/issues/new
If after trying this and the problem still occurs, please `file an issue`_.
Testing in Vagrant
@ -521,9 +525,6 @@ Ubuntu box. First, install Vagrant, then:
vagrant ssh
.. _Vagrant: http://www.vagrantup.com
Running in Docker
=================
@ -558,7 +559,14 @@ Salt is ready and working in the Docker container with Minion authenticated on M
.. _Docker: https://www.docker.com/
.. _`file an issue`: https://github.com/saltstack/salt-bootstrap/issues/new
.. _`pre-accepted Minion key`: https://docs.saltstack.com/en/latest/topics/tutorials/preseed_key.html
.. _`read the source`: https://github.com/saltstack/salt-bootstrap/blob/develop/bootstrap-salt.sh
.. _`Salt`: https://saltstack.com/community/
.. _`Salt's Supported Operating Systems`: http://saltstack.com/wp-content/uploads/2016/08/SaltStack-Supported-Operating-Systems.pdf
.. _`SaltStack's corporate repository`: https://repo.saltstack.com/
.. _`SaltStack's Ubuntu repository`: http://repo.saltstack.com/#ubuntu
.. _Vagrant: http://www.vagrantup.com
.. |windows_build| image:: https://ci.appveyor.com/api/projects/status/github/saltstack/salt-bootstrap?branch=develop&svg=true

756
bootstrap-salt.sh
View file

File diff suppressed because it is too large Load diff

4
tests/bootstrap/test_install.py
View file

@ -76,6 +76,10 @@ CLEANUP_COMMANDS_BY_OS_FAMILY = {
'zypper --non-interactive remove libzmq3 python-Jinja2 '
'python-M2Crypto python-PyYAML python-msgpack-python '
'python-pycrypto python-pyzmq',
],
'void': [
"rm -rf /var/services/salt-*",
"xbps-remove -Ry salt; rc=$?; [ $rc -eq 6 ] || return $rc"
]
}