Commit Graph

47625 Commits

Author SHA1 Message Date
Colton Myers
48e7b3ee4f Add warning about python_shell changes to 2015.2.0 release notes 2015-05-05 15:54:50 -06:00
Justin Findlay
a9777761d8 Merge pull request #23380 from gladiatr72/fix_for_double_output_with_static__salt_CLI/v2015.2
Fix for double output with static  salt cli/v2015.2
2015-05-05 15:44:28 -06:00
Justin Findlay
5c9543c1d2 Merge pull request #23379 from rahulhan/states_rabbitmq_cluster_test
Adding states/rabbitmq_cluster.py
2015-05-05 15:44:06 -06:00
Justin Findlay
430f080a3a Merge pull request #23377 from rahulhan/states_xmpp_test
Adding states/xmpp.py unit tests
2015-05-05 15:43:35 -06:00
Thomas S Hatch
8c057e6794 Merge pull request #23335 from steverweber/2015.2
2015.2: include doc in master config for module_dirs
2015-05-05 15:28:58 -06:00
Steve Weber
5e3bae95d8 help installing python pysphere lib
help installing python pysphere lib
2015-05-05 13:28:26 -04:00
Justin Findlay
1648253675 Merge pull request #23362 from jayeshka/zk_concurrency-states-unit-test
adding states/zk_concurrency unit test case
2015-05-05 09:50:06 -06:00
Rahul Handay
04c22d1acf Adding states/rabbitmq_cluster.py 2015-05-05 20:57:08 +05:30
Rahul Handay
32923b53c3 Adding states/xmpp.py unit tests 2015-05-05 20:50:20 +05:30
Mike Place
1cdaeed868 Merge pull request #23363 from jayeshka/riak-unit-test
adding riak unit test case
2015-05-05 08:23:05 -06:00
Jayesh Kariya
f9da6db459 adding riak unit test case 2015-05-05 15:39:52 +05:30
Jayesh Kariya
f60dda4b1d adding states/zk_concurrency unit test case 2015-05-05 15:37:35 +05:30
Stephen Spencer
c47fdd79c7 Actually removed the `static` bits from below the else: fold this time. 2015-05-04 19:26:22 -05:00
Stephen Spencer
4ee367956c Fix for incorrect output with salt CLI --static option
When the ``static`` option was used outside the context of the ``batch`` option
the output would appear thusly:

```bash
salt -s 'seed*ord' test.ping --out json
```

```json
{
    "seed-02.pgsql.revsys.000.lab.rackspace.ord": true,
    "seed-01.pgsql.revsys.000.lab.rackspace.ord": true,
    "seed-03.pgsql.revsys.000.lab.rackspace.ord": true
}
{
    "seed-03.pgsql.revsys.000.lab.rackspace.ord": true
}
{
    "seed-02.pgsql.revsys.000.lab.rackspace.ord": true
}
{
    "seed-01.pgsql.revsys.000.lab.rackspace.ord": true
}
```

Using the default outputter results in minion responses being displayed twice.

If it is used with the ``batch`` option, it Does The Right Thing. Since
``batch`` needs logic to take care of the presense of ``static``, it made
sense to me to remove the `if options.static:` bits from the else half
of the `if options.batch:`, extending it to `if options.batch or
options.static:` and adding
`if not options.batch: self.config['batch'] = '100%'` to make cli.batch.Batch()
happy.
2015-05-04 19:16:17 -05:00
Nicole Thomas
b3c50c2640 Merge pull request #23339 from rallytime/another_pylint
Fix all pylint errors, not just some of them in auth/rest.py
2015-05-04 12:23:45 -06:00
rallytime
860e416261 Fix all pylint errors, not just some of them in auth/rest.py 2015-05-04 12:21:52 -06:00
C. R. Oldham
c13ca3cadf Merge pull request #23338 from rallytime/fix-pylint
Fix pylint for 2015.2
2015-05-04 11:55:13 -06:00
rallytime
5f9055bbf8 Fix pylint for 2015.2 2015-05-04 11:53:02 -06:00
C. R. Oldham
16a7639519 Merge pull request #23042 from cro/rest_eauth
Add simple eauth via REST
2015-05-04 11:48:25 -06:00
Colton Myers
2071b125a3 Merge pull request #23334 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-05-04 11:08:31 -06:00
Steve Weber
97513b060a include module_dirs
include module_dirs
2015-05-04 13:00:31 -04:00
Steve Weber
36b1c87dd2 include module_dirs
include module_dirs because its more flexible than extension_modules.
2015-05-04 12:53:50 -04:00
Nicole Thomas
a43daeebd2 Merge pull request #23325 from s0undt3ch/hotfix/bootstrap-script
[2015.2] Update to the latest stable release of the bootstrap script v2015.05.04
2015-05-04 10:27:43 -06:00
Colton Myers
2abe193d5d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    salt/runners/lxc.py
    salt/states/npm.py
