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
86,574 Commits 24 Branches 182 Tags 341 MiB
ab7ca0c3a8
Commit Graph

86574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandru Bleotu
8a84f27adf Added tests for salt.utils.vmware.create_dvportgroup 2017-09-22 14:31:41 -04:00
Alexandru Bleotu
294fad1de0 Added salt.utils.vmware.update_dvportgroup to update a distributed virtual portgroup 2017-09-22 14:31:38 -04:00
Alexandru Bleotu
13b4e0e426 Added salt.utils.vmware.create_dvportgroup to create a distributed virtual portgroup 2017-09-22 14:31:36 -04:00
Alexandru Bleotu
b8bc8fd581 Added tests for salt.utils.vmware.get_uplink_dvportgroup 2017-09-22 14:31:34 -04:00
Alexandru Bleotu
35fa6df4ec Added salt.utils.vmware.get_uplink_dvportgroup to retrieve the uplink distributed virtual portgroup 2017-09-22 14:31:31 -04:00
Alexandru Bleotu
82f6ae3688 Added tests for salt.utils.vmware.get_dvportgroups 2017-09-22 14:31:29 -04:00
Alexandru Bleotu
16b71d8ab1 Added salt.utils.vmware.get_dvportgroups to retrieve distributed virtual portgroups 2017-09-22 14:31:26 -04:00
Alexandru Bleotu
aa247b43b8 Added tests for salt.utils.vmware.set_dvs_network_resource_management_enabled 2017-09-22 14:31:24 -04:00
Alexandru Bleotu
77a815dbed Added salt.utils.vmware.set_dvs_network_resource_management_enabled 2017-09-22 14:31:21 -04:00
Alexandru Bleotu
f211874462 Added tests for salt.utils.vmware.update_dvs 2017-09-22 14:31:19 -04:00
Alexandru Bleotu
ce6e8c8522 Added salt.utils.vmware.update_dvs 2017-09-22 14:31:16 -04:00
Alexandru Bleotu
d31d98c2d3 Added tests for salt.utils.vmware.create_dvs 2017-09-22 14:31:14 -04:00
Alexandru Bleotu
793acab99f Added for salt.utils.vmware.create_dvs 2017-09-22 14:31:11 -04:00
Alexandru Bleotu
4f09bf5e88 Added tests for salt.utils.vmware.get_network_folder 2017-09-22 14:31:08 -04:00
Alexandru Bleotu
c0040aaa1a Added salt.utils.vmware.get_network_folder that retrieves the network folder 2017-09-22 14:31:06 -04:00
Alexandru Bleotu
3584a91692 Added tests for salt.utils.vmware.get_dvss 2017-09-22 14:31:03 -04:00
Alexandru Bleotu
173a697be2 Added comments and imports for dvs functions in salt.utils.vmware 2017-09-22 14:31:01 -04:00
Alexandru Bleotu
9e32ce72cc Added salt.utils.vmware.get_dvss that retrieves DVSs in a datacenter 2017-09-22 14:30:58 -04:00
Mike Place
485471c8a7 Merge branch '2017.7' into yaml 2017-09-22 12:28:17 -06:00
Mike Place
15c6e69bc1 Merge pull request #43651 from bodhi-space/infra5461 
Re-opening https://github.com/saltstack/salt/pull/43642 which I deleted too soon
 2017-09-22 12:25:22 -06:00
Damon Atkins
3b4c1bbf7f Merge branch '2017.7' into 2017.7_update_safe_filename_func 2017-09-23 04:04:36 +10:00
Mike Place
0e86266b93 Merge pull request #43670 from DSRCorporation/bugs/43381_redis_cache_fix 
Fix for `list` and `contains` redis cache logic.
 2017-09-22 11:56:57 -06:00
Mike Place
75dd97ee50 Merge pull request #43645 from alexbleotu/cluster_states-gh 
VMware cluster states + dependencies
 2017-09-22 11:46:25 -06:00
rallytime
6e5cf65d65
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-22 13:45:59 -04:00
Mike Place
7e3a6b92d5 Merge pull request #43518 from terminalmage/issue38971 
Reduce unnecessary file downloading in archive/file states
 2017-09-22 11:44:04 -06:00
Mike Place
f46c858f25 Merge pull request #43648 from rallytime/handle-boto-vpc-errors 
Handle VPC/Subnet ID not found errors in boto_vpc module
 2017-09-22 11:40:42 -06:00
