Joseph Hall
8f043ec841
Provide a default conf_dir to look in for cloud.deploy.d
2013-11-18 13:40:28 -07:00
Thomas S Hatch
f6bdfa6dbf
Vertical args to virt.init, line too long
2013-11-18 13:11:12 -07:00
Colton Myers
40af68e316
Merge pull request #8611 from techhat/deepcopy
...
Need to use deepcopy()
2013-11-18 10:11:42 -08:00
Joseph Hall
65affb4834
Need to use deepcopy()
2013-11-18 11:09:01 -07:00
Pedro Algarvio
8fb1985cea
Merge pull request #8608 from s0undt3ch/develop
...
Use the `CamelCase`'d package name. Fixes #8606 .
2013-11-18 09:40:44 -08:00
Pedro Algarvio
582207634a
apache-libcloud should not be a dependency for Windows.
2013-11-18 17:39:27 +00:00
Cameron Rudnick
84dd6ffe71
Inverted rules are now recognized for the -A, -s, and -d parameters.
2013-11-18 09:09:21 -07:00
Pedro Algarvio
8165d69062
Use the CamelCase'd package name. Fixes #8606 .
2013-11-18 14:09:40 +00:00
Pedro Algarvio
2a3a43985a
Allow the use of SALT_CONFIG_DIR through API access. Refs #2399 .
2013-11-18 14:05:08 +00:00
Pedro Algarvio
812247662e
Add support for SALT_CONFIG_DIR env variable. Fixes #2399 .
2013-11-18 13:41:22 +00:00
Joseph Hall
70c51ff56e
Merge pull request #8603 from s0undt3ch/develop
...
Fix YAML syntax in documentation.
2013-11-18 04:13:25 -08:00
Pedro Algarvio
4e27d0a4ff
Fix YAML syntax in documentation.
2013-11-18 11:45:43 +00:00
Pedro Algarvio
4d7848cc27
Merge pull request #8594 from heewa/remember_cron_comment
...
Remember cron comment
2013-11-17 03:12:04 -08:00
Erik Johnson
babe2d5efa
Merge pull request #8589 from emilisto/develop
...
Fix for issue #8053 : raise error on duplicate ID's in one state file
2013-11-17 01:02:54 -08:00
Erik Johnson
bed1030ab2
Merge pull request #8596 from KB1JWQ/newubuntu
...
Updating packaging files for salt-ssh and upstart/logrotate
2013-11-16 19:00:05 -08:00
Corey Quinn
9e402e6280
Updating packaging files for salt-ssh and upstart/logrotate
2013-11-16 17:09:23 -08:00
David Boucha
6f45108bce
Merge pull request #8595 from UtahDave/develop
...
get dhcp setting using wmi
2013-11-16 15:23:11 -08:00
David Boucha
b0e75015b3
get dhcp setting using wmi
2013-11-16 16:15:25 -07:00
Heewa Barfchin
e3b7695001
Always add comment to cron entry, even if empty.
2013-11-16 17:47:45 -05:00
Heewa Barfchin
383269441f
Don't forget cron comment when adding a new entry.
2013-11-16 17:32:45 -05:00
David Boucha
ffe76e7c16
Merge pull request #8592 from UtahDave/develop
...
Add missing import
2013-11-16 12:27:45 -08:00
David Boucha
637bfacea7
Add missing import
2013-11-16 13:26:20 -07:00
David Boucha
9fa292cd23
Merge pull request #8591 from UtahDave/develop
...
Use wmi instead of netsh to determine dns servers
2013-11-16 12:16:45 -08:00
David Boucha
c7e140d1a3
Use wmi instead of netsh to determine dns servers
2013-11-16 13:13:58 -07:00
Emil Stenqvist
7ec6bfbb8b
Issue #8053
...
- YAML exceptions are now re-reaised as SaltRenderErrors
- Duplicate ID's in single state files now result in errors, and not
just warnings. This is now consistent with the how conflicting ID's in
separate state files are handled.
2013-11-16 15:40:34 +01:00
Emil Stenqvist
c27bd94162
Improved error message on SaltRenderError
...
Now including the state file in which the RenderError occured. This
makes it easier to track down e.g. YAML syntax errors.
2013-11-16 15:40:34 +01:00
Joseph Hall
ae7e8136db
Merge pull request #8586 from gravyboat/develop
...
Tons of documentation fixes for salt_bootstrap tutorial, states P1 tutorial, and the macosx walkthrough.
2013-11-16 05:40:44 -08:00
Forrest Alvarez
29147e49f1
Tons of small fixes/changes to the macosx walkthrough, including grammatical fixes, syntax, and wording. Also made sure no lines go past 79 characters.
2013-11-16 08:10:25 +00:00
Forrest Alvarez
34ea2ccf50
Merge remote branch 'upstream/develop' into develop
2013-11-16 06:59:58 +00:00
Thomas S Hatch
2053437ac7
Add CLI Examples to openstack_config execution module
2013-11-15 22:27:37 -07:00
Thomas S Hatch
e973adebab
A few more lint fixes
2013-11-15 22:15:48 -07:00
Forrest Alvarez
8c4c477ac6
Merge remote branch 'upstream/develop' into develop
2013-11-16 05:15:47 +00:00
Forrest Alvarez
36b8310722
updated the first part of the states tutorial it was not obvious enough that the package name needed to be different to an IRC user, and this caused issues as they tried to set it up their first time.
2013-11-16 05:15:34 +00:00
Thomas S Hatch
e73a2b3047
Clean up quote import and some pylint fixes
2013-11-15 22:11:17 -07:00
Thomas S Hatch
73bc487f65
pylint fixes for openstack_config state
2013-11-15 21:56:01 -07:00
Thomas S Hatch
2e41127aa6
No ret value in routine
2013-11-15 21:52:34 -07:00
Thomas S Hatch
68660dcb33
Merge pull request #8575 from jcollie/openstack-config
...
Add module and state for managing OpenStack configuration files.
2013-11-15 20:48:36 -08:00
Forrest Alvarez
a926461256
updated salt_bootstrap tutorial with some grammatical fixes, and formatting fixes.
2013-11-16 04:47:26 +00:00
Thomas S Hatch
22bf2418bf
Merge pull request #8573 from flupke/patch-1
...
Add https in recognized protos for distant hash_source in salt.modules.get_managed()
2013-11-15 20:46:29 -08:00
Thomas S Hatch
78df157504
Merge pull request #8572 from jcollie/depends-typo
...
fix funcion => function typos
2013-11-15 20:45:41 -08:00
David Boucha
1e8dcd23b7
Merge pull request #8584 from UtahDave/develop
...
Fix typo. The dict is 'grains' not 'grain'
2013-11-15 20:19:26 -08:00
David Boucha
32f5afc175
Fix typo. The dict is 'grains' not 'grain'
2013-11-15 21:18:14 -07:00
Joseph Hall
9a96ab3aa2
Merge pull request #8582 from techhat/cloudapi
...
Fixing up old event firers
2013-11-15 18:46:48 -08:00
Joseph Hall
1bb87186a9
Fixing up old event firers
2013-11-15 19:43:01 -07:00
Heewa Barfchin
10b6734aaa
Verify pillar from master on minion.
...
In some cases, it's possible for minion to get an invalid pillar from master,
through a mostly valid reply. Check that at least it's a dict, otherwise later
code tries to do lookups in it and fails confusingly.
2013-11-15 18:21:45 -05:00
Seth House
276fcdd66c
Merge pull request #8577 from basepi/selinuxfaq
...
Add FAQ about SELinux, Fix #8545
2013-11-15 14:32:29 -08:00
Seth House
f026e1977c
Added (very) basic docs on adding wheel/runner modules to eauth docs
2013-11-15 15:19:11 -07:00
Seth House
5add97e36b
Added cross-reference to the ACL docs
2013-11-15 15:19:11 -07:00
Colton Myers
6f4372e5b6
Add FAQ about SELinux, Fix #8545
2013-11-15 15:13:05 -07:00
Thomas S Hatch
dd2ad399f3
set a few more salt cloud default arguments in the api
2013-11-15 15:04:51 -07:00
