Andreas Lutro
9193676f9c
fix ssh_auth_test
...
there were 4 side_effect return values, when it should only return 2
times - 2 of the 4 states.ssh_auth.absent calls are done with test=True
test=True and should therefore not call modules.ssh.rm_auth_key
2015-11-30 20:13:52 +01:00
Andreas Lutro
febbfa792f
prevent ssh_auth.absent from running when test=True
...
fixes #29262
2015-11-30 11:53:06 +01:00
Justin Findlay
b225263279
Merge pull request #29208 from whytewolf/glance_more_profile_errors
...
Glance more profile errors
2015-11-25 16:50:27 -07:00
Mike Place
6d3c04516f
Merge pull request #29200 from jfindlay/singular_umount
...
mount state: unmount by device is optional
2015-11-25 13:03:22 -07:00
Mike Place
fffcf9fef6
Merge pull request #29205 from trevor-h/fix-salt-cloud-winrm-ec2
...
Fixes #29187 - using winrm on EC2
2015-11-25 13:00:01 -07:00
Mike Place
1937a47dec
Merge pull request #29170 from cachedout/refactor_pydsl_test
...
Migrate pydsl tests to integration test suite
2015-11-25 12:56:48 -07:00
Thomas Phipps
c8fe514ec1
found 3 more spots where the profile was not being passed through.
2015-11-25 11:31:30 -08:00
Thomas Phipps
b2e3c1f8de
Merge pull request #1 from saltstack/2015.8
...
2015.8
2015-11-25 11:17:52 -08:00
Trevor Hammond
48e0edd0d2
Fixes #29187 - using winrm on EC2
2015-11-25 18:36:45 +00:00
Mike Place
11d68f7b1c
Merge pull request #29198 from jfindlay/single_mtu
...
rh_ip module: only set the mtu once
2015-11-25 11:11:09 -07:00
Mike Place
f19355e0bb
Merge pull request #29135 from jfindlay/ssh_except
...
ssh_known_hosts.present state: catch not found exc
2015-11-25 11:10:43 -07:00
Mike Place
2477ff2eab
Add __init__ and pydsl test
2015-11-25 10:50:30 -07:00
Justin Findlay
b54de47b1b
mount state: unmount by device is optional
...
Fixes #29140 .
2015-11-25 10:25:19 -07:00
Mike Place
6a12197e13
Merge pull request #29196 from s0undt3ch/2015.8
...
We need novaclient imported to compare versions
2015-11-25 10:16:27 -07:00
Mike Place
063f075a99
Add integration renderer tests to the suite
2015-11-25 10:14:46 -07:00
Justin Findlay
0a8952f6ac
rh_ip module: only set the mtu once
...
Fixes #29137 .
2015-11-25 10:11:05 -07:00
Mike Place
0c0e15d4e9
Merge pull request #29059 from terminalmage/issue28072
...
Work around upstream pygit2 bug
2015-11-25 09:39:30 -07:00
Mike Place
cc69c87dd2
Merge pull request #29112 from eliasp/ssh_known_hosts.present-backtrace-test
...
Prevent backtrace (KeyError) in `ssh_known_hosts.present` state
2015-11-25 09:25:57 -07:00
Pedro Algarvio
78a7c34f2b
We need novaclient imported to compare versions
2015-11-25 16:25:55 +00:00
Mike Place
7775d65089
Merge pull request #29178 from whytewolf/glance_keystone_profile_fix
...
Profile not being passed to keystone.endpoint_get in _auth. so if a p…
2015-11-25 09:09:49 -07:00
Thomas Phipps
807dd426a6
Profile not being passed to keystone.endpoint_get in _auth. so if a profiles are being used, then keystone.endpoint_get will not be able to authenticate causing glance to not be able to get it's endpoint.
2015-11-24 23:10:06 -08:00
Justin Findlay
345206b68e
Merge pull request #29173 from jfindlay/2015.8
...
add 2015.8.3 release notes
2015-11-24 17:07:51 -07:00
Justin Findlay
212f7dd281
add 2015.8.3 release notes
2015-11-24 17:06:40 -07:00
Justin Findlay
cafbb49cb6
add note on 2015.8.2 release notes
2015-11-24 17:05:41 -07:00
Colton Myers
5e88e9e9c0
Merge pull request #29172 from basepi/philips_backport
...
[2015.8] Backport new philips_hue proxy features from develop
2015-11-24 16:52:55 -07:00
Colton Myers
1df6c3083b
Backport new philips_hue proxy features from develop
2015-11-24 16:09:00 -07:00
Mike Place
81bf332be4
Migrate pydsl tests to integration test suite
...
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.
The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
2015-11-24 15:46:14 -07:00
Colton Myers
2fb1ca0eac
Merge pull request #29167 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-24 14:40:34 -07:00
Colton Myers
525f9fbbbb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
2015-11-24 14:39:48 -07:00
Justin Findlay
a26c10a811
Merge pull request #29164 from jfindlay/bp-29113
...
Backport #29113
2015-11-24 14:26:17 -07:00
Justin Findlay
363add7131
ssh_known_hosts.present state: catch not found exc
...
Fixes #29111 .
2015-11-24 13:35:42 -07:00
Mark McGuire
50fab35188
kill unneeded import
2015-11-24 13:28:31 -07:00
Mike Place
68d6c454b8
Merge pull request #29141 from optix2000/full_sls_import
...
Add test case for require: sls with only import statements
2015-11-24 09:17:57 -07:00
Erik Johnson
82e223087e
Work around upstream pygit2 bug
...
See https://github.com/saltstack/salt/issues/28072 and
https://github.com/libgit2/pygit2/issues/583 .
Fixes #28072 .
2015-11-24 10:10:12 -06:00
Mike Place
732f5364a2
Merge pull request #29072 from terminalmage/issue28311
...
Several gitfs/git_pillar fixes
2015-11-24 09:04:39 -07:00
Mike Place
95689ee1a4
Merge pull request #29118 from ticosax/dockerng-network
...
[dockerng] Add networking capabilities
2015-11-24 08:47:36 -07:00
Mike Place
4b4f212d2d
Merge pull request #29145 from alprs/fix-duplicate_import
...
Remove duplicate import of salt.utils.s3
2015-11-24 08:36:05 -07:00
Mike Place
6079569580
Merge pull request #29148 from lomeroe/boto_route53_create_zone_fix-backport
...
correcting parameter calls to boto get_zone/create_zone functions in …
2015-11-24 08:33:53 -07:00
Nicolas Delaby
e98d18ba41
Expose docker networking as state
2015-11-24 13:55:22 +01:00
Nicolas Delaby
94135d91c3
cosmetic
2015-11-24 13:55:22 +01:00
Nicolas Delaby
17ff5c1ab5
Add expose networking to modules.dockerng
2015-11-24 13:55:22 +01:00
Ethan Moore
75408ccf99
correcting parameter calls to boto get_zone/create_zone functions in create_zone
...
parameter check on create_zone on private_zone=True
add boto version requirement
2015-11-24 11:54:42 +00:00
Andreas Lutro
e1101bea19
Remove duplicate import of salt.utils.s3
...
Closes #29144
2015-11-24 09:45:31 +01:00
Weilu Jia
596843e8d6
Add test case for sls with only import
...
Tests https://github.com/saltstack/salt/issues/10852
2015-11-23 18:27:56 -08:00
Justin Findlay
4f03196e7d
Merge pull request #29138 from jfindlay/2015.5
...
add 2015.5.8 release notes
2015-11-23 16:22:48 -07:00
Justin Findlay
be045f5cb1
add 2015.5.8 release notes
2015-11-23 16:21:45 -07:00
Elias Probst
3f19c311e8
Prevent backtrace (KeyError) in ssh_known_hosts.present state
...
When using `test=true`, the `ssh_known_hosts.present` state will run
into a backtrace because of an KeyError. Prevent that.
```
An exception occurred in this state: Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/salt/state.py", line 1591, in call
**cdata['kwargs'])
File "/usr/lib/python2.7/site-packages/salt/states/ssh_known_hosts.py", line 122, in present
config=config)
File "/usr/lib/python2.7/site-packages/salt/modules/ssh.py", line 827, in check_known_host
return ('exists' if fingerprint == known_host['fingerprint']
KeyError: 'fingerprint'
```
2015-11-23 21:26:02 +01:00
Erik Johnson
dae738fda3
Use common code to detect envs
...
This commit adds a parent-class function which makes the calculation of
environment names identical regardless of the provider being used. The
function simply accepts a list of the ref paths (i.e. refs/heads/foo,
refs/remotes/origin/bar, refs/tags/baz).
This commit also makes a slight tweak to how dulwich determines which
ref paths to use for env detection. Before it used any ref with a path
beginning with refs/heads or refs/tags, but this switches it to
refs/remotes so that the common logic introduced in the new function
described above works.
It seems that dulwich adds local heads for any remote heads pulled down
when the remote is fetched, which is why this would have worked for env
detection before.
This commit contains a more complete fix for #27432 , as an earlier
commit only fixed this for pygit2.
2015-11-23 14:23:39 -06:00
Erik Johnson
a9c0cacb77
Don't add head ref if head red matches desired ref
2015-11-23 13:24:37 -06:00
Erik Johnson
e7540e956b
pygit2: Don't clean local heads along with stale remote refs
...
Also, set the 'credentials' attribute for the GitProvider subclass to
None by default, so that it is always present, and only non-none when
there is valid authentication configured.
2015-11-23 13:20:19 -06:00
