C. R. Oldham
47a9459394
Remove linodepy.py in favor of linode.py
2015-03-13 11:29:22 -06:00
David Boucha
ad1768ce46
make sure arg, tgt, and tgt_type are passed thru
2015-03-13 11:18:13 -06:00
David Boucha
3611658b29
pass thru fun and fun_args if they exist
2015-03-13 11:15:14 -06:00
Aneesh Agrawal
b28dba2ecd
Teach file.check_perms to handle uids and gids.
...
Fixes #21423 . Allow passing in numeric values for user and group.
2015-03-13 10:10:23 -06:00
jfindlay
74b9ec2be0
Merge pull request #21621 from tjstansell/fix-21620
...
fixed #21620 so delay: 0 works correctly for network.managed interfaces
2015-03-13 09:23:41 -06:00
Thomas S Hatch
eb12f11a7b
Merge pull request #21605 from highlyunavailable/tar_args
...
Fix tar state options
2015-03-13 09:15:33 -06:00
Thomas S Hatch
dc4e90ffd5
Merge pull request #21593 from jfindlay/deb_ip_mode
...
add 802.3ad to debian_ip tunnel modes
2015-03-13 09:15:16 -06:00
Todd Stansell
bb63049578
fixed #21620 so delay: 0 works correctly for network.managed interfaces
2015-03-12 22:54:45 -07:00
Tiru Srikantha
133318fb43
Fix tar state options
...
Fixes #20795 as per discussion at
13f187fc5f
2015-03-12 13:19:14 -07:00
David Boucha
14efe708f3
Merge pull request #21600 from eliasp/2014.7-salt.modules.win_ntp-parsing-NtpServer
...
Fix parsing of NTP servers on Windows.
2015-03-12 14:10:47 -06:00
Elias Probst
60675dee9d
Fix parsing of NTP servers on Windows.
...
The output of `w32tm /query /configuration` contains (amongst others)
those two lines:
```
NtpServer: 1.europe.pool.ntp.org 0.europe.pool.ntp.org 2.europe.pool.ntp.org (Local)
NtpServer (Local)
```
On a system, where no NTP was configured yet, only the 2nd line is
present.
The current code of `salt.modules.win_ntp` didn't take this into account
and the match for `NtpServer` wasn't strict enough to ensure only the
first line would be parsed, so it ended up attemtping to `.split()` the
2nd line.
This lead to this result:
```
Comment: An exception occurred in this state: Traceback (most recent call last):
File "salt/state.py", line 1529, in call
File "salt/states/ntp.py", line 71, in managed
File "salt/states/ntp.py", line 50, in _get_servers
File "salt/modules/win_ntp.py", line 72, in get_servers
ValueError: need more than 1 value to unpack
```
This commit improves the matching by using `.startswith('NtpServer:')` instead.
2015-03-12 20:17:18 +01:00
Justin Findlay
01d60563e7
add 802.3ad to debian_ip tunnel modes
...
Implements #21239 on 2014.7.
2015-03-12 11:58:47 -06:00
Thomas S Hatch
4d958f8677
Merge pull request #21544 from RobertFach/fix-21543-blockdev-tune-issue
...
fix blockdev.tune issue, where blockdev.tune doesn't report changes for ...
2015-03-12 10:14:16 -06:00
jfindlay
d4f419a2e6
Merge pull request #21587 from RobertFach/fix-21546-blockdev-tune-state-change-issue
...
Fix 21546 blockdev tune state change issue
2015-03-12 09:56:57 -06:00
Robert Fach
f89f23c973
fixing pylint issues, sorry
2015-03-12 14:52:56 +00:00
Robert Fach
c2048152aa
made blockdev.tune state change detection output pretty
2015-03-12 14:26:19 +00:00
Robert Fach
5c526b2670
added change detection for block device tune, reformatting
2015-03-12 12:47:28 +00:00
Robert Fach
0bced7a2ca
added change detection for block device tune
2015-03-12 12:35:40 +00:00
Robert Fach
370bf5276e
Merge branch 'fix-21543-blockdev-tune-issue' into fix-21546-blockdev-tune-state-change-issue
2015-03-12 12:30:45 +00:00
Robert Fach
a8873d0427
fixed pylint issue with comparison to True
2015-03-12 00:42:43 +00:00
Pedro Algarvio
208b2697c6
Merge pull request #21568 from jfindlay/setup_attrs
...
Don't obfuscate internal distutils attributes
2015-03-12 00:36:47 +00:00
Thomas S Hatch
f3ec86f855
Merge pull request #21514 from rallytime/manually_backport_21489
...
Apply fix from #21489 to the 2014.7 branch
2015-03-11 15:05:57 -06:00
Thomas S Hatch
44df93dad1
Merge pull request #21562 from cro/bp-21283
...
Backport 21283 from develop.
2015-03-11 15:05:43 -06:00
Thomas S Hatch
4873382184
Merge pull request #21487 from rallytime/bp-21469
...
Backport #21469 to 2014.7
2015-03-11 15:05:08 -06:00
Justin Findlay
e6f8ea3c7c
Don't obfuscate internal distutils attributes
...
Related to #21559 , fixes #21522 .
2015-03-11 14:54:47 -06:00
jfindlay
979ed6628e
Merge pull request #21559 from s0undt3ch/hotfix/issues-21522
...
Don't obfuscate the internal version attribute
2015-03-11 14:36:36 -06:00
jfindlay
70608d8f9e
Merge pull request #21557 from s0undt3ch/2014.7
...
[2014.7] Update the bootstrap script to latest stable, v2015.03.15
2015-03-11 14:27:18 -06:00
Thomas S Hatch
0d278a4746
Merge pull request #21523 from jfindlay/bp-21481
...
backport #21481 to 2014.7
2015-03-11 14:21:33 -06:00
Thomas S Hatch
2fa41897ad
Merge pull request #21555 from xclusv/2014.7-fix-21491
...
Fix for issue #21491
2015-03-11 14:21:18 -06:00
Thomas S Hatch
8cd484901d
Merge pull request #21564 from eliasp/patch-1
...
Typo (rendered → renderer)
2015-03-11 14:20:12 -06:00
Elias Probst
bc9a30b7e9
Typo (rendered → renderer)
2015-03-11 21:15:32 +01:00
Daniel Wallace
470bc06835
remove extra log.debug
2015-03-11 13:23:18 -06:00
Daniel Wallace
f049fe855b
change deafult for kwargs
...
To None?
2015-03-11 13:23:18 -06:00
Daniel Wallace
739935c246
pass kwargs so that fixed networks can be set
2015-03-11 13:23:18 -06:00
Daniel Wallace
fdcd4a03f7
split out setting up networks
2015-03-11 13:22:45 -06:00
Pedro Algarvio
e5a7158069
Don't obfuscate the internal version attribute
...
Fixes #21522
2015-03-11 19:21:59 +00:00
Daniel Wallace
1270a2bd3f
need to use data for changing password
2015-03-11 13:21:08 -06:00
Daniel Wallace
4b417f748c
use ex_set_password
2015-03-11 13:21:08 -06:00
Daniel Wallace
8d34dcd09c
use ex_get_node_details if instance_id is specified
2015-03-11 13:21:08 -06:00
Ross Perkins
d473408074
composer.install module does not support always_check, only the state does. Removing the test on the module.
2015-03-11 12:19:17 -07:00
Pedro Algarvio
397f45ede4
Update the bootstrap script to latest stable, v2015.03.15
...
* Add multi-master support. Thanks Fred Reimer(freimer). saltstack/salt-boostrap#555
2015-03-11 19:09:09 +00:00
rallytime
e4b33ef121
Move minidom import out of try block
2015-03-11 12:43:31 -06:00
Ross Perkins
ee1a8d7ad0
Fix lint issue.
2015-03-11 11:36:34 -07:00
Ross Perkins
3f3218d853
Fix for issue #21491
2015-03-11 11:33:39 -07:00
Thomas S Hatch
a531ab0066
Merge pull request #21551 from robgott/fix-s3.head-returning-none
...
updated s3.query function to return headers for successful requests
2015-03-11 12:12:19 -06:00
Thomas S Hatch
0eb66a36cb
Merge pull request #21162 from cro/linode-python-driver2
...
Update linode salt-cloud driver to support using either linode-python or apache-libcloud
2015-03-11 11:45:15 -06:00
Rob Gott
8999148da0
updated s3.query function to return headers array for successful requests
...
fixes issue with s3.head returning None for files that exist
2015-03-12 03:02:22 +10:00
Robert Fach
d29bb2f24a
fix blockdev.tune issue, where blockdev.tune doesn't report changes for read-write option and where it didn't translate boolean options properly, causing the underlying blockdev call to fail
2015-03-11 16:22:18 +00:00
David Boucha
3012e98577
Merge pull request #21536 from eliasp/2014.7-salt.states.win_update.py-typo
...
Correct typo ('win_update.install' → 'win.update_installed').
2015-03-11 09:17:28 -06:00
Elias Probst
0b02396224
Correct typo ('win_update.install' → 'win.update_installed').
2015-03-11 09:49:15 +01:00
