Commit Graph

47794 Commits

Author SHA1 Message Date
Mike Place
e98e65e787 Fix tests 2015-05-05 08:20:41 -06:00
Mike Place
4f760dd9cb Merge pull request #23347 from basepi/salt-ssh.functionwrapper.contains.19114
[2014.7] Salt-SSH Backport FunctionWrapper.__contains__
2015-05-05 08:13:20 -06:00
Kaithar
8d9acd1f89 Put the sed insert statement back in to the output.
Turns out that commit a369c883 (merged in PR #18368) make a bad change to modules/makeconf.py where it removed the insertion part of a '/regex/ i\text' construction.
2015-05-05 14:19:56 +01: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
02658b1e60 Merge pull request #23344 from cachedout/issue_22742
Explicitely set file_client on master
2015-05-04 17:21:48 -06:00
Colton Myers
30595e3ff7 Backport FunctionWrapper.__contains__
Otherwise `if 'config.get' in __salt__` fails becaues it tries to
iterate over a list (starting with 0, 1, 2, etc)
2015-05-04 16:39:23 -06:00
Colton Myers
be7407feae Lint 2015-05-04 16:18:30 -06:00
Colton Myers
c2c337567e Missing comma 2015-05-04 15:36:33 -06:00
Colton Myers
8e3e8e073a Pass the minion_opts through the FunctionWrapper 2015-05-04 15:33:39 -06:00
Colton Myers
cb69cd07de Match the master config template in the master config reference 2015-05-04 15:05:21 -06:00
Colton Myers
87fc3161f9 Add Salt-SSH section to master config template 2015-05-04 15:05:12 -06:00
Colton Myers
91dd9dcbdc Add ssh_minion_opts to master config ref 2015-05-04 15:00:28 -06:00
Thomas S Hatch
ba7605d1cb Merge pull request #23318 from cellscape/honor-seed-argument
Honor seed argument in LXC container initializaton
2015-05-04 14:58:12 -06:00
Thomas S Hatch
4ac4509c57 Merge pull request #23307 from jfindlay/fix_locale_gen
check for /etc/locale.gen
2015-05-04 14:56:32 -06:00
Colton Myers
c273ea14c6 Add minion config to salt-ssh doc 2015-05-04 14:48:19 -06:00
Colton Myers
a0b6b760c3 Add minion_opts to roster docs 2015-05-04 14:46:16 -06:00
Colton Myers
5212c35260 Accept minion_opts from the target information
Rosters can now define minion_opts under the host info
2015-05-04 14:37:31 -06:00
Mike Place
5adc96ce7f Explicitely set file_client on master
Failure to do so will break mine calls from the pillar. Closes #22742
2015-05-04 14:27:41 -06:00
Mike Place
6011b437ca Fix syndic pid and logfile path
Closes #23026
2015-05-04 13:06:19 -06: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
f790f42ed6 Merge pull request #23324 from s0undt3ch/hotfix/bootstrap-script-2014.7
[2014.7] Update to the latest stable release of the bootstrap script v2015.05.04
2015-05-04 10:28:30 -06: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
lorengordon
b60e224beb Append/prepend: search for full line
When `append_if_not_found` or `prepend_if_not_found`
are true, assume the `content` to search for should
match a full line in the file. The rationale is that
if the content is not found, then it will be added as
a full line. Hence, it should be safe to assume that
it should exist as a full line in the file.

Fixes #23294
2015-05-04 09:41:11 -04: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
Pedro Algarvio
6643e47ce5 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:23:54 +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
cellscape
228b1be299 Honor seed argument in LXC container initializaton
Fixed #23311
2015-05-04 16:38:08 +06:00