valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,559 Commits 24 Branches 182 Tags 341 MiB
2e68da3e52
Commit Graph

75559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
2e68da3e52 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
 2016-11-07 08:22:17 -07:00
Nicole Thomas
a9fe7ecf1a Pylint fix for develop (#37513) 2016-11-07 08:05:59 -07:00
Mike Place
ee1c911c31 Merge pull request #37505 from cetanu/develop 
salt-cloud vmware driver: allow selection by id
 2016-11-07 22:37:14 +13:00
Mike Place
7f02a56dec Merge pull request #37504 from SolarisYan/patch-1 
fix list_snapshots when the vm doesn't have a snapshot
 2016-11-07 22:34:44 +13:00
Vasili Syrakis
2c45eb848a allow selection by id 2016-11-07 14:39:52 +11:00
SolarisYan
decae0f07d Update vmware.py 
if the vmname does't have any snapshot,it will return all snapshots on all vm that with snapshots. but it should return none.fix it
 2016-11-07 11:33:21 +08:00
Mike Place
e653413dfc Merge pull request #37495 from sjorge/2016.11-sunos_pkgsrc 
Allow OmniOS and OpenIndiana to find libcrypto
 2016-11-07 11:18:28 +13:00
Super-User
52c3f159a9 handle other Solaris-like distributions that use pkgsrc the same as SmartOS 2016-11-06 14:19:02 +01:00
Mike Place
2226207a13 Merge pull request #37251 from shorawitz/patch-3 
Create postgres.py
 2016-11-06 15:05:08 +13:00
Mike Place
33d0789f6e Merge pull request #37348 from alexbleotu/create_cluster-gh 
Create cluster gh
 2016-11-06 15:02:41 +13:00
Mike Place
4a8df6591d Merge pull request #37431 from tyagiprince/develop 
Fixed influxdb returner
 2016-11-06 15:01:19 +13:00
Mike Place
70aff29b3b Merge pull request #37451 from pakdel/list_repo_pkgs__showduplicates 
yumpkg.list_repo_pkgs always shows duplicates
 2016-11-06 15:00:27 +13:00
Mike Place
43bef720e5 Merge pull request #37432 from Tanoti/elasticsearch_proxy_support 
Added proxy support to elasticsearch using requests backend module
 2016-11-06 14:58:09 +13:00
Mike Place
b678e7353d Merge pull request #37465 from lorengordon/jinja-filters 
Adds a couple handy jinja filters, `escape_regex` and `unique`
 2016-11-06 14:54:20 +13:00
Mike Place
9ce38fd4d6 Merge pull request #37466 from alexbleotu/test_rename-gh 
Renamed salt.utils.vmware.update_cluster tests
 2016-11-06 14:52:55 +13:00
Mike Place
1d33aa10dc Merge pull request #37467 from gtmanfred/develop 
clean up pylint in virtualenvs
 2016-11-06 14:51:35 +13:00
Mike Place
59ab1b4357 Merge pull request #37471 from twangboy/fix_win_file 
Fix file.managed for Windows
 2016-11-06 14:49:05 +13:00
Mike Place
9e4e936f4f Merge pull request #37473 from m03/fix-167-logrotate-state_2 
Fix #167 - Add logrotate state module
 2016-11-06 14:45:15 +13:00
Mike Place
706befd8ca Merge pull request #37476 from pakdel/ec2_cloud_driver_fix 
EC2 support for SubnetName and securityGroupName
 2016-11-06 14:43:09 +13:00
Mike Place
1c993bf8c2 Merge pull request #37488 from SaltyCharles/patch-3 
update note on beacon.disabled
 2016-11-06 14:35:31 +13:00
Mike Place
bc17271aae Merge pull request #37490 from twangboy/win_dacl_util 
Create new salt util win_dacl
 2016-11-06 14:35:12 +13:00
Mike Place
713607c0ee Merge pull request #37489 from lorengordon/issue-18836 
Creates `filter_by` as a utils function
 2016-11-06 14:34:52 +13:00
twangboy
f4df20d5be Fix some lint 2016-11-04 22:17:05 -06:00
twangboy
d8ce75ec42 Clean up docs 2016-11-04 19:01:36 -06:00
twangboy
ffb21ae882 Fix some syntax errors, string type checks 2016-11-04 18:46:20 -06:00
twangboy
52839f9dd0 Fix verify 2016-11-04 18:46:20 -06:00
twangboy
0e2e587496 Fix some syntax issues 2016-11-04 18:46:20 -06:00
twangboy
6bb7b322e0 Add documentation to win_dacl util 2016-11-04 18:46:20 -06:00
twangboy
2e64488f64 Fix minion startup 2016-11-04 18:46:20 -06:00
twangboy
f9f60e0f99 Fix docs 2016-11-04 18:46:20 -06:00
twangboy
2acd7deaed Use win_dacl utility to verify environment 2016-11-04 18:46:20 -06:00
Loren Gordon
4acd251b90 Creates filter_by as a utils function 
The primary reason for moving this to utils is to add support for
a `pillar.filter_by()` function while minimizing any code
duplication.

Fixes #18836
 2016-11-04 17:58:15 -04:00
SaltyCharles
6fa99d9e6b update note on beacon.disabled 
fix typo
 2016-11-04 14:49:11 -07:00
Nicole Thomas
56a02027ad Merge pull request #37479 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-04 15:27:56 -06:00
Nicole Thomas
029d822d92 Merge pull request #37480 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-04 15:27:20 -06:00
Nicole Thomas
a330866a17 [develop] Doc version updated to 2016.3.4 (#37484) 2016-11-04 14:13:34 -06:00
rallytime
ce4b82fdee Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/archive.py
  - salt/modules/status.py
  - salt/states/file.py
  - tests/unit/modules/status_test.py
 2016-11-04 13:51:46 -06:00
rallytime
4132929832 Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-04 13:38:34 -06:00
Nicole Thomas
a1bf88b767 Merge pull request #37439 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-11-04 13:14:42 -06:00
Amir Pakdel
0dc7657ec5 Linting 2016-11-04 14:28:28 -04:00
Amir Pakdel
783f58bf3d EC2 support for SubnetName and securityGroupName 
Now we can have subnetname and securitygroupname
in network_interfaces of EC2 cloud profiles:
profile_name:
  size: t2.medium
  network_interfaces:
  - DeviceIndex: 0
    allocate_new_eip: true
    subnetname: subnet01
    securitygroupname:
    - sgLinux
    - sgServer1
    - sgServer2
 2016-11-04 14:16:02 -04:00
Amir Pakdel
1d530e21f3 consider dnf as a featurefull yum 2016-11-04 13:16:29 -04:00
m03
466efd3f55 Change test str to int for consistency 2016-11-04 09:43:02 -07:00
twangboy
a4612d809a Add get_source_sum to the namespaced functions 2016-11-04 16:12:40 +00:00
m03
2f80d4b853 Fix #167 - add logrotate state 2016-11-04 09:07:42 -07:00
Amir Pakdel
fe840ce4c2 Do not use showduplicates option with old yum 
The --showduplicates option is added in 3.2.13
 2016-11-04 11:47:30 -04:00
Pablo Suárez Hernández
4ae036055d Fix unit test for Zypper dist-upgrade in Carbon 2016-11-04 09:36:41 -06:00
Daniel Wallace
66f6467ba3 clean up pylint in virtualenvs 
In virtualenvs distutils.version is not available.  So ignore those
errors so that the pylint can be run successfully in the virtualenv.

```
(saltpylint) ~github salt ➤ pylint --rcfile=.testing.pylintrc --disable=W1307,E1322 salt/
************* Module salt.modules.git
salt/modules/git.py:12: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.modules.launchctl
salt/modules/launchctl.py:14: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.modules.mac_assistive
salt/modules/mac_assistive.py:14: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.modules.mac_service
salt/modules/mac_service.py:12: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.modules.puppet
salt/modules/puppet.py:8: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.modules.win_dsc
salt/modules/win_dsc.py:14: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.modules.win_psget
salt/modules/win_psget.py:17: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.modules.zabbix
salt/modules/zabbix.py:31: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.states.git
salt/states/git.py:21: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.states.mac_assistive
salt/states/mac_assistive.py:17: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
************* Module salt.utils.openstack.nova
salt/utils/openstack/nova.py:8: [E0611(no-name-in-module), ] No name 'version' in module 'distutils'
salt/utils/openstack/nova.py:8: [E0401(import-error), ] Unable to import 'distutils.version'
```
 2016-11-04 09:45:07 -05:00
Loren Gordon
20eb0bf347 Adds a set theory jinja filter unique 2016-11-04 10:14:24 -04:00
Alexandru Bleotu
b3404ae7a2 Renamed salt.utils.vmware.update_cluster tests 2016-11-04 09:57:23 -04:00