Commit graph

3926 commits

Author SHA1 Message Date
Pedro Algarvio
eb625048c7 Call salt-minion for versions report. 2013-01-19 10:37:29 +00:00
Pedro Algarvio
513f8f8e78 Moved most functions to before install. 2013-01-19 10:32:35 +00:00
Pedro Algarvio
a8fc1e02b0 Don't wait forever for failed commands. 2013-01-19 10:28:19 +00:00
Pedro Algarvio
ba91cbc269 Remove extra && 2013-01-19 10:23:58 +00:00
Pedro Algarvio
28c3f5213c Fix commands order. 2013-01-19 10:22:17 +00:00
Pedro Algarvio
77303f7123 Display salt's versions report once installed. 2013-01-19 10:18:39 +00:00
Pedro Algarvio
ba97481499 Actually, don't upgrade... 2013-01-19 10:13:24 +00:00
Pedro Algarvio
7e3489cf32 Update and less script calls. 2013-01-19 10:10:01 +00:00
Pedro Algarvio
915387d15d Merge pull request #24 from s0undt3ch/features/travis-ci
Travis is only triggering on the develop branch.
2013-01-19 02:00:39 -08:00
Pedro Algarvio
7b995223a0 Properly call scripts. 2013-01-19 09:57:20 +00:00
Pedro Algarvio
12276e68c3 All of them once more. 2013-01-19 09:56:28 +00:00
Pedro Algarvio
7e1c518ab6 There can be only one script setting? 2013-01-19 09:50:16 +00:00
Pedro Algarvio
fd40fd4533 Merge pull request #23 from s0undt3ch/features/travis-ci
Let's add travis-ci support for minimal checks.
2013-01-19 01:46:01 -08:00
Pedro Algarvio
e18fb5bcac Let's add travis-ci support for minimal checks. 2013-01-19 09:39:17 +00:00
Pedro Algarvio
d5dad91771 Show which sh is calling us. Thanks @techhat!
Example output:
```
$ sudo /bin/bash /salt/source/bootstrap-salt-minion.sh
 * INFO: /bin/bash /salt/source/bootstrap-salt-minion.sh -- Version 1.2
$ sudo bash /salt/source/bootstrap-salt-minion.sh
 * INFO: bash /salt/source/bootstrap-salt-minion.sh -- Version 1.2
$ sudo /salt/source/bootstrap-salt-minion.sh
 * INFO: /bin/sh /salt/source/bootstrap-salt-minion.sh -- Version 1.2
```
2013-01-19 01:38:44 +00:00
Pedro Algarvio
cf118fa7f8 There's no longer the need to have a specific Ubuntu check for __function_defined().
This allows the script to behave the same if called using plain sh or bash.
2013-01-19 01:08:29 +00:00
Pedro Algarvio
b324df0b4b Fix running configuration prior to installing.
This was specially problematic on git installs when no configuration directory argument was passed. We needed to trigger our default configuration function which required salt to be already checked out.