2015-05-04 10:26:18 -06:00
Nicole Thomas
b7d88b5b56 Merge pull request #23332 from cro/splunk_verify
Turn on SSL verify in requests
2015-05-04 10:19:09 -06:00
Nicole Thomas
dbb794e8bb Merge pull request #23331 from cro/cmdshell_doc
Add versionadded
2015-05-04 10:18:43 -06:00
Nicole Thomas
5487367baa Merge pull request #23329 from cro/cloud_verify_cert
Require requests to verify cert when talking to aliyun and proxmox cloud providers
2015-05-04 10:18:17 -06:00
C. R. Oldham
386017b2bf Turn on ssl verify for requests. 2015-05-04 09:04:51 -06:00
Justin Findlay
004dfe8056 Merge pull request #23320 from jayeshka/gnomedesktop-states-unit-test
adding states/gnomedesktop unit test case
2015-05-04 08:58:37 -06:00
C. R. Oldham
4de7a96769 Document cmd.shells and cmd.shell added in 2015.2 2015-05-04 08:58:28 -06:00
Justin Findlay
e5337d7435 Merge pull request #23319 from jayeshka/glusterfs-states-unit-test
adding states/glusterfs unit test case
2015-05-04 08:58:01 -06:00
C. R. Oldham
6a2ad520cb Document cmd.shells and cmd.shell added in 2015.2 2015-05-04 08:57:08 -06:00
C. R. Oldham
860d4b7338 Turn on ssl verify for requests. 2015-05-04 08:40:14 -06:00
Pedro Algarvio
5cb5bc55f6 Merge pull request #23326 from s0undt3ch/2015.2
Fix the plugin module name
2015-05-04 15:20:30 +01:00
Pedro Algarvio
c8f84e0c2a Fix the plugin module name 2015-05-04 15:19:05 +01:00
Pedro Algarvio
39304989c1 Update to the latest stable release of the bootstrap script v2015.05.04
* Fix the configuration path for FreeBSD. #567/#552. Thanks Ronald van Zantvoort(The-Loeki).
* Fix non grouping support in POSIX sed. Thanks Ronald van Zantvoort(The-Loeki).
* Add Debian 8 support. Thanks Matt Black(mafrosis)
* Improve Debian version parsing. Thanks Mark Lee(malept)
* Make sure we update packages list one Chris Lea's PPA repository is added.
* Hard code the Debian Squeeze backports to the DE mirror since the main repository is down. Thanks @panticz. saltstack/salt-bootstrap#589.
* Only install git if not already installed. saltstack/salt-bootstrap#560
* Fix openSUSE 13.2 where we need to pass --replaceflags. Thanks Roman Inflianskas(rominf). saltstack/salt-bootstrap#504.
* Make sure that a recent enough requests package is installed in Debian/Ubuntu.
* Install tornado on git installs for the develop branch if necessary. saltstack/salt-bootstrap#580
* Add support for Ubuntu 15.04
2015-05-04 13:27:17 +01:00
Jayesh Kariya
f441e232e2 adding states/gnomedesktop unit test case 2015-05-04 16:10:54 +05:30
Jayesh Kariya
b8a8b52f1d adding states/glusterfs unit test case 2015-05-04 16:09:41 +05:30
Justin Findlay
ea2017672d Merge pull request #23311 from cellscape/fix-salt-cloud-lxc-init
Fix new container initialization in LXC runner
2015-05-04 03:55:29 -06:00
cellscape
76fbb34e7d Fix new container initialization in LXC runner
When creating new LXC container with help of salt-cloud lxc.init crashes
with similar message:

[INFO    ] Creating container(s) '['test-host']' on host 'lxc-host'
[ERROR   ] Failed to create VM test-host. Configuration value 'test-host' needs to be set
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/cloud/__init__.py", line 1193, in create
    output = self.clouds[func](vm_)
  File "/usr/lib/python2.7/dist-packages/salt/cloud/clouds/lxc.py", line 424, in create
    cret = _runner().cmd('lxc.cloud_init', [vm_['name']], kwarg=kwarg)
  File "/usr/lib/python2.7/dist-packages/salt/runner.py", line 123, in cmd
    return self.functions[fun](*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/runners/lxc.py", line 355, in cloud_init
    saltcloud_mode=True, quiet=quiet, **kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/runners/lxc.py", line 257, in init
    kw['seed'] = seeds[name]
KeyError: 'test-host'

The reason is that salt-cloud always passes generated keys to lxc.init,
it skips seeds dictionary population and errors out trying to lookup
non-existent key.

Fix this by using fallback value of True because we always want to seed
minion in such case.
2015-05-04 10:50:42 +06:00
Nicole Thomas
23b0291f96 Merge pull request #23304 from s0undt3ch/2015.2
Py3 compatible function globals attribute
2015-05-03 10:06:27 -06:00
Nicole Thomas
5f40a15014 Merge pull request #23297 from chris-prince/2015.2
Fixed issue #18880 in 2015.2 branch
2015-05-03 09:50:04 -06:00
Nicole Thomas
c399b8f568 Merge pull request #23298 from chris-prince/2014.7
Fixed issue #18880 in 2014.7 branch
2015-05-03 09:49:41 -06:00
Nicole Thomas
587c63733f Merge pull request #23254 from cro/mac_sys_prof
Module to support Mac OS X's system_profiler.
2015-05-03 09:39:50 -06:00
Pedro Algarvio
5d6d36e641 Py3 compatible function globals attribute 2015-05-03 16:18:52 +01:00
Thomas S Hatch
49d3835817 Merge pull request #23279 from sambev/issue/#23278
Iterate over a copy of schedule[job] since we are mutating it.
2015-05-02 18:42:01 -06:00
C. R. Oldham
c6d2f6bb0d Typo. 2015-05-02 16:11:15 -06:00
C. R. Oldham
f9b1d0a3ff Spelling error. 2015-05-02 16:04:19 -06:00
C. R. Oldham
5d6d32b766 Rename module per @rallytime's suggestion, fix non-Python 2.6 code 2015-05-02 15:58:46 -06:00
chris-prince
7c5a0e32d9 Fixed issue #18880 in 2015.2 branch 2015-05-02 11:25:43 -07:00