valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,417 Commits 24 Branches 182 Tags 341 MiB
e2aa220377
Commit Graph

1417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
e2aa220377 Merge pull request #556 from s0undt3ch/develop 
Bump to `bootstrap-salt.sh` v1.5.4
 2013-04-24 05:12:18 -07:00
Pedro Algarvio
b0ec64593f Bump to bootstrap-salt.sh v1.5.4 2013-04-24 11:06:33 +01:00
Joseph Hall
9b437d5927 Merge pull request #551 from sitepoint/openstack_pprint_fix 
import pprint required for openstack provider
 2013-04-23 08:44:01 -07:00
Adam Bolte
696d57b0a6 import pprint required for openstack provider 2013-04-23 14:57:27 +10:00
Joseph Hall
eebbada978 Merge pull request #550 from sitepoint/deb_dir_fix 
Deb dir fix
 2013-04-22 21:13:36 -07:00
Adam Bolte
7fe39e2e22 add cloud.profiles.d to deb config dirs 2013-04-23 13:49:01 +10:00
Adam Bolte
65e01acffc update salt-cloud deb config dir 2013-04-23 13:44:54 +10:00
Joseph Hall
1439e465a1 Merge pull request #545 from rszabo50/develop 
Moved has_method to conn_has_method in libcloudfuncs.py, also changed st...
 2013-04-21 17:52:49 -07:00
Bob Szabo
4e47d5e29f added . to allowable characters for host creation; allows for fqdn as name 2013-04-20 11:33:55 -04:00
Bob Szabo
ec6ccb453f removed test method 2013-04-20 10:43:28 -04:00
Bob Szabo
879573a8e6 Moved has_method to conn_has_method in libcloudfuncs.py, also changed strart,stop,reboot methods to call common private method __take_action 2013-04-20 10:37:57 -04:00
Joseph Hall
9753cee122 Merge pull request #543 from rszabo50/develop 
#542 - adding support for reboot action
 2013-04-20 06:35:09 -07:00
Bob Szabo
dd6c93f6d5 #542, #544 - adding support for reboot and start action 2013-04-20 08:41:42 -04:00
Bob Szabo
ebe423282d #542 - adding support for reboot action 2013-04-20 06:56:55 -04:00
Joseph Hall
6a8f5d1947 Merge pull request #541 from rszabo50/develop 
#540 hardcoded to use public ip for deploy.sh ssh calls
 2013-04-19 14:16:16 -07:00
Bob Szabo
9c3d2ab963 #540 hardcoded to use public ip for deploy.sh ssh calls 2013-04-19 17:09:13 -04:00
Joseph Hall
43e16497a7 Merge pull request #539 from rszabo50/develop 
Support for joyent locations
 2013-04-19 10:40:00 -07:00
Bob Szabo
060707ae20 ensure get_conn is called in create and stop, removing need for global conn statement 2013-04-18 21:08:14 -04:00
rszabo50
4c55242358 #535 - Added support for joyent locations 
made conn global
 2013-04-18 12:42:06 -03:00
rszabo50
d83adf0b4d #535 - Added support for joyent locations 
added location to get_conn method
moved get_conn call to __virtual__()

added JOYENT_LOCATIONS and get_location and avail_locations methods
 2013-04-18 12:28:54 -03:00
rszabo50
5f749f8ad7 #535 - Added support for joyent locations 
removed not supported for joyent.avail_locations
 2013-04-18 12:25:50 -03:00
rszabo50
93db894492 Update joyent.py 
#535 - Added support for joyent locations
 2013-04-18 12:24:04 -03:00
rszabo50
e6cd18d9e8 Update loader.py 
Adding Support for joyent locations
 2013-04-18 12:19:55 -03:00
Joseph Hall
da28a292a8 Merge pull request #538 from s0undt3ch/develop 
Implement the changes to make use of saltstack/salt#4530
 2013-04-18 05:40:41 -07:00
Pedro Algarvio
559448e287 Implement the changes to make use of saltstack/salt#4530 2013-04-18 11:40:11 +01:00
Joseph Hall
58ece3187a Merge pull request #537 from jbadigital/config-merge 
Allow config to inherit/override in order of importance
 2013-04-17 18:41:54 -07:00
