Commit Graph

75265 Commits

Author SHA1 Message Date
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
Mike Place
52556c857b Capitalize dns 2016-11-04 16:27:45 +13:00
Daniel Wallace
8a28ac4fdb Begin deprecating default setting dns entries
We shouldn't be setting defaults for this.  They should have to be
explicitly set because they could also be set by dhcp.

Fixes #37381
2016-11-03 16:04:45 -05:00
Daniel Wallace
c3e33c3b99 use the cache runner in the cache roster file to get grains
Instead of having to query each file individitually.
2016-11-01 09:38:34 -05:00
Nicole Thomas
4c2d4159fd Merge pull request #37313 from rallytime/merge-develop
[develop] Merge forward from carbon to develop
2016-10-28 13:02:43 -06:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
2016-10-28 11:58:41 -06:00
Nicole Thomas
5f9daffc63 Merge pull request #37308 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-10-28 11:47:27 -06:00
Nitin Madhok
e12f99ff1f Refactoring vmware cloud driver code (#37292)
* Refactoring vmware cloud driver code

* Fixing typo

* Function argument is called disk instead of device
2016-10-28 09:34:33 -06:00
Eric Radman
f42480a1a9 Joyent: wait for node state to flip to 'ready' (#37305)
When provisioning a SmartOS machine on Joyent using salt-cloud, the IP
is often set before SSH is fully configured. This can result in a
successful SFTP transfer, followed by a failure to run
salt-bootstrap.sh.
2016-10-28 09:32:54 -06:00
rallytime
0df3feec3c Merge branch '2016.3' into 'carbon'
No conflicts.
2016-10-28 09:25:00 -06:00
Mike Place
63ba6b03ad Merge pull request #37301 from cachedout/fix_pkg_test
Fix typo in pkg upgrade test
2016-10-28 20:24:30 +09:00
Mike Place
6cb7ce2c0f
Fix typo in pkg upgrade test 2016-10-28 20:23:26 +09:00
Mike Place
7aa8381367 Merge pull request #37289 from cachedout/tar_thin_check
Be more careful about checking existence in thin creation
2016-10-28 15:47:08 +09:00
Mike Place
00ec2b817c
Be more careful about checking existence in thin creation 2016-10-28 15:46:15 +09:00
Mike Place
3b1e2f1839 Merge pull request #37288 from cachedout/fix_extend_test_2
Reset dir for extend test
2016-10-28 15:03:07 +09:00
Mike Place
36f47a4449
Reset dir for extend test 2016-10-28 15:02:13 +09:00
Mike Place
af81bac4ca Merge pull request #37169 from mchugh19/develop
Allow zabbix_host state to assign templates
2016-10-28 14:10:54 +09:00
Mike Place
e0baf4b193 Merge pull request #37219 from alex-zel/fix-freeipa-ldap-groups
Fix freeipa ldap groups
2016-10-28 13:33:37 +09:00
Mike Place
69a8c07ae3 Merge pull request #37271 from Unity-Technologies/feature/choco_install_version
Added ability to upgrade a chocolatey package when a new version is s…
2016-10-28 13:23:17 +09:00
Mike Place
76b32271bf Merge pull request #37283 from jeanpralo/fix-dockercompose-versioncheck
Handle docker-compose up to version 1.9.0
2016-10-28 13:13:03 +09:00
Mike Place
49df15babb Merge pull request #37277 from cloudflare/NAPALM-GRAINS
Napalm grains
2016-10-28 13:10:37 +09:00
Mike Place
ba4c91539d Merge pull request #37275 from cloudflare/NAPALM-PROXY-UPDATE
Update NAPALM proxy module
2016-10-28 13:10:15 +09:00
Mike Place
d7b41e11f7 Merge pull request #37284 from rallytime/versionadded-tags-update
Carbon branch versionadded tags updated to 2016.11.0
2016-10-28 13:09:06 +09:00
Alexandru Bleotu
a777d6eced Get managed object name gh (#37276)
* Added get_managed_object_name to optimally retrieve a managed object's name

* Added tests for get_managed_obect_name
2016-10-27 16:27:27 -06:00
Nicole Thomas
7d79ea7844 Update 2016.3.4 release notes (#37285) 2016-10-27 16:07:56 -06:00
Thomas S Hatch
3b62a89e45 Merge pull request #37282 from thatch45/raet_cpub
add cpub to raet event for compat
2016-10-27 15:33:48 -06:00
Thomas S Hatch
90f778dbc1 Add func for compat with main event system 2016-10-27 15:28:14 -06:00
rallytime
c722a18468 Update Carbon versionadded tags to 2016.11.0 in doc/* 2016-10-27 15:26:30 -06:00
Jean Praloran
d13072a9c7 handle up to version 1.9.0 2016-10-28 10:21:33 +13:00
Thomas S Hatch
8e52f425e4 add cpub to raet event for compat 2016-10-27 15:13:30 -06:00
rallytime
bd96648cc4 Update Carbon versionadded tags to 2016.11.0 in salt/* 2016-10-27 15:00:00 -06:00
rallytime
2a381c7e7a Update Carbon versionadded tags to 2016.11.0 in beacons/* 2016-10-27 12:43:43 -06:00
rallytime
008a1dbe23 Update Carbon versionadded tags to 2016.11.0 in cloud/* 2016-10-27 12:37:26 -06:00
rallytime
b262008603 Update Carbon versionadded tags to 2016.11.0 in grains/* 2016-10-27 12:35:53 -06:00
rallytime
0e1d765793 Update Carbon versionadded tags to 2016.11.0 in beacons/* 2016-10-27 12:35:29 -06:00
rallytime
394c4790bd Update Carbon versionadded tags to 2016.11.0 in fileserver/* 2016-10-27 12:34:10 -06:00
rallytime
052bc74524 Update Carbon versionadded tags to 2016.11.0 in modules/* 2016-10-27 12:27:18 -06:00
rallytime
9d05057dd5 Update Carbon versionadded tags to 2016.11.0 in netapi/* 2016-10-27 11:07:10 -06:00
rallytime
c681df2033 Update Carbon versionadded tags to 2016.11.0 in pillar/* 2016-10-27 11:06:26 -06:00
rallytime
44dbe60184 Update Carbon versionadded tags to 2016.11.0 in proxy/* 2016-10-27 11:02:34 -06:00
rallytime
9d58360f16 Update Carbon versionadded tags to 2016.11.0 in returners/* 2016-10-27 10:58:13 -06:00
rallytime
85d2145fe6 Update Carbon versionadded tags to 2016.11.0 in runners/* 2016-10-27 10:40:01 -06:00
rallytime
ec8bb4d54d Update Carbon versionadded tags to 2016.11.0 in sdb/* 2016-10-27 10:37:24 -06:00
rallytime
1e28877048 Update Carbon versionadded tags to 2016.11.0 in states/* 2016-10-27 10:36:35 -06:00
Justin Findlay
a2eae208c5 update 2016.3.4 release notes (#37278) 2016-10-27 10:18:18 -06:00
rallytime
f2fc207d4f Update Carbon versionadded tags to 2016.11.0 in thorium files 2016-10-27 10:11:58 -06:00
rallytime
85292225e4 Update Carbon versionadded tags to 2016.11.0 in utils/* 2016-10-27 10:08:15 -06:00
rallytime
e4dc059959 Update Carbon versionadded tags to 2016.11.0 in tests/* 2016-10-27 10:04:13 -06:00
Mircea Ulinic
0ba8a2e5b9
Add NAPALM grains to docs 2016-10-27 15:50:46 +00:00
Mircea Ulinic
b8a3cdc9e1
NAPALM grains module 2016-10-27 15:50:38 +00:00