valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,664 Commits 24 Branches 182 Tags 341 MiB
20fc878f85
Commit Graph

38664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jfindlay
f0b78e2b1b Merge pull request #22109 from twangboy/win_install_ini 
Pull minion config settings from minion conf
 2015-03-28 11:18:45 -06:00
Evan Borgstrom
181df2e489 Fix a bug with the implicit list handling in pyobjects requisites 
When specifying a requisite and you only need to list a single item you
can specify it without being wraped in a list and we will handle it
automatically.  This was being handled when we built our attrs to output
the final data, but this failed when you extended a require requisite
inside of a context manager.
 2015-03-27 21:04:00 -07:00
twangboy
de85a03add Pull minion config settings from minion conf 2015-03-28 00:14:01 +00:00
jfindlay
6e5d0b4990 Merge pull request #22074 from borgstrom/pyobjects-reqs-2014.7 
Fix requisites missing from pyobjects that were introduced in 2014.7
 2015-03-27 12:51:07 -06:00
jfindlay
5a0f056e90 Merge pull request #22077 from ticosax/fix-doc-string 
states.docker: fix docstring
 2015-03-27 08:15:25 -06:00
Nicolas Delaby
6b96491a00 fix docstring 2015-03-27 10:06:08 +01:00
Evan Borgstrom
761eb5f7a1 Fix missing requisites that were introduced in 2014.7 2015-03-26 23:07:53 -07:00
Todd Stansell
7d5ce28b63 add appropriate exception types we might expect 2015-03-26 11:59:19 -07:00
Nicole Thomas
3423ec4568 Merge pull request #22053 from basepi/fixchef 
[2014.7] Don't use function call for default argument in chef.py
 2015-03-26 12:54:32 -06:00
Nicole Thomas
b636dbbc66 Merge pull request #22051 from twangboy/2014.7 
Fixed wmi issue
 2015-03-26 12:36:38 -06:00
Colton Myers
63648b4d30 Fix the lint 2015-03-26 12:34:49 -06:00
Colton Myers
89b9cc6812 Don't use function call for default argument 2015-03-26 12:17:00 -06:00
twangboy
c46fced173 Fixed wmi issue 2015-03-26 17:24:44 +00:00
Colton Myers
ddc7cebf2a Merge pull request #22042 from basepi/2014.7.4releasenotes 
[2014.7] Add 2014.7.4 release notes
 2015-03-26 09:04:00 -06:00
Colton Myers
74dcd7df1c Add 2014.7.4 release notes 2015-03-26 09:03:35 -06:00
Nicole Thomas
ba0044dd7b Merge pull request #22035 from 0xf10e/patch-1 
Icehouse Keystone may raise AuthorizationFailure instead of Unauthorized
 2015-03-26 09:03:28 -06:00
Mike Place
b3b6f94e33 Merge pull request #22020 from UtahDave/2014.7local 
fix bug where can't restart salt-minion
 2015-03-26 09:01:44 -06:00
Thomas S Hatch
516e10f405 Merge pull request #22007 from twangboy/win_installer 
Checks for existing installation and prompts to remove
 2015-03-26 08:31:10 -06:00
Thomas S Hatch
f8e130f6b1 Merge pull request #22012 from basepi/tmpfile-chef 
[2014.7] Create randomized logfile name in windows for chef.py
 2015-03-26 08:30:21 -06:00
0xf10e
4d7fc7bc06 Icehouse Keystone may raise AuthorizationFailure instead of Unauthorized 
Hi,

I'm seeing this exception on the OpenStack controller in my testbed:
```
2015-03-26 14:06:18,667 [salt.state       ][ERROR   ] An exception occurred in this state: Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/state.py", line 1531, in call
    **cdata['kwargs'])
  File "/usr/lib/python2.7/dist-packages/salt/states/keystone.py", line 164, in user_present
    **connection_args):
  File "/usr/lib/python2.7/dist-packages/salt/modules/keystone.py", line 819, in user_verify_password
    userauth = client.Client(**kwargs)
  File "/usr/lib/python2.7/dist-packages/keystoneclient/v2_0/client.py", line 144, in __init__
    self.authenticate()
  File "/usr/lib/python2.7/dist-packages/keystoneclient/utils.py", line 318, in inner
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/keystoneclient/httpclient.py", line 392, in authenticate
    resp = self.get_raw_token_from_identity_service(**kwargs)
  File "/usr/lib/python2.7/dist-packages/keystoneclient/v2_0/client.py", line 179, in get_raw_token_from_identity_service
    "%s" % e)
AuthorizationFailure: Authorization Failed: A username and password or token is required.
```

I'm working with OpenStack Icehouse for months. At some minor update to Keystone in 
OpenStack Icehouse not too long ago they've changed the exception raised by the 
`keystoneclient` module. 
Thus my state for the service user for Nova started to fail on every consecutive run.
Making the function return `False` on AuthorizationFailure, too, fixes the issue.

Btw: The problem seems to be present in the "2015.2" and the "develop" branche, too.

