Commit Graph

81658 Commits

Author SHA1 Message Date
Mike Place
9d12a614b7
Fix failing test 2017-05-01 11:50:39 -06:00
Daniel Wallace
068ebfd9ec smtp state can use profile or sender 2017-05-01 11:10:04 -06:00
Alexey Aksenov
bf2eb63a77 Fix docker_events TypeError
Traceback (most recent call last):
  File "/home/ezh/.virtualenvs/salt/lib/python3.4/site-packages/salt/engines/docker_events.py", line 82, in start
    data = json.loads(event)
  File "/usr/lib64/python3.4/json/__init__.py", line 312, in loads
    s.__class__.__name__))
TypeError: the JSON object must be str, not 'bytes'
[INFO    ] Process <class 'salt.engines.Engine'> (12581) died with exit status 0, restarting...
2017-05-01 20:04:00 +03:00
Alexey Aksenov
b087832229 Fix ssh client TypeError
salt-ssh -i '*' test.ping
...
File "/home/ezh/.virtualenvs/salt/lib/python3.4/site-packages/salt/client/ssh/__init__.py", line 1129, in cmd_block
File "/home/ezh/.virtualenvs/salt/lib/python3.4/site-packages/salt/client/ssh/__init__.py", line 1084, in shim_cmd
File "/home/ezh/.virtualenvs/salt/lib64/python3.4/tempfile.py", line 417, in func_wrapper
    return func(*args, **kwargs)
TypeError: 'str' does not support the buffer interface
2017-05-01 19:56:11 +03:00
Daniel Wallace
a9eed7f1c9 fix bug in status.netdev
This was introduced in 9042aa61ac
and then later fixed to be an insert here
703f2b4dc6, but all the comps values were never
shifted up 1 to take into account that the list was now one entry longer
2017-05-01 10:52:41 -06:00
Alexey Aksenov
8fcb7205db Fix docker_events field handling
[DEBUG   ] Sending event: tag = salt/engines/docker_events/attach; data = {'Type': 'container', 'from': 'a58442926dc0', 'Actor': {'Attributes': {'image': 'a58442926dc0', 'name': 'brave_banach'}, 'ID': '705dc8d539de400e57d970861c494f3039522198135f450a45c836d12e4edd16'}, 'id': '705dc8d539de400e57d970861c494f3039522198135f450a45c836d12e4edd16', 'time': 1493620435, 'status': 'attach', '_stamp': '2017-05-01T06:33:55.078234', 'Action': 'attach', 'timeNano': 1493620435077227350}
Traceback (most recent call last):
  File "/home/ezh/.virtualenvs/salt/lib/python3.4/site-packages/salt/engines/docker_events.py", line 83, in start
    fire('{0}/{1}'.format(tag, data['status']), data)
KeyError: 'status'
[INFO    ] Process <class 'salt.engines.Engine'> (21196) died with exit status 0, restarting...
2017-05-01 10:48:17 -06:00
rallytime
8e4b679d5c Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/pip.py
2017-05-01 10:45:19 -06:00
rallytime
a9fb83c28c Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-01 10:43:45 -06:00
Alexey Aksenov
119dcad72d Fix TypeError: must be str, not bytes for ssh_py_shim
salt-ssh '*' test.ping
...
[DEBUG   ] RETCODE localhost: 1
[DEBUG   ] SHIM retcode(1) and command: Traceback (most recent call last):
[DEBUG   ] LazyLoaded raw.output
{'ezh': {'stdout': 'Traceback (most recent call last):\n  File "<string>", line 155, in <module>\n  File "<string>", line 264, in <module>\n  File "<string>", line 251, in main\nTypeError: must be str, not bytes', 'retcode': 1, 'stderr': 'command-line line 0: Unsupported option "gssapiauthentication"\r\nConnection to localhost closed.\r\n'}
2017-05-01 19:20:58 +03:00
Daniel Wallace
2ed694cac6 get sudo_password correctly 2017-05-01 08:59:57 -06:00
Erik Kristensen
fa1e56ad14 rename to all_saltenvs, add initial documentation 2017-05-01 08:56:18 -06:00
Mike Place
e4ed19a6b3 Merge pull request #40982 from ezh/fabric-fix-docker-event-fields
Fix docker_events field handling
2017-05-01 08:22:49 -06:00
Alexey Aksenov
bb8b24506a Add kwargs argument to reactor caller
local_salt_call:
  caller.cmd.run:
    - args:
      - "mkdir test"
    - kwargs:
        cwd: /tmp
2017-05-01 16:20:12 +03:00
Erik Kristensen
1a16f8333f adds ability to turn remote into true formula, merges remote into all saltenvs if enabled 2017-05-01 07:19:40 -06:00
Anthony Shaw
77cdd3c2dc
backward compatibility with older versions of libcloud where snapshots don't have a name field 2017-05-01 21:05:33 +10:00
Alexey Aksenov
09900d4fe4 Fix docker_events field handling
[DEBUG   ] Sending event: tag = salt/engines/docker_events/attach; data = {'Type': 'container', 'from': 'a58442926dc0', 'Actor': {'Attributes': {'image': 'a58442926dc0', 'name': 'brave_banach'}, 'ID': '705dc8d539de400e57d970861c494f3039522198135f450a45c836d12e4edd16'}, 'id': '705dc8d539de400e57d970861c494f3039522198135f450a45c836d12e4edd16', 'time': 1493620435, 'status': 'attach', '_stamp': '2017-05-01T06:33:55.078234', 'Action': 'attach', 'timeNano': 1493620435077227350}
Traceback (most recent call last):
  File "/home/ezh/.virtualenvs/salt/lib/python3.4/site-packages/salt/engines/docker_events.py", line 83, in start
    fire('{0}/{1}'.format(tag, data['status']), data)
KeyError: 'status'
[INFO    ] Process <class 'salt.engines.Engine'> (21196) died with exit status 0, restarting...
2017-05-01 10:25:28 +03:00
Anthony Shaw
e85f1a4314
snapshot name seems to be a recent addition 2017-05-01 14:28:54 +10:00
Erik Johnson
8f7e8e4829 Merge pull request #40974 from urbas/conf-master-typo
Fixes typo in conf/master.
2017-04-30 22:25:05 -05:00
Adam Mendlik
fd09ae7f1a Add state modules to manage Linux kernel packages 2017-04-30 12:53:57 -06:00
Adam Mendlik
e2524656c4 Add execution modules to manage Linux kernel packages 2017-04-30 12:53:48 -06:00
Anthony Shaw
7ec1d6ba83
lint fixes 2017-04-30 21:49:54 +10:00
Matej Urbas
b9591f2807 Fixes typo in conf/master.
s/utililzed/utilized/
2017-04-30 11:47:54 +01:00
Anthony Shaw
4fce227190
update the tutorials and docs 2017-04-30 20:32:44 +10:00
Anthony Shaw
1c4a03c538
key pair management methods and tests, linting 2017-04-30 20:28:20 +10:00
Anthony Shaw
06e94dcb58
add image management methods and tests 2017-04-30 19:49:54 +10:00
Anthony Shaw
277933e8d8
add volume, list_images, snapshot methods and tests 2017-04-30 15:04:50 +10:00
Anthony Shaw
3f3565429c
todo list 2017-04-29 16:05:05 +10:00
Anthony Shaw
3f8827f6b4
add list_volumes 2017-04-29 15:54:59 +10:00
Anthony Shaw
ec95304153
destroy and reboot node 2017-04-29 15:45:07 +10:00
Anthony Shaw
cc40734255
implement list_locations 2017-04-29 15:33:20 +10:00
Anthony Shaw
3c6f13699b
unit tests for list_nodes and list_sizes with implementation 2017-04-29 15:24:15 +10:00
Anthony Shaw
3ff296469d Merge branch 'libcloud_state' into libcloud_compute 2017-04-29 14:54:28 +10:00
Anthony Shaw
bb62c73b1b
clean up dns test method 2017-04-29 10:48:04 +10:00
Anthony Shaw
1c808dbbc0
inherit from dicts for test classes 2017-04-29 09:55:27 +10:00
twangboy
523316f0d7 Update Python and Deps 2017-04-28 17:19:15 -06:00
Anthony Shaw
d9ee7b3b7f Fix class rename errors. 2017-04-29 08:28:28 +10:00
Anthony Shaw
e92a7ba660 Merge branch 'develop' into libcloud_state 2017-04-29 07:43:28 +10:00
Anthony Shaw
e8a734ccfe
initial execution module template for libcloud_compute 2017-04-29 07:40:53 +10:00
twangboy
5371b6b85e Fix fullname parameter for add function 2017-04-28 14:30:48 -06:00
Colton Myers
91878bdab6
Fix lint 2017-04-28 12:32:21 -06:00
Erik Johnson
402be207b2 Skip Pygit2 tests until EPEL fixes pygit2/libgit2 version mismatch
We can revert this commit once they get the updated pygit2 pushed to
EPEL stable.
2017-04-28 13:25:02 -05:00
Nicole Thomas
fc26fb8a05 Merge pull request #40958 from rallytime/bp-40939
Back-port #40939 to 2016.11
2017-04-28 12:01:17 -06:00
Nicole Thomas
a586e12180 Merge pull request #40957 from rallytime/bp-38115
Back-port #38115 to 2016.11
2017-04-28 12:01:01 -06:00
Nicole Thomas
00a15eba60 Merge pull request #40905 from rkgrunt/40635
Fixed issue with parsing of master minion returns when batching is en…
2017-04-28 11:52:31 -06:00
Nicole Thomas
37dff3871e Merge pull request #40956 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-04-28 11:22:00 -06:00
Nicole Thomas
bb50d4f646 Merge pull request #40954 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-04-28 10:41:49 -06:00
Nicole Thomas
fba146ced4 Merge pull request #40955 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-28 10:27:03 -06:00
Daniel Santos
6e4cc6db47 Fix consul module "AttributeError: 'dict' object has no attribute 'json'"
Consul API has changed a little bit, some small adjustments to make the
module work again
2017-04-28 10:13:56 -06:00
rallytime
13a09fc31d Remove extra line left over from merge conflict resolution 2017-04-28 10:13:47 -06:00
Ch3LL
3e9394862f allow vmware to query deploy arg from opts 2017-04-28 09:30:00 -06:00