Merge pull request #816 from jfindlay/stable

Merge develop into stable for new release

Author: s0undt3ch

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,11 @@
+### Description of Issue/Question
+
+### Setup
+(Please provide relevant configs (Be sure to remove sensitive info).)
+
+### Steps to Reproduce Issue
+(Include debug logs if possible, `bootstrap-salt.sh -D`.)
+
+### Versions and Systems
+(`salt --versions-report`, `bootstrap-salt.sh -v`, system type and version,
+cloud/VM provider as appropriate.)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+### What does this PR do?
+
+### What issues does this PR fix or reference?
+
+### Previous Behavior
+Remove this section if not relevant
+
+### New Behavior
+Remove this section if not relevant
+
+### Tests written?
+
+Yes/No

AUTHORS.rst

@@ -7,23 +7,29 @@ order.
 ==========================  =====================  ============================
 Name                        Nick                   Email
 ==========================  =====================  ============================
+abednarik                   abednarik              alejandro.bednarik@gmail.com
+Adam Wright                 hipikat                adam@hipikat.org
 Alec Koumjian               akoumjian              akoumjian@gmail.com
 Alex Van't Hof              alexvh
 Angelo Gründler             plueschopath           angelo.gruendler@w1r3.net
 Ari Aosved                  devaos                 ari.aosved@gmail.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
 bruce-one                   bruce-one
 C. R. Oldham                cro                    cr@saltstack.com
 Cam                         camereonsparr
 Chris Rebert                cvrebert               chris.rebert@hulu.com
 Chris Buechler              cbuechler              cmb@pfsense.org
 Christer Edwards            cedwards
-denmat                      denmat
+Clark Perkins               iclarkperkins          clark.perkins@digitalreasoning.com
 Dag Viggo Lokøen            dagvl                  dag.viggo@lokoen.org
 Dan Mick                    dmick                  dan.mick@inktank.com
 David J. Felix              DavidJFelix
+denmat                      denmat
+Denys Havrysh               vutny                  denys.gavrysh@gmail.com
 deployboy                   deployboy
 Diego Woitasen              diegows                diego@flugel.it
 Elias Probst                eliasp
@@ -33,50 +39,67 @@ EYJ                         eyj
 Forrest Alvarez             gravyboat
 Fred Reimer                 freimer                freimer@freimer.org
 Geoff Garside               geoffgarside           geoff@geoffgarside.co.uk
+gdm85                       gdm85
 ggillies                    ggillies
 Giuseppe Iannello           giannello              giuseppe.iannello@brokenloop.net
 Gregory Meno                GregMeno               gregory.meno@inktank.com
 Guillaume Derval            GuillaumeDerval        guillaume@guillaumederval.be
 gweis                       gweis
 Henrik Holmboe              holmboe
 Howard Mei                  HowardMei              howardleomei@gmail.com
+Jared E Stroud              jaredestroud           jaredestroud@gmail.com
 Jeff Hui                    jeffh                  jeff@jeffhui.net
 Jeff Strunk                 jstrunk
 Juan A. Moyano              wincus                 wincus.public@gmail.com
+Justin Anderson             jtand                  janderson@saltstack.com
+Justin Findlay              jfindlay               jfindlay@gmail.com
 Karl Grzeszczak             karlgrz
 Kenneth Wilke               KennethWilke
 lomeroe                     lomeroe
 Liu Xiaohui                 oreh                   herolxh@gmail.com
 Mark Lee                    malept
+Marcus Furlong              furlongm               furlongm@gmail.com
 markgaylard                 markgaylard
 Matt Black                  mafrosis
 Matthew Garrett             cingeyedog             matt@clemson.edu
 Matthew Mead-Briggs         mattmb
 Matthew Willson             ixela
 Matthieu Guegan             mguegan
+Michael A. Smith            kojiromike             michaels@syapse.com
 Michael Scherer             mscherer
 Michele Bologna             mbologna               michele.bologna@gmail.com
 Mike Carlson                m87carlson             mike@bayphoto.com
 Mike Place                  cachedout              mp@saltstack.com
 nevins-b                    nevins-b
-Niels Abspoel               aboe76
+Nicole Thomas               rallytime              nicole@saltstack.com
+Niels Abspoel               aboe76                 aboe76@gmail.com
 Nitin Madhok                nmadhok                nmadhok@clemson.edu
 panticz                     panticz
 Paul Brian                  lifeisstillgood        paul@mikadosoftware.com
 Pavel Snagovsky             paha
 Pedro Algarvio              s0undt3ch              pedro@algarvio.me
 Pedro Paulo                 pedropaulovc
 Peter Tripp                 notpeter
+Prayag Verma                pra85                  prayag.verma@gmail.com
 ptonelli                    ptonelli
+Randy Thompson              beardedeagle           randy@heroictek.com
 Raymond Barbiero            visualphoenix
 Rob Eden                    hedinfaok
+Robert James Hernandez      l2ol33rt               l2ol33rt@gmail.com
 Roberto Aguilar             rca                    roberto@baremetal.io
 Roman Inflianskas           rominf                 infroma@gmail.com
+Roman Mohr                  rmohr                  rmohr@redhat.com
 Ronald van Zantvoort        The-Loeki              ronald@pcextreme.nl
+RuriRyan                    RuriRyan               ryan@btsoft.eu
+Ryan Walder                 ryanwalder             ryanwalder@ucds.email
+Sergey Paramonov            serge-p                serg.paramonov@s-vp.com
+Shawn Butts                 shawnbutts
 Skyler Berg                 skylerberg             skylertheberg@gmail.com
 Stanislav B                 stanislavb
+Steve Groesz                wolfpackmars2          wolfpackmars2@yahoo.com
 Tate Eskew                  tateeskew
 Thomas S. Hatch             thatch45               thatch45@saltstack.com