Regards, Florian
 2015-03-26 14:27:03 +01:00
Shane Lee
2605223e44 Update Salt-Minion-Setup.nsi 2015-03-26 07:03:51 -06:00
Shane Lee
9579bb2a8d Update Salt-Minion-Setup.nsi 2015-03-26 07:02:16 -06:00
Todd Stansell
9aa36dc974 fix whitespace - replace tabs with spaces 2015-03-25 22:47:40 -07:00
David Boucha
49188a091e fix bug where can't restart salt-minion 
If an attempt is made to restart the salt-minion service, Salt will
now create a scheduler job to restart the minion.

Fixes #21961
 2015-03-25 22:38:26 -06:00
jfindlay
decd53bfd2 Merge pull request #22022 from garethgreenaway/21992_2014_7_tmpfs_bind_mount 
more fixes to mount.py state module
 2015-03-25 20:34:48 -06:00
Todd Stansell
f6a81da16f fix #21397 - force glibc to re-read resolv.conf 2015-03-25 19:32:32 -07:00
Mike Place
51c662bcf1 Merge pull request #22016 from basepi/tmpfile-serverdensity_device 
[2014.7] Move install.sh to cachedir for serverdensity_device
 2015-03-25 20:25:17 -06:00
Gareth J. Greenaway
0060764b50 Fixing issues when using tmpfs and bind mounts. 2015-03-25 16:07:36 -07:00
twangboy
d3cb6ddcd5 Accounted for silent install 2015-03-25 16:27:41 -06:00
twangboy
6bfe6fd4f6 Checks for existing installation and prompts to remove 2015-03-25 16:27:41 -06:00
Colton Myers
22d2f7a1ec Use cachedir 2015-03-25 16:01:20 -06:00
jfindlay
e9c9f9dc4b Merge pull request #22015 from rallytime/bp-21947 
Backport #21947 to 2014.7
 2015-03-25 15:59:09 -06:00
jfindlay
f6897828fb Merge pull request #22014 from garethgreenaway/21888_2014_7_mount_label_remount_madness 
Fixes to mount.py state module
 2015-03-25 15:58:35 -06:00
Colton Myers
e11298d715 Move install.sh to cachedir for serverdensity_device 2015-03-25 14:48:56 -06:00
Damian Myerscough
ccf457ce6f Ensure nginx config check passes by checking the exit status.... Nginx writes messages to stderr even when there are no errors 2015-03-25 14:43:51 -06:00
Gareth J. Greenaway
93f0c2063b We do not have to lower() the label. 2015-03-25 13:43:03 -07:00
Gareth J. Greenaway
98aaf358d7 Adding some code to be able to properly handle the situation when disk labels are being used for the device. 2015-03-25 13:41:07 -07:00
Colton Myers
b49d0d4b5c Create randomized logfile name in windows for chef.py 2015-03-25 14:29:26 -06:00
Nicole Thomas
5fd1705e8a Merge pull request #22002 from basepi/bp-21703 
[2014.7] Backport #21703
 2015-03-25 13:08:31 -06:00
Colton Myers
1470382545 Catch TypeErrors from cmd.run jid_file functionality in salt-ssh 2015-03-25 12:05:58 -06:00
jfindlay
c76ea26943 Merge pull request #21994 from twangboy/os_ver_15051 
Used WMI to detect real osversion in Windows
 2015-03-25 11:50:22 -06:00
twangboy
2665ad4ca6 Used WMI to detect real osversion in Windows 2015-03-25 10:39:37 -06:00
Thomas S Hatch
6424984ee3 Merge pull request #21974 from tjstansell/fix-21952-2014.7 
fixes #21952 - only read ssh host_key header for legacy binary format
 2015-03-25 08:41:21 -06:00
Thomas S Hatch
7e36c57044 Merge pull request #21972 from tjstansell/fix-21971 
fix #21971 - ssh_host_key.pub should return as key.pub not key.pub.pub
 2015-03-25 08:40:45 -06:00
Todd Stansell
383e21bc7b fix #21971 - ssh_host_key.pub should return as key.pub not key.pub.pub 2015-03-24 23:46:56 -07:00
Todd Stansell
4aaacfde40 fixes #21952 - only read ssh host_key header for legacy binary format of private key 2015-03-24 23:20:47 -07:00
jfindlay
b409209b47 Merge pull request #21968 from ryanwohara/2014.7 
Verifying the key has a value before using it.
 2015-03-24 22:03:08 -06:00
jfindlay
dd37f431fb Merge pull request #21962 from rallytime/apply_nested_outputter_fix_to_2014.7 
Apply nested outputter optimization fix to 2014.7
 2015-03-24 22:02:11 -06:00
Ryan W. O'Hara
cbb09b0a14 Verifying the key has a value before using it. 2015-03-24 22:44:05 -04:00
Nicole Thomas
d768fe8ec4 Merge pull request #21965 from basepi/salt-ssh.file.recurse.21922 
[2014.7] Catch msgpack error in file.recurse in salt-ssh
 2015-03-24 19:27:47 -06:00