Commit Graph

47327 Commits

Author SHA1 Message Date
Colton Myers
8de3dceeec Revert "Initialize state file client after pillar loading"
This reverts commit 31b98e72eb.
2015-04-23 14:09:22 -06:00
Colton Myers
c896b165d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-22 14:21:21 -06:00
Justin Findlay
89fa18500c Merge pull request #22955 from terminalmage/dockerio-run-fix
Fix regression introduced yesterday in dockerio module
2015-04-22 12:56:39 -06:00
Justin Findlay
46ef227911 Merge pull request #22954 from rallytime/bp-22909
Backport #22909 to 2014.7
2015-04-22 12:56:20 -06:00
Erik Johnson
b4472ad1b2 Fix regression introduced yesterday in dockerio module
This fixes a problem introduced in 8ddbc20, I left out the double-dash
between the nsenter arguments and the command to run via nsenter.
2015-04-22 12:13:47 -05:00
mguegan
70c1cd3969 Fix compatibility with pkgin > 0.7
- Add testing for parsing ability
- Fix broken parser for :
  - pkg.list_pkgs
  - pkg.search

Sample of bad parsing :

[INFO    ] Executing command '/usr/sbin/zfs help || :' in directory '/root'
[INFO    ] Executing command '/opt/local/bin/pkgin -v' in directory '/root'
[INFO    ] Executing command '/opt/local/bin/pkgin se ^memcached$' in directory
'/root'

local:
     ----------
     memcached-1.4.21;=;High:
         performance
2015-04-22 11:13:31 -06:00
Colton Myers
63119f9505 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    salt/modules/dockerio.py
    salt/modules/localemod.py
    salt/modules/useradd.py
