David Boucha
351ae08d3b
Handle setting static ip same as current dhcp ip
2013-11-19 03:44:20 -07:00
David Boucha
52911ff6ec
only set gateway and ip if statically set
2013-11-19 03:09:21 -07:00
David Boucha
f7c3ae31e4
make dhcp logically possible
2013-11-19 02:35:32 -07:00
David Boucha
63100f6e34
Properly detect dhcp ip and dns status
2013-11-19 00:59:31 -07:00
David Boucha
d12dd21288
Merge pull request #8622 from UtahDave/develop
...
Ensure Windows salt-minion service started
2013-11-18 22:26:28 -08:00
Thomas S Hatch
082d3f38f2
Handle case where vm is not found when migrating
2013-11-18 23:05:25 -07:00
David Boucha
7e1feb7437
Fix comment
2013-11-18 23:03:56 -07:00
David Boucha
3dce720e13
Ensure windows salt-minion service started
2013-11-18 23:02:07 -07:00
Erik Johnson
1ce0b5b5fa
Remove unnecessary build requirement
2013-11-18 21:20:29 -06:00
Erik Johnson
d5604b3629
Update spec file for 0.17.2
2013-11-18 20:53:29 -06:00
Thomas S Hatch
0a50b5a519
Verify that the resolvdir is present
2013-11-18 17:50:39 -07:00
Thomas S Hatch
5b4962ea7b
Cleanly handle linked resolv.conf files
2013-11-18 17:47:20 -07:00
Thomas S Hatch
815758c827
Verify the resolv.conf in mounted images
2013-11-18 17:38:53 -07:00
Colton Myers
58f7bb6279
Merge pull request #8618 from basepi/geteventdocs
...
Update api.get_event docs to match SaltEvent.get_event
2013-11-18 15:43:02 -08:00
Colton Myers
41e9d98ba6
Update api.get_event docs to match SaltEvent.get_event
...
Ref #8524
2013-11-18 16:41:39 -07:00
Thomas S Hatch
89d0c9d974
Catch virt os.errors and return a failure
2013-11-18 16:24:13 -07:00
Thomas S Hatch
d287ca7776
Add check for the validity of return data
2013-11-18 15:56:20 -07:00
Joseph Hall
7e18d042a5
Merge pull request #8613 from techhat/cloudapi
...
Provide a default conf_dir to look in for cloud.deploy.d
2013-11-18 12:44:00 -08:00
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
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
