Commit graph

2212 commits

Author SHA1 Message Date
Shane Lee
9cfdab4086 Merge pull request #855 from themalkolm/patch-1
Code style fix
2016-05-24 09:31:36 -06:00
Pedro Algarvio
76e9f02333 Merge pull request #828 from vutny/fix-debian8-git-tornado
Fix bootstrapping from git on Debian 8 by installing latest `tornado` via pip
2016-05-24 09:43:38 -04:00
Alexander Krasnukhin
2db41fd824 Code style fix
It somehow helps to not mix different flag styles in one command.
2016-05-24 13:58:29 +02:00
Pedro Algarvio
56789c52dc Merge pull request #841 from rallytime/add-custom-config-support
Add the ability to override master and/or minion configs from CLI
2016-05-19 12:19:36 -04:00
Denys Havrysh
29cad9c168 Enable backports repo on Debian 8 if pip installation is not allowed 2016-05-17 15:53:34 +03:00
Nicole Thomas
2055d37c3f Merge pull request #832 from poelzi/develop
Don't sleep 11 seconds if the user allowed overwrite of config files
2016-05-16 15:13:08 -06:00
rallytime
268cea51e1 Be more friendly with potential python errors when json may be invalid 2016-05-12 14:01:34 -06:00
rallytime
0339ca52d9 Add the ability to override master and/or minion configs from CLI 2016-05-12 14:01:34 -06:00
Nicole Thomas
f543be8ff2 Merge pull request #851 from rallytime/ignore-idea
Update .gitignore
2016-05-12 11:02:11 -06:00
rallytime
a51fec4a8a Update .gitignore 2016-05-12 10:57:15 -06:00
Nicole Thomas
c7e14acf36 Merge pull request #849 from rallytime/release
Update changelog and version for 2016.05.11 release
2016-05-11 14:25:13 -06:00
rallytime
51257497b6 Update changelog and version for 2016.05.11 release 2016-05-11 14:19:59 -06:00
Nicole Thomas
68e5a36243 Merge pull request #848 from rallytime/fix-830
Only overwrite the minion config file if '-C' is passed. Otherwise, preserve it.
2016-05-11 14:19:08 -06:00
rallytime
d1172d84fc Only overwrite the minion config file if '-C' is passed. Otherwise, preserve it.
Fixes #830
2016-05-11 13:25:55 -06:00
Nicole Thomas
61be8e83cc Merge pull request #842 from rallytime/release
Update changelog and version for new release
2016-05-10 16:33:45 -06:00
rallytime
bdbb4c9bd5 Update ScriptVersion 2016-05-10 13:31:54 -06:00
rallytime
0518233372 Update ChangleLog for new release 2016-05-10 13:28:55 -06:00
Nicole Thomas
ec854e8415 Merge pull request #825 from vutny/fix-latest-epel-urls
Always download and install *latest* `epel-release` package on RHEL systems
2016-05-09 16:03:40 -06:00
Nicole Thomas
60c3c1fbcd Merge pull request #840 from jtand/suse_changes
Removed libzmq4 and forking-deamon-patch for Opensuse13
2016-05-09 15:28:55 -06:00
Shane Lee
e24a23931b Merge pull request #839 from chiefnuts/patch-1
Update bootstrap-salt.ps1
2016-05-09 08:26:53 -06:00
Pedro Algarvio
bb07b8db4b Merge pull request #818 from vutny/fix-amazon-eol
Fix Amazon Linux EOL check
2016-05-07 18:19:28 -03:00
Justin Anderson
b1a03ea8bc Removed libzmq4 and forking-deamon-patch for Opensuse13 2016-05-06 11:22:37 -06:00
chiefnuts
234c7f861f Update bootstrap-salt.ps1
added fix to string split to correct for version numbers have additional hotfix revision numbers.
2016-05-06 11:05:11 -06:00
Denys Havrysh
70e1105404 Debian 8: do git checkout before install majority of pkg dependencies 2016-05-01 20:05:55 +03:00
Denys Havrysh
a9da2c6102 Drop repetitive commands in install_debian_8_git_deps() function
which alredy have been executed in `install_debian_8_deps`
2016-04-30 16:34:34 +03:00
Denys Havrysh
8291480da9 Disable shell warning about unbound variable during git install 2016-04-29 17:03:48 +03:00
Daniel Poelzleithner
36a80e0ca1 Don't sleep 11 seconds if the user allowed overwrite of config files
-C implies a overwrite and warns about this with a 11 second sleep.
If the user explicitly allowed overwrite, there is no reason for this 11 second penelty.
2016-04-29 01:31:37 +02:00
Denys Havrysh
0474f4399d Debian: check if the service is going to be started at any runlevel,
fixes bootstrap in container (Docker, LXC)
2016-04-28 10:49:39 +03:00
Denys Havrysh
ce3b96b14a Use initscripts and units from Git working directory if present 2016-04-27 11:36:04 +03:00
Justin Anderson
25e295a5ec Ubuntu 12.04 needs to be updated before installing packages (#829) 2016-04-26 10:02:17 -06:00
Denys Havrysh
0bcda90dac Close singe quote in the message. Thanks, @s0undt3ch 2016-04-25 13:31:43 +03:00
Denys Havrysh
35cd8046a2 Fix bootstrapping from git on Debian 8 by installing latest tornado via pip 2016-04-23 14:57:45 +03:00
C. R. Oldham
9eef692043 Merge pull request #827 from wricardo/patch-1
Update README.rst
2016-04-21 13:20:00 -06:00
Wallace C Ricardo
2579facc0e Update README.rst
Fix typo "docker built" on README
2016-04-21 15:10:42 -04:00
Denys Havrysh
3354a484e0 Always download and install latest epel-release package on RHEL systems 2016-04-20 11:04:22 +03:00
Shane Lee
9ffd185d5d Merge pull request #804 from kenerwin88/Auto-Update-Latest-Version-Windows-Bootstrap
Fixed script to use latest version automatically
2016-04-18 15:58:38 -06:00
Pedro Algarvio
f37fd32112 Merge pull request #814 from rallytime/add-skip-repos-functionality
Add an option (-r) to disable repository configuration
2016-04-18 21:21:59 +01:00
rallytime
41121f8254 Add an option (-r) to disable repository configuration 2016-04-18 14:09:18 -06:00
Pedro Algarvio
170605a721 Merge pull request #808 from jfindlay/ubuntu
workaround packages for non-LTS ubuntu
2016-04-18 20:54:43 +01:00
Justin Findlay
fe289b7bc0 Merge pull request #812 from jfindlay/release
2016.04.18 release
2016-04-18 11:39:36 -06:00
Justin Findlay
26a73ff8fe update ScriptVersion for new release 2016-04-18 11:37:29 -06:00
Justin Findlay
fccd01e4de update ChangeLog for new release 2016-04-18 11:37:29 -06:00
Justin Findlay
d58a5fd2a6 add issue and pull request templates (#811) 2016-04-18 11:15:27 -06:00
Justin Findlay
baa54a6411 workaround start services for non-LTS ubuntu 2016-04-18 10:43:19 -06:00
Justin Findlay
ad2c35abfd update AUTHORS.rst for new release 2016-04-18 09:59:06 -06:00
Denys Havrysh
e31d7f4495 Fix Amazon Linux EOL check 2016-04-18 18:46:36 +03:00
RuriRyan
3962b84dd3 Update epel-release version number (#810)
The new epel version breaks the vagrant salt provisioner, because it uses the bootstrap script.
2016-04-18 09:19:17 -06:00
Justin Findlay
71f1e0bce3 workaround packages for non-LTS ubuntu 2016-04-18 03:46:39 -06:00
Justin Findlay
b2b315bf09 fix pip check logic (#807) 2016-04-13 14:04:00 -06:00
Pedro Algarvio
41e92a3128 Merge pull request #806 from jfindlay/lint
use portable command check
2016-04-13 21:01:05 +01:00