2015-04-22 10:51:49 -06:00
Thomas S Hatch
c9ae593461 Merge pull request #22856 from jfindlay/route53_timeout
increase timeout and decrease tries for route53 records
2015-04-22 10:47:01 -06:00
Mike Place
a0cfd8573f Merge pull request #22947 from garethgreenaway/22571_2015_2_schedule_pillar_refresh_seconds_exceptions
Fixes to scheduler
2015-04-22 10:26:10 -06:00
Thomas S Hatch
a178d444b8 Merge pull request #22946 from s0undt3ch/2014.7
Test with a more recent pip version to avoid a traceback
2015-04-22 10:25:17 -06:00
Mike Place
de339bef0a Merge pull request #22945 from garethgreenaway/22571_2014_7_schedule_pillar_refresh_seconds_exceptions
Fixes to scheduler
2015-04-22 10:25:00 -06:00
Thomas S Hatch
0287c439bb Merge pull request #22912 from thatch45/loader_fix
late init the lazy loader
2015-04-22 09:50:48 -06:00
Thomas S Hatch
12d2b91d85 Merge pull request #22887 from hvnsweeting/18843-fix-user-present-home
fix #18843
2015-04-22 09:47:05 -06:00
Mike Place
b7de7bdf47 Merge pull request #22930 from jfindlay/localegen_bool
localemod.gen_locale now always returns a boolean
2015-04-22 09:37:39 -06:00
Mike Place
a2d2a5b3cb Merge pull request #22931 from jacksontj/2015.2
Cleanup jinja attribute access for loader
2015-04-22 09:35:29 -06:00
Mike Place
11bcf14979 Merge pull request #22933 from hvnsweeting/18843-test
add test for #18843
2015-04-22 09:27:18 -06:00
Gareth J. Greenaway
595bc284b7 Fixing a reported issue when using a scheduled job from pillar with splay. _seconds element that acted as a backup of the actual seconds was being removed when pillar was refreshed│··································
and causing exceptions.  This fix moves some splay related code out of the if else condition so it's checked whether the job is in the job queue or not.
2015-04-22 08:17:04 -07:00
Pedro Algarvio
bc87749e2c Test with a more recent pip version to avoid a traceback
```
07:39:05,449 [salt.minion                                :1178][ERROR   ] A command in 'pip.list' had a problem: Traceback (most recent call last):
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/bin/pip", line 9, in <module>
    load_entry_point('pip==1.3.1', 'console_scripts', 'pip')()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 546, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2666, in load_entry_point
    return ep.load()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2339, in load
    return self.resolve()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2345, in resolve
    module = __import__(self.module_name, fromlist=['__name__'], level=0)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/__init__.py", line 13, in <module>
    from pip.commands import commands, get_similar_commands, get_summaries
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/__init__.py", line 6, in <module>
    from pip.commands.bundle import BundleCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/bundle.py", line 5, in <module>
    from pip.commands.install import InstallCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/install.py", line 5, in <module>
    from pip.req import InstallRequirement, RequirementSet, parse_requirements
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/__init__.py", line 3, in <module>
    from .req_install import InstallRequirement
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/req_install.py", line 20, in <module>
    import pip.wheel
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/wheel.py", line 23, in <module>
    from pip.exceptions import InvalidWheelFilename, UnsupportedWheel
ImportError: cannot import name InvalidWheelFilename
```
2015-04-22 16:13:58 +01:00
Gareth J. Greenaway
bfa6d25ed8 Fixing a reported issue when using a scheduled job from pillar with splay. _seconds element that acted as a backup of the actual seconds was being removed when pillar was refreshed and causing exceptions. This fix moves some splay related code out of the if else condition so it's checked whether the job is in the job queue or not. 2015-04-22 08:08:36 -07:00
Justin Findlay
2589e15e5c Merge pull request #22938 from jayeshka/powerpath-unit-test
adding powerpath unit test case
2015-04-22 08:51:39 -06:00
Justin Findlay
a70fa267b1 Merge pull request #22936 from jayeshka/boto_dynamodb-states-unit-test
adding states/boto_dynamodb unit test case
2015-04-22 08:49:52 -06:00
Justin Findlay
ce1a880025 Merge pull request #22935 from jayeshka/boto_cloudwatch_alarm-states-unit-test
adding states/boto_cloudwatch_alarm unit test case
2015-04-22 08:48:19 -06:00
Justin Findlay
3e31385318 Merge pull request #22934 from jayeshka/boto_asg-states-unit-test
adding states/boto_asg unit test case
2015-04-22 08:47:41 -06:00
Jayesh Kariya
5a5c7ef415 adding powerpath unit test case 2015-04-22 17:38:44 +05:30
Jayesh Kariya
650435ec44 adding states/boto_dynamodb unit test case 2015-04-22 16:17:29 +05:30
Jayesh Kariya
4e5a101647 adding states/boto_cloudwatch_alarm unit test case 2015-04-22 16:15:54 +05:30
Jayesh Kariya
f78374e34a adding states/boto_asg unit test case 2015-04-22 16:13:14 +05:30
Viet Hung Nguyen
b13db32fde add test for #18843 2015-04-22 16:21:23 +07:00
Viet Hung Nguyen
7fe7b089fd run user.chhome once to avoid any side-effect when run it twice 2015-04-22 13:39:09 +07:00
Viet Hung Nguyen
19de9954ee clarify the usage of home arg
it is not always the dir will be managed by salt
2015-04-22 12:46:15 +07:00
Viet Hung Nguyen
d6dc09af64 enhance doc, as usermod on ubuntu 12.04 will not CREATE home 2015-04-22 12:46:15 +07:00
Viet Hung Nguyen
0ce4d7feb6 refactor: force to use boolean 2015-04-22 12:46:15 +07:00
Viet Hung Nguyen
849d19edd7 log debug the creating dir process 2015-04-22 12:46:14 +07:00
Viet Hung Nguyen
c4e95b9f48 fix #18843: usermod won't create a dir if old home does not exist
usermod only MOVE old home to new path. So create home dir by salt.
2015-04-22 12:46:04 +07:00
Thomas Jackson
98af7c3f95 Cleanup jinja attribute access for loader
Refactor of #22723
2015-04-21 22:39:17 -07:00
Justin Findlay
399399f89e localemod.gen_locale now always returns a boolean
Related to #22829, also fixes #21140.
2015-04-21 22:31:56 -06:00
Justin Findlay
6890752dd3 Merge pull request #22925 from rallytime/bp-22895
Backport #22895 to 2014.7
2015-04-21 20:30:26 -06:00
Justin Findlay
4db13ee454 Merge pull request #22924 from rallytime/bp-22829
Backport #22829 to 2015.2
2015-04-21 20:29:56 -06:00
Justin Findlay
049276af44 Merge pull request #22921 from s0undt3ch/hotfix/lint-2015.2
Another PEP-8 preciosity disabled
2015-04-21 20:28:42 -06:00
Justin Findlay
53001566e0 Merge pull request #22882 from freimer/issue_22880
Fix for issue #22880, this should be **kwarg, not kwarg=None.
2015-04-21 20:28:03 -06:00
rallytime
3852d96213 Pylint fix 2015-04-21 19:19:08 -06:00
Alexandre Letourneau
90f7829ad3 Fixed pylint issues 2015-04-21 19:18:48 -06:00
Alexandre Letourneau
5ebf159554 Cleaned up pull request 2015-04-21 19:18:39 -06:00
Alexandre Letourneau
a08ac478f6 pam_tally counter was not reset to 0 after a succesfull login 2015-04-21 19:17:47 -06:00
Felix Dreissig
468d392074 Adjust tests to the new return value of modules.localemod.gen_locale() 2015-04-21 19:11:33 -06:00
Felix Dreissig
16136f49ec Always return a boolean in modules.localemod.gen_locale()
This makes the behavior consistent with set_locale() and the error case.
states.locale.present() already expects a boolean return value;
therefore, this will probably resolve saltstack/salt#21140.
2015-04-21 19:10:43 -06:00
Nicole Thomas
522d1d8468 Merge pull request #22917 from twangboy/upd_icon
Updated icon file for windows
2015-04-21 18:56:47 -06:00
Nicole Thomas
eca37ebc11 Merge pull request #22914 from cachedout/issue_22790
Call proper returner function in jobs.list_jobs
2015-04-21 18:49:01 -06:00
Nicole Thomas
44f3409b01 Merge pull request #22918 from JaseFace/git-pillar-provider-doc-note
Add a note to the git_pillar docs stating that GitPython is the only currently supported provider
2015-04-21 18:48:26 -06:00
Nicole Thomas
2793ad667b Merge pull request #22911 from rallytime/test_fixes
Fix some Python 2.6-related test failures on 2015.2
2015-04-21 18:44:37 -06:00