Mike Place
522399b5c0 Merge branch 'develop' into infra5292_fluent 2017-09-22 11:37:31 -06:00
Mike Place
aa47da35dd Merge pull request #43697 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-22 11:31:08 -06:00
Mike Place
530a6bb2e7 Merge pull request #43698 from theredcat/elastic-timeout 
Add timeout option to elasticsearch execution module
 2017-09-22 11:30:14 -06:00
Z. Liu
da15658304 remove modify yaml constructor 
which will modify the default behavior of yaml load.

Foe example, for following example (t.sls), it will cause the difference
between the content of file testa and testb, but it should be identical!

$ cat t
{%- load_yaml as vars %}
toaddr:
  - test@test.com
{%- endload -%}
{{ vars.toaddr }}
$ cat t.sls
/tmp/testa:
  file.managed:
    - source: salt://t
    - user: root
    - group: root
    - mode: "0755"
    - template: jinja

sys-power/acpid:
  pkg.installed:
    - refresh: False

/tmp/testb:
  file.managed:
    - source: salt://t
    - user: root
    - group: root
    - mode: "0755"
    - template: jinja
$ touch /tmp/test{a,b}
$ salt-call state.sls t
local:
----------
          ID: /tmp/testa
    Function: file.managed
      Result: None
     Comment: The file /tmp/testa is set to be changed
     Changes:
              ----------
              diff:
                  ---
                  +++
                  @@ -0,0 +1 @@
                  +['test@test.com']
----------
          ID: /tmp/testb
    Function: file.managed
      Result: None
     Comment: The file /tmp/testb is set to be changed
     Changes:
              ----------
              diff:
                  ---
                  +++
                  @@ -0,0 +1 @@
                  +[u'test@test.com']
 2017-09-22 23:25:21 +08:00
Nicole Thomas
91edf865e2 Merge branch '2017.7' into issue38971-2017.7 2017-09-22 10:50:57 -04:00
Nicole Thomas
c0bfa7a77c Merge pull request #43684 from rklaren/salt-cloud-libvirt-fix-python-warning 
salt-cloud libvirt updates
 2017-09-22 10:50:11 -04:00
Nicole Thomas
0ec22d48a0 Merge pull request #43688 from abergmann/develop 
Extend openscap module command parsing.
 2017-09-22 10:43:52 -04:00
Nicole Thomas
49bb3b0a52 Merge branch 'develop' into issue38971 2017-09-22 10:38:34 -04:00
Nicole Thomas
7448153154 Merge pull request #43691 from dmyerscough/fix-docstring-formatting 
Fix docstring code-blocks
 2017-09-22 10:34:51 -04:00
rallytime
cbae45bec4
Lint: Remove extra line at end of file 2017-09-22 10:33:10 -04:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop' 
Conflicts:
  - pkg/salt.bash
  - salt/client/mixins.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/boto_vpc.py
  - salt/modules/win_pkg.py
  - salt/utils/reactor.py
  - tests/unit/utils/test_reactor.py
 2017-09-22 10:24:04 -04:00
Nathan DELHAYE
25a1958304 Add timeout option to elasticsearch execution module 2017-09-22 15:49:44 +02:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/utils/test_parsers.py
 2017-09-22 09:40:03 -04:00
Joaquin Veira
43ded54132 Update zabbix_return.py 
corrected indentation and other suggestions by jenkins
 2017-09-22 11:43:44 +02:00
Tom Williams
f6a8a969a4 INFRA-5292 - we must please pylint ... 2017-09-22 05:19:51 -04:00
Vladimir Nadvornik
9d450f7737 Fix python3 compatibility 2017-09-22 10:24:11 +02:00
assafShapira
d35eb099e2 Merge branch 'develop' into develop 2017-09-22 10:33:10 +03:00
assaf shapira
0e17b2054f Merge branch 'develop' of https://github.com/assafShapira/salt into develop 2017-09-22 10:31:53 +03:00
Dmitry Kuzmenko
1c979d5809 Update redis cache contains logic to use more efficient sismember. 2017-09-22 10:30:28 +03:00
Damian Myerscough
012281dea2 Fix docstring code-blocks 2017-09-21 22:46:03 -07:00
Damon Atkins
4c88c80ef9 Merge branch '2017.7' into 2017.7_update_safe_filename_func 2017-09-22 13:53:18 +10:00
Ric Klaren
b750c44224 Fix some lint warnings 2017-09-21 22:38:13 -05:00
Ric Klaren
7595f97488 Ensure libvirt does not write to stderr by itself 
Install error handler and redirect stderr output to debug log.
 2017-09-21 22:38:13 -05:00
Ric Klaren
ab0892c802 Fix fire_event for destroy 2017-09-21 22:38:13 -05:00