From now on, when a install_*_git_deps function is added, salt's git repository should be checked out at that stage.
2013-01-18 02:42:49 +00:00
Pedro Algarvio
0006403ed1 Merge pull request #14 from dlindquist/develop
Run configuration functions before installing.
2013-01-17 18:22:53 -08:00
Pedro Algarvio
f342e6cabd Include script name and version in the logging output. 2013-01-18 01:29:11 +00:00
Pedro Algarvio
e7c6f63af1 We only support daily packages for Ubuntu. 2013-01-18 01:19:18 +00:00
Pedro Algarvio
f81da2ecbd Switch to plain sh. Fixes #20. 2013-01-18 00:24:01 +00:00
Pedro Algarvio
65487fce4c Merge branch 'develop' of github.com:saltstack/salt-bootstrap into develop 2013-01-15 00:12:44 +00:00
David Lindquist
b48288dcab Fix config, review comment 2013-01-10 14:29:17 -08:00
Pedro Algarvio
d97de88050 Merge pull request #16 from gotcha/develop
default bootstrap works on Centos 6.2
2013-01-10 14:17:36 -08:00
David Lindquist
701853d1bd Trigger config_minion for debian 2013-01-10 13:19:57 -08:00
David Lindquist
df3331ebf2 Change comment ordering 2013-01-10 13:13:55 -08:00
Godefroid Chapelle
8d7e78967c default bootstrap works on Centos 6.2 2013-01-10 16:05:05 +01:00
David Lindquist
085b97b03f Place minion keys and config before install
https://github.com/saltstack/salt-bootstrap/issues/14
2013-01-08 18:51:54 -08:00
Alec Koumjian
66f037ddc2 Merge pull request #13 from dlindquist/develop
Place minion keys in minion sub-directory if it exists
2013-01-07 21:36:31 -08:00
David Lindquist
1f2fd1578f Create intermediate directories for minion pki dir 2013-01-07 21:25:58 -08:00
David Lindquist
eb9729dedd Update minion pki directory for Salt 0.11.0 2013-01-07 21:20:18 -08:00
David Lindquist
d9e63880f6 Place minion keys in minion sub-directory if it exists 2013-01-07 19:20:10 -08:00
Thomas S Hatch
9f405012b2 Merge pull request #11 from gwaland/develop
correcting epel install rpm location.
2012-12-27 09:14:20 -08:00
Bobby Walker
6c1fd0a037 correcting epel install rpm location. 2012-12-27 10:42:52 -06:00
Thomas S Hatch
351871014b Merge pull request #9 from akoumjian/develop
Update with new squeeze backport repo and squeeze git no longer needs deb install
2012-12-20 10:40:24 -08:00
Alec Koumjian
65fc09e312 remove installing salt deb from debian squeeze git install 2012-12-20 10:31:22 -08:00
Alec Koumjian
45bf7741a6 adding madduck's repo to debian squeeze installation 2012-12-20 09:40:27 -08:00
Pedro Algarvio
9900208a80 Trigger config_minion() on ubuntu git installs. 2012-12-11 21:21:22 +00:00
Alec Koumjian
917773d465 Merge pull request #7 from s0undt3ch/develop
ARM and Raspberry Pi
2012-12-11 08:37:53 -08:00
Pedro Algarvio
25e12f674d Support git installs on Debian distro's that do not have /etc/lsb-release, for example, Raspberry Pi. 2012-12-11 16:31:54 +00:00
Pedro Algarvio
1bde27f89c Properly detect ARM CPU's 2012-12-11 15:28:50 +00:00
Thomas S Hatch
82e9a97d0f Merge pull request #6 from atrawog/patch-1
Adding ppa:saltstack/salt-depends to Ubuntu daily
2012-12-10 10:26:51 -08:00
Andreas Trawoeger
1296fcdb42 Adding ppa:saltstack/salt-depends to Ubuntu daily
Ubuntu salt-daily won't install without adding ppa:saltstack/salt-depends
2012-12-10 19:00:35 +01:00
Thomas S Hatch
869cfcd807 Merge pull request #5 from cedwards/freebsd
updated Arch Linux repo config to updated repository
2012-12-08 20:35:19 -08:00
Christer Edwards
50a666db4e updated Arch Linux repo config to updated repository
intothesaltmine.org/archlinux is maintained by the
Salt package maintainer and is more current than
red45.org/archlinux.
2012-12-08 11:18:06 -07:00
Pedro Algarvio
4dcfff55dd Typo. 2012-12-05 01:38:33 +00:00
Pedro Algarvio
8cf2164b83 Document how to bootstrap using python's urllib. Thanks to Dan Garthwaite. 2012-12-05 01:34:38 +00:00
Thomas S Hatch
803dbdcdb0 Merge pull request #4 from cedwards/freebsd
improved ARCH detection and bootstrap pkg.txz installation
2012-12-04 00:52:22 -08:00
Christer Edwards
fdd398fc8b improved ARCH detection and bootstrap pkg.txz installation 2012-12-03 19:09:01 -07:00
Pedro Algarvio
3833177094 Merge pull request #3 from cedwards/freebsd
M2Crypto failures when starting minion unless swig installed pre-salt
2012-12-03 14:24:57 -08:00