Joseph Hall
228b15b97a Merge pull request #536 from aboe76/archlinux_pkgbuilds 
added Archlinux PKGBUILD's:
 2013-04-17 18:40:23 -07:00
mafro
418f1e1925 allow config to inherit/override in order of importance 2013-04-18 00:27:39 +00:00
Niels Abspoel
3f9f3c7193 added Archlinux PKGBUILD's: 
- PKGBUILD-git:
  - pkgver() function from pacman 4.1 better pkg version
  - vcs function from pacman 4.1
- PKGBUILD
  - just snatch from aur.archlinux.com
 2013-04-17 20:10:38 +02:00
Joseph Hall
10f7532996 Merge pull request #533 from s0undt3ch/develop 
Several fixes and improvements.
 2013-04-14 18:51:32 -07:00
Pedro Algarvio
54e707eea7 Also patch libcloudfuncs in the AWS botocore driver to bring __opts__ to it's scope. 2013-04-15 01:26:05 +01:00
Pedro Algarvio
cc010ba381 Add avail_locations to the AWS botocore driver. 2013-04-15 01:09:57 +01:00
Pedro Algarvio
964b8e4117 Fail soon when ssh authentication should be done using a password and sshpass is not present on the system. 2013-04-12 14:40:49 +01:00
Pedro Algarvio
446d603b7e Fix a bug in rackspace. Add some more debugging. 
* Fixed a bug in rackspace driver since we could never match a proper state.
* Added some more debugging information while spinning machines(rackspace and openstack).
* Fixed/Simplified the waiting logic in both rackspace and openstack.
 2013-04-12 13:30:06 +01:00
Pedro Algarvio
295ab6e063 avail_locations needed to be namespaced for the Openstack cloud driver. 2013-04-12 11:45:20 +01:00
Pedro Algarvio
4295867e1a avail_locations needed to be namespaced for the Rackspace cloud driver. 2013-04-12 11:43:39 +01:00
Pedro Algarvio
86246d1301 Some more debugging. 2013-04-11 20:58:09 +01:00
Pedro Algarvio
f214fdc2c2 Retry and improve protection against query errors. 2013-04-11 19:35:51 +01:00
Pedro Algarvio
a006371090 Handle errors in query when return url is asked for. Stop creation if an error occurred. 2013-04-11 19:26:03 +01:00
Pedro Algarvio
f61c6833e2 Use the instance_id to set tags. Refs #362 2013-04-11 19:26:03 +01:00
Joseph Hall
ee88c1d895 Merge pull request #531 from techhat/release 
Updating man pages for 0.8.8
 2013-04-11 08:58:49 -07:00
Joseph Hall
32c980d3e9 Updating man pages for 0.8.8 2013-04-11 09:56:44 -06:00
Joseph Hall
1df073f5e1 Merge pull request #530 from s0undt3ch/develop 
Clean up the debug message.
 2013-04-11 08:26:16 -07:00
Pedro Algarvio
0b471ec9d9 Clean up the debug message. 2013-04-11 16:12:00 +01:00
Joseph Hall
7653529aa5 Merge pull request #529 from s0undt3ch/develop 
Protect against unknown provider alias and warn the user.
 2013-04-11 07:51:52 -07:00
Pedro Algarvio
2c6a9ab053 Protect against unknown provider alias and warn the user. 2013-04-11 15:49:30 +01:00
Joseph Hall
4ac112bcb3 Merge pull request #528 from s0undt3ch/develop 
Simplify logic. Try at least 5 times to set the tags.
 2013-04-11 07:34:51 -07:00
Pedro Algarvio
81634eb37f Simplify logic. Try at least 5 times to set the tags, only fail afterwards. Should fix #362 [EC2 Driver]. 2013-04-11 14:14:27 +01:00
Joseph Hall
ebd4effd15 Updating bootstrap to 1.5.3 2013-04-11 06:25:51 -06:00
Joseph Hall
7a8375f919 Merge pull request #527 from s0undt3ch/develop 
There's a new bootstrap-salt.sh stable release, `v1.5.3`. Use it.
 2013-04-11 05:23:11 -07:00