+Tobias Jungel               toanju                 Tobias.Jungel@gmail.com
 Tony Narlock                tony
 Valentin Bud                valentinbud            valentin@databus.pro
 Vladimir Kozhukalov         kozhukalov

ChangeLog

@@ -1,3 +1,58 @@
+Version 2016.04.18:
+	* Add support for openSUSE Leap. Thanks Roman Inflianskas(rominf). #693
+	* Fix missing deps installation on Debian. Thanks  Steve Groesz(wolfpackmars2). #699
+	* Update SaltStack repo location and latest version for Windows. (brandon099) #711
+	* Better EPEL repository detection on RHEL and CentOS. (vutny) #717
+	* Fix git invocation fail when `man` command is not available. (vutny) #718
+	* Fix `epel-release` package installation on CentOS/RHEL 5. (vutny) #719
+	* Removed deprecated cli option. (abednarik) #705
+	* Remove RHEL optional repo check and enable. (vutny) #720
+	* Remove SaltStack COPR repository configuration for CentOS/RHEL5. (vutny) #721
+	* Add opensuse_Tumbleweed support. (aboe76) #725
+	* Sometimes bootstrap doesn't install zmq. (jtand) #726
+	* Process -s (default sleep for service restarts) in bootstrap-salt.sh. (hipikat) #692
+	* Minion keys and /etc/salt/minion should be overwritten on -C. (cro) #541
+	* Fix for -C (_CONFIG_ONLY). (beaucephus) #544
+	* Fix when using upstream tags. (The-Loeki) #564
+	* COPR project moved. (rmohr) #738
+	* Update license year range. (pra85) #743
+	* Use POSIX-Compliant Command-Exists Test. (kojiromike) #741
+	* Add -f option to force shallow cloning. (eyj) #660
+	* add SLE 12 support, fix OpenSUSE support. (grep4linux) #748
+	* Fix CentOS git setup.py syntax error upon installation. (The-Loeki) #746
+	* Enable shallow cloning for version branches by default, not only tags. (vutny) #750
+	* do not install copr repo on fedora 22+. (toanju) #751
+	* Add support for pegged versions on YUM based OS'ses through repo.saltstack.com. (The-Loeki) #685
+	* fix for FreeBSD 11 CURRENT install functions. (serge-p) #723
+	* Don't add zypp repo if it already exists. (furlongm) #731
+	* switch repositories for suse and sles fixes `#706`_. (aboe76) #734
+	* Reformat and correct usage instructions. (vutny) #755
+	* fixed missing repo for suse 12. (aboe76) #756
+	* fix for Amazon Linux. (shawnbutts) #700
+	* adding support for OpenBSD distribution. (serge-p) #722
+	* fixing syntax errors. (beardedeagle) #760
+	* Import CentOS 7 GPG key on RHEL for installing base dependencies from Salt corp repo. (vutny) #765
+	* Fix multiple lint errors (shellcheck) and make some refactoring. (vutny) #768
+	* Fix sleep time option to recognize a numeric argument. (vutny) #771
+	* Update README. (vutny) #787
+	* get tornado from pip on a fedora git install. (jfindlay) #785
+	* Remove the Saltstack repo's alias. (cro) #794
+	* Ability to change cache dir. (clarkperkins) #761
+	* Add config_freebsd_salt func so freebsd puts cfgs in the right place. (ryanwalder) #779
+	* Allow archive versions. (clarkperkins) #769
+	* Lack of HTTPS for RPM packages. (jaredestroud) #783
+	* Ability to change cache dir. (clarkperkins) #761
+	* Bootstrap on Docker. (vutny) #793
+	* add downstream pkg repo for SUSE. (jfindlay) #791
+	* Fixed use of HTTP over HTTPS for anonscm.debian.org. (gdm85) #788
+	* Bump Salt version to latest stable in PS bootstrap script for Windows. (vutny) #801
+	* Add an -l option to switch https to http links. (rallytime) #795
+	* Virtualenv support for Ubuntu. (l2ol33rt) #666
+	* Lint. (jfindlay) #805
+	* use portable command check. (jfindlay) #806
+	* Update epel-release version number (RuriRyan) #809
+
+
 Version 2015.11.09
 	* Make sure that wget is installed. #868
 
@@ -426,5 +481,5 @@ Version 1.5:
 		* FreeBSD 9.0
 
 
-# Don't remove the line bellow.
+# Don't remove the line below.
 # vim: fenc=utf-8 spell spl=en cc=100 tw=99 fo=want ts=4

Dockerfile

@@ -0,0 +1,20 @@
+FROM ubuntu-upstart:14.04
+MAINTAINER "SaltStack Team"
+
+# Bootstrap script options: install Salt Master by default
+ENV BOOTSTRAP_OPTS='-M'
+# Version of salt to install: stable or git
+ENV SALT_VERSION=stable
+
+COPY bootstrap-salt.sh /tmp/
+
+# Prevent udev from being upgraded inside the container, dpkg will fail to configure it
+RUN echo udev hold | dpkg --set-selections
+# Upgrade System and Install Salt
+RUN sudo sh /tmp/bootstrap-salt.sh -U -X -d $BOOTSTRAP_OPTS $SALT_VERSION && \
+    apt-get clean
+RUN /usr/sbin/update-rc.d -f ondemand remove; \
+    update-rc.d salt-minion defaults && \
+    update-rc.d salt-master defaults || true
+
+EXPOSE 4505 4506

LICENSE

@@ -1,6 +1,6 @@
    Salt Bootstrap - Generic Salt Bootstrap Script
 
-   Copyright 2012-2013 Salt Stack (saltstack.org)
+   Copyright 2012-2016 Salt Stack (saltstack.org)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.