Commit Graph

85721 Commits

Author SHA1 Message Date
Mike Place
9767e46ce4 Merge branch 'develop' into cisc_oxygen_release_notes 2017-09-13 10:45:24 -06:00
Mike Place
d2b790d883 Merge pull request #43471 from alexbleotu/esxcluster-gh
Esxcluster proxy minion and support in vsphere module
2017-09-13 10:11:22 -06:00
Mike Place
014409e1b3 Merge pull request #43472 from V3XATI0N/patch-1
Make aptpkg work with Deepin Linux
2017-09-13 09:31:36 -06:00
Nicole Thomas
054c64a006 Merge pull request #43460 from cachedout/ssh_roster_notes
Add release note about ssh rosters
2017-09-13 11:30:52 -04:00
Alexandru Bleotu
59cb07269c pylint 2017-09-13 05:17:06 -04:00
V3XATI0N
1b877a6c60 Make aptpkg work with Deepin Linux
Simple change, but it bugs me having to add this every time I update. Also I never contribute so proposing this change here is probably the wrong place to do it. Sue me if you want I'm super broke.
2017-09-12 19:46:02 -07:00
Alexandru Bleotu
0222a5a056 Fix to vsphere tests 2017-09-12 18:43:08 -04:00
Alexandru Bleotu
afa4921d37 Fixed vsphere tests to support the esxcluster proxy 2017-09-12 18:43:05 -04:00
Alexandru Bleotu
b880956468 Added esxcluster to supported proxies 2017-09-12 18:43:03 -04:00
Alexandru Bleotu
91c22163b6 Added vsphere._get_esxcluster_proxy_details that retrieves a esxcluster proxy details 2017-09-12 18:43:00 -04:00
Alexandru Bleotu
26710fa8fc Added tests for esxcluster execution module 2017-09-12 18:42:58 -04:00
Alexandru Bleotu
679e388632 Added esxcluster shim execution module 2017-09-12 18:42:55 -04:00
Alexandru Bleotu
4113aa3ca7 Added tests for esxcluster proxy 2017-09-12 18:42:53 -04:00
Alexandru Bleotu
0302948fff Added esxcluster proxy used to manage ESX clusters 2017-09-12 18:42:51 -04:00
Alexandru Bleotu
ba515df631 Added esxcluster proxy input JSON schema 2017-09-12 18:42:48 -04:00
Mike Place
15ffecd4a7 Give the name of the roster 2017-09-12 15:44:26 -06:00
Nicole Thomas
1016f585f5 Merge pull request #43378 from terminalmage/git-configparser
Add a GitConfigParser class for manipulating git config files
2017-09-12 17:10:43 -04:00
Mike Place
eba40686e8 Add information about cimc to release notes 2017-09-12 14:39:00 -06:00
Mike Place
8837865a06 Merge pull request #43459 from spenceation/cimc/initial
Added Cisco UCS Chassis proxy modules.
2017-09-12 14:37:29 -06:00
Erik Johnson
6c3005eead Manage git config using GitConfigParser insead of git CLI 2017-09-12 12:45:47 -05:00
Mike Place
68d2558988 Merge pull request #43096 from lyft/add-util-func-for-state-return-merging
Add utils function to merge state returns
2017-09-12 11:02:14 -06:00
Mike Place
27315c31c8 Add release note about ssh rosters 2017-09-12 10:41:06 -06:00
Mike Place
87ffd3f105 Merge pull request #42103 from davidjoliver86/ssh-config-roster
ssh config roster for salt-ssh
2017-09-12 10:38:49 -06:00
Erik Johnson
626129f5a3 Import all of configparser into module for easier access to error classes 2017-09-12 11:37:13 -05:00
Erik Johnson
507c1b871e Add a GitConfigParser class for manipulating git config files
This class is designed to be used for (among other things) gitfs and git_pillar, to enforce config settings which reside in a git config file without resorting to using the git CLI.
2017-09-12 11:37:13 -05:00
Mike Place
50720846a6 Merge pull request #42756 from terminal-labs/develop
Adding fingerprint_hash_type to known host example.
2017-09-12 10:30:26 -06:00
spenceation
dfc44b8d14 Added Cisco UCS Chassis associated modules. 2017-09-12 12:25:58 -04:00
Mike Place
1a81663e46 Merge pull request #43302 from lyft/upstream-boto_cloudfront
Upstream boto_cloudfront execution and state modules
2017-09-12 10:10:20 -06:00
Mike Place
4f1e3bc24d Merge pull request #43321 from sdodsley/purefa_module
Add module to control Pure Storage FlashArray
2017-09-12 09:37:21 -06:00
Nicole Thomas
f1a93401d1 Merge pull request #43425 from garethgreenaway/42135_isolate_salt_scheduler
Isolate Salt Scheduler
2017-09-12 09:05:06 -04:00
Nicole Thomas
4b5bf54aa8 Merge pull request #43450 from mc/typofix20170912
typofix 'tempalte' => 'template'
2017-09-12 09:00:55 -04:00
Rico Gloeckner
f452860316 typofix 'tempalte' => 'template' 2017-09-12 08:24:56 +02:00
Simon Dodsley
a8bfa4574c Merge branch 'develop' into purefa_module 2017-09-11 20:54:39 -04:00
Aneesh Agrawal
2e9f1999f6 Upstream boto_cloudfront execution and state modules
AWS recently added support for tagging CloudFront distributions,
which allows us to start managing them via Salt
as we can insert a Salt-controlled identifier as a `Name` tag.
(CloudFront distributions get unique IDs generated by AWS,
which we can't predict and thus use to manage them idempotently.)
2017-09-11 23:36:31 +00:00
Mike Place
b4ca024e44 Merge pull request #43117 from garethgreenaway/slack_engine_class_fixes
Slack engine class fixes
2017-09-11 16:33:31 -06:00
Mike Place
ea4f903ed9 Merge pull request #43389 from raazvvann/nilrt_ip-fix-DNS
nilrt_ip: Fix DNS
2017-09-11 16:26:58 -06:00
Gareth J. Greenaway
8140cab71d Swapping the default value for the standalone from None to False to be more clear. 2017-09-11 14:31:00 -07:00
Gareth J. Greenaway
54cb69edec Renaming isolate to standalone 2017-09-11 14:31:00 -07:00
Gareth J. Greenaway
980d3f4a53 Adding the ability to isolate the scheduler to run outside of Salt minion or Salt master. 2017-09-11 14:31:00 -07:00
Mike Place
2ac185b055 Merge pull request #43439 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-09-11 15:18:40 -06:00
Simon Dodsley
0344245423 Merge branch 'develop' into purefa_module 2017-09-11 17:17:36 -04:00
Mike Place
2c28156b89 Merge pull request #41619 from skizunov/develop2
Add ability to set minion ID by module
2017-09-11 15:16:50 -06:00
Mike Place
abb06552ec Merge pull request #43444 from garethgreenaway/43386_develop_schedule_kwargs_pub
[develop] Fixes to scheduler __pub values in kwargs
2017-09-11 15:13:07 -06:00
Joseph Nix
b7e42a279d Merge branch 'develop' into develop 2017-09-11 15:25:33 -05:00
Mike Place
aad33df4af Merge pull request #41845 from mc/develop
recomply modules/napalm_network.py to file.get_managed
2017-09-11 14:25:16 -06:00
Mike Place
bb8bffde1a Merge pull request #42915 from garethgreenaway/missing_minions_branch
Show missing minions in lists & nodegroups
2017-09-11 13:38:55 -06:00
Mike Place
da16b6670a Merge pull request #42752 from skizunov/develop4
Add config option to ensure jid is unique
2017-09-11 13:38:30 -06:00
Mike Place
5c5df57efb Remove extra space for linter 2017-09-11 13:12:45 -06:00
Mike Place
9b60cc0d1f Merge pull request #43137 from aogier/x-no-grains-on-jenkins
system group creation integration test
2017-09-11 13:09:36 -06:00
Mike Place
2de83b95af Merge pull request #43182 from basepi/defaultgw
[Feature] Add grains to detect default gateway
2017-09-11 12:59:18 -06:00