Commit Graph

76679 Commits

Author SHA1 Message Date
Mike Place
86c53b8efd Merge pull request #38172 from rallytime/win-deprecations
Remove support for deprecation options/functions in win* files
2016-12-19 07:33:05 -07:00
Mike Place
2cb5832b28 Merge pull request #38283 from sash-kan/patch-1
call sdecode for the filename in file.managed()
2016-12-19 07:24:49 -07:00
Mike Place
3fdcfb498d Merge pull request #38335 from mlalpho/states-saltmod-wait_for_event-data-dictionary-fix
states saltmod wait_for_event data dictionary fix
2016-12-19 07:22:44 -07:00
Mike Place
4c6a988c1f Merge pull request #38317 from mlalpho/boto_rds-backwards-compatibility-issues-and-various-bug-fixes
boto_rds: backwards compatibility issues and various bug fixes
2016-12-19 07:21:35 -07:00
Mike Place
22cd5257a1 Merge pull request #38343 from cachedout/pr-38270
Junos engine (w/lint fix)
2016-12-19 07:13:55 -07:00
Mike Place
940fd6634d
Lint errors 2016-12-19 07:11:25 -07:00
Mike Place
9747b48161 Merge pull request #38300 from cloudflare/FILE-RW
File read fun
2016-12-19 06:41:55 -07:00
Mike Place
8457db5bbc Merge pull request #38307 from HenriWahl/HenriWahl-patch-1
If no IPv4 can be found use IPv6 for salt-cloud deployment
2016-12-19 06:41:20 -07:00
Henri Wahl
5937bbe729 Added excecpt KeyError 2016-12-19 07:53:22 +01:00
rajvidhimar
a36301014c Lint and other changes 2016-12-19 10:13:34 +05:30
Mircea Ulinic
a563937326
Use alt.utils.fopen instead of native open 2016-12-19 02:24:57 +00:00
Mike Place
ea3dc75be8 Merge pull request #38267 from bbinet/grafana4
Grafana4 salt module and states
2016-12-18 06:09:34 -07:00
Mike Place
a00c0fb890 Merge pull request #38289 from skizunov/develop2
Add config options for running beacons/scheduler before connect
2016-12-18 06:06:17 -07:00
Mike Place
39eed71eca Merge pull request #38295 from porunov/develop
Add path style requests and http protocol support to the s3 module
2016-12-18 05:57:37 -07:00
Mike Place
ac5917da1d Merge pull request #38316 from mlalpho/fix-encoding-fix
salt utils aws encoding fix
2016-12-18 05:49:47 -07:00
Mike Place
ed80926975 Merge pull request #38319 from n-pochet/add-mattermost-feature
Add Mattermost feature
2016-12-18 05:36:54 -07:00
Mike Place
8fe67accb7 Merge pull request #38334 from Cloudtek/proxmox-add-rootfs-support
Add support for 'rootfs' lxc container option to salt-cloud proxmox driver
2016-12-18 05:04:15 -07:00
Michael Alphonso
f9edaac57d possibly related to core issues discussed here: #38087 #26509
the setup affected is using the orchestrate runner to call salt.wait_for_event

the event is being sent by a reactor (effectively, chaining events)

```
send_ready_event:
  local.cmd.run:
    - tgt: 'salt-minion-running-on-salt-master'
    - arg:
      - "salt-call event.send 'core/instance/test-instance/ready' '{minion: test-instance}'"
```

this is the dict for the event when a match is found while listening:
```
{
    tag: core/instance/test-instance/ready,
    data: {
        _stamp: 2016-12-18T05:05:28.047408,
        pretag: None,
        cmd: _minion_event,
        tag: core/instance/test-instance/ready,
        data: {
            __pub_user: root,
            __pub_arg: [
                core/instance/test-instance/ready,
                {minion: test-instance}
            ],
            minion: test-instance,
            __pub_fun: event.send,
            __pub_jid: 20161218000528008327,
            __pub_tgt: test-instance,
            __pub_tgt_type: glob,
            __pub_ret:
        },
        id: test-instance
    }
}
```

these changes keep the previous functionality intact and uses the inner 'data' dictionary when available to get the proper event data.

the event parsing implemented here: https://github.com/saltstack/salt/blob/develop/salt/thorium/status.py would leave me to believe that this is expected behavior for reading event data.

now my wait_for_event blocking call works as expected when the event is fired :)
2016-12-18 00:39:32 -05:00
Aaron Miller
b7575e8998 Add support for 'rootfs' lxc container option to salt-cloud proxmox driver 2016-12-17 14:46:09 -08:00
Nicolas Pochet
d0857719b9 Modify files permissions
Modify files permissions to be compliant with pylint tests
2016-12-16 22:17:35 +01:00
Michael Alphonso
a9906b31f6 oops! salt/states/boto_rds.py:380: [E0602(undefined-variable), replica_present] Undefined variable 'replica' 2016-12-16 14:48:25 -05:00
Nicolas Pochet
b1bc9f0516 Add Mattermost feature
Add Mattermost features consisting of:
- An execution module to post messages to Mattermost
- A returner to return messages during an execution module execution and
  the possibility to return the events caught on the master
- A runner to send messages from the master (our use case was to use it
  with reactors)
- Utils function to make the queries
2016-12-16 20:27:05 +01:00
Mike Place
e937fa44e1 Merge pull request #38315 from sjorge/develop-zonecfg
zonecfg module for Solaris 10 and compatible
2016-12-16 12:08:00 -07:00
Michael Alphonso
04bca9e9f2 I started out on version 2016.11.0 and went to 2016.11.1 for a few things, then debugged some other things a bit further, then merged with develop. Here are my findings:
### What does this PR do?
**module: boto_rds**
* updated `boto_rds.create`'s of describe return value changes from `{'db_instance_status': string}` to `{'rds': 'DBInstanceStatus': string}` -- fixes Runtime Exception
* updated `boto_rds.get_endpoint`:
  - return the same values as in previous `boto2.rds2` implementation -- since: fae87f1d5e (diff-59e36191d3e2ecda4e684feddb25b2d0L452)
  - Added sanity check for 'Endpoint' index to avoid exception when endpoint is not available (happens during initial "backing-up" stage after creation.)
  - Returns only string endpoint (Address) with no port value. Previous rds2 implementation only returned address.
  - Rolled back a change to describe here: b5a2e11e60

> Should either roll back to what it was, or if it should include the port (return a dict instead of string??)..I'd listen to reason :)
>     i've already updated states to split port off if colon is found.. so either implementation will work for me now.. not sure of scope of impact to any others..

* updated `boto_rds.delete` to accept tags param and pass it thru to `__salt__['boto_rds.exists']` when checking if rds has been completely deleted to be consistent with other uses of the exists calls in the module

**state: boto_rds**
* updated `boto_rds.present`'s sample code-block to reflect the new syntax with tags in a dict instead of list of lists. In the latest implementation in the module, `boto_rds._tag_doc` is used to build the tag list according to the boto3 api reference: http://boto3.readthedocs.io/en/latest/reference/services/rds.html?highlight=rds#RDS.Client.create_db_instance
* fix docblocks to reflect that the tags is expected to be a 'dict'
* fixed use of `boto_rds.exists` return data to expect `{'exists': bool}` instead of `bool`
* updated `boto_rds.absent` to pass in tags to `__salt__['boto_rds.delete']` to go along with the change in the method signature in the module

### What issues does this PR fix or reference?

Rebasing #38284 (totally deleted branch by accident, lol)

Cheers 👍
2016-12-16 14:01:57 -05:00
Michael Alphonso
465053f07f requests api says Response.encoding can sometimes be None http://docs.python-requests.org/en/master/api/#requests.Response.encoding and result.text.encode() doesn't accept None and expects a string.
this change prevents wrong-type runtime exceptions and defaults the encoding back to 'utf-8' (the default prior to PR#37912
2016-12-16 13:53:35 -05:00
Super-User
84a16317b4 zonecfg.update_resource 2016-12-16 18:13:15 +01:00
Super-User
dcc6e4f466 zonecfg.add_resource 2016-12-16 18:01:45 +01:00
Super-User
91ace447ee zonecfg.remove_resource 2016-12-16 17:28:51 +01:00
Super-User
6fd93b964e zonecfg.set_property and zonecfg.clear_property 2016-12-16 16:41:02 +01:00
Oleksandr Porunov
99c19b39ac Fix formating issues 2016-12-16 17:39:06 +02:00
Anthony Martinet
0a4caa030d fix(win_function): handle other language (#38247)
* fix(win_function): handle other language

* fix(win_functions): syntax
2016-12-16 08:35:33 -07:00
Nicole Thomas
5ece8fb244 Merge pull request #38297 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2016-12-16 08:20:46 -07:00
Bruno Binet
d8e3ef2043 update grafana4 module/states documentation
and update a few grafana4_org functions names
2016-12-16 16:15:51 +01:00
Oleksandr Porunov
8a1acbd437 Fix style issues 2016-12-16 16:20:36 +02:00
Henri Wahl
093a73e053 If no IPv4 can be found use IPv6
As IPv4 addresses delivered by DHCP server never are known to OpenNebula and thus SaltStack I give the VM an IPv6 address which then can be used by salt-cloud.
2016-12-16 14:42:51 +01:00
Oleksandr Porunov
786cb5412e Change assertTrue to assertFalse in tests 2016-12-16 15:40:20 +02:00
rajvidhimar
02439050b5 Fix imports 2016-12-16 14:24:37 +05:30
rajvidhimar
d793d71c3a Fix imports 2016-12-16 14:23:20 +05:30
Oleksandr Porunov
0e7f35e7b8 Change s3 tests. Add additional checks into the s3 module 2016-12-16 10:29:09 +02:00
rajvidhimar
fa6a9b527a Fixing lint and import 2016-12-16 13:55:05 +05:30
Bruno Binet
c75b6ef50b Fix grafana4 module/states lint errors 2016-12-16 09:06:54 +01:00
Mircea Ulinic
a5fcd454cd
File read fun 2016-12-16 07:12:46 +00:00
rallytime
05ec9f4b5b Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/netapi/rest_cherrypy/app.py
2016-12-15 20:47:35 -07:00
Oleksandr Porunov
4cca7d01d7 Add path style requests and http protocol support to s3 module 2016-12-16 00:49:03 +02:00
Sergey Kizunov
738e23947c Add config options for running beacons/scheduler before connect
Add the following configuration options to tell a minion to
set up its beacons and/or scheduler before a connection to the master
has been made: `beacons_before_connect`, `scheduler_before_connect`.

An example where this option would be useful is if we are using the
avahi_announce or bonjour_announce beacon and we would like mDNS
announcements to occur before connect, so that there is always an
announcement even if the master is down or an incorrect master hostname
is configured.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-12-15 15:23:34 -06:00
rallytime
b913779e53 Remove win_repo and win_gitrepos support from cache runner 2016-12-15 13:14:47 -07:00
rallytime
80618288cd Lint fix 2016-12-15 13:14:47 -07:00
rallytime
78fe43124e Remove deprecated install and uninstall funcs from chocolatey state
Use "installed" and "uninstalled" instead, respectively.
2016-12-15 13:14:47 -07:00
rallytime
a9f90b881a Remove suport for the "win_repo", "win_repo_mastercachefile", and "win_gitrepos" options
The "winrepo_dir", "winrepo_cachefile", and "winrepo_remotes"  options should be used instead,
respectively.
2016-12-15 13:14:47 -07:00
rallytime
a55fc381dc Remove deprecated "win_repo_source_dir" in favor of "winrepo_source_dir" 2016-12-15 13:14:47 -07:00