Commit Graph

58140 Commits

Author SHA1 Message Date
Arthur Lutz
16b79b6d3f docstring improvement for ProxyMinion 2015-08-19 08:45:58 -06:00
Arthur Lutz
4ce50ad5bf [doc] topology / proxyminions fix typos 2015-08-19 08:44:46 -06:00
Nicole Thomas
f77491a34d Merge pull request #26457 from arthurlogilab/patch-11
docstring improvement for network.ping module execution
2015-08-19 08:18:14 -06:00
Nicole Thomas
485ab4497f Merge pull request #26455 from arthurlogilab/patch-9
[doc] topology / proxyminions fix  typos
2015-08-19 08:17:49 -06:00
Nicole Thomas
65e6283d3a Merge pull request #26456 from arthurlogilab/patch-10
docstring improvement for ProxyMinion
2015-08-19 08:17:31 -06:00
Arthur Lutz
873ffdaeff [minionproxy] example modules fixes 2015-08-19 14:27:44 +02:00
Arthur Lutz
c104e6e36d docstring improvement for network.ping module execution 2015-08-19 14:05:30 +02:00
Arthur Lutz
16f940438e docstring improvement for ProxyMinion 2015-08-19 14:04:29 +02:00
Arthur Lutz
9800bcfa3e [doc] topology / proxyminions fix typos 2015-08-19 14:03:14 +02:00
Erik Johnson
7517654e6d Use 'rpm -qa' instead of repoquery to list installed packages
Resolves #26338
2015-08-18 23:29:14 -05:00
Erik Johnson
b3a0e40a0a Line width fixes + remove raw string formatting 2015-08-18 23:14:08 -05:00
Erik Johnson
ee85c901ea Merge pull request #26449 from s0undt3ch/2015.8
The CLI options are not meant to include underscores.
2015-08-18 22:49:49 -05:00
rallytime
ce0942117d Convert a couple more functions to be able to use salt-cloud command in Linode driver 2015-08-18 16:45:56 -06:00
Pedro Algarvio
dc58dbe5bf The CLI options are not meant to include underscores.
Fixes #26444
2015-08-18 23:18:09 +01:00
Justin Findlay
a6f4c216db Merge pull request #26447 from shift/feature/fix_slack_returner_docs
[Docs] Corrected code blocks.
2015-08-18 15:30:12 -06:00
Vincent Palmer
d99a496324 Corrected code blocks. 2015-08-18 22:59:56 +02:00
Mike Place
1600f3eccd Raise clean error when no minions targeted in batch mode
Closes #26343
2015-08-18 14:46:49 -06:00
C. R. Oldham
7213fbfed4 Add end-to-end walkthrough 2015-08-18 14:43:26 -06:00
Mike Place
ff7852f67b Merge pull request #26421 from alxbse/nova-floating-ip
Add initial support for floating IP in nova cloud driver.
2015-08-18 14:29:59 -06:00
Mike Place
554b7a42f4 Merge pull request #26270 from sjorge/solaris-networking
salt.modules.network now supports SmartOS and SunOS < Solaris 11
2015-08-18 14:24:35 -06:00
Mike Place
d08839f0ed Merge pull request #26437 from s0undt3ch/hotfix/py3-FileNotFoundError-exception
On Python 3 `os.stat()` might raise FileNotFoundError.
2015-08-18 14:24:13 -06:00
Mike Place
d8ffb1c4c0 Merge pull request #26436 from TheBigBear/patch-10
minor edits
2015-08-18 14:23:36 -06:00
Mike Place
560977bc7e Fix connect issue in event init
Fix issue with 100% CPU. Refs #26366 and #26301.
2015-08-18 14:07:22 -06:00
C. R. Oldham
1889038af2 Handle lack of proxy key in pillar more gracefully. 2015-08-18 13:40:22 -06:00
rallytime
fbfcef73ee Hide API Key from debug logs for Linode Driver 2015-08-18 13:30:53 -06:00
rallytime
6e781bc8c0 Refactor a few linode functions to be useful with salt-cloud command 2015-08-18 13:11:23 -06:00
Colton Myers
bf6c7e82cc Keep the formatted assertMsg 2015-08-18 12:50:24 -06:00
C. R. Oldham
10b7eddf0b Update diagrams for docs. 2015-08-18 12:43:17 -06:00
Colton Myers
8ec612e9db Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    setup.py
2015-08-18 12:15:03 -06:00
Colton Myers
c1458980f3 Merge pull request #26434 from s0undt3ch/2015.5
Fix missed typo
2015-08-18 12:14:29 -06:00
Colton Myers
c08668ecf1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/fileserver/gitfs.py
    salt/master.py
    salt/pillar/s3.py
2015-08-18 12:13:05 -06:00
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-18 11:52:13 -06:00
Erik Johnson
5d969116ad Merge pull request #26427 from alprs/fix-git_latest_no_rev_concat
git.latest with no rev: fix concatenation error (NoneType and str)
2015-08-18 12:27:49 -05:00
Pedro Algarvio
fa00a9c412 On Python 3 os.stat() might raise FileNotFoundError.
FileNotFoundError is apparently a subclass of OSError but it wasn't
getting caught in Python 3. Adding IOError made it work.
2015-08-18 18:17:06 +01:00
TheBigBear
e57dc520f6 minor edits
lowercasing firefox as it's sls pkg name has been lowercased,
and fix one typo reops -> repos
2015-08-18 18:11:44 +01:00
Colton Myers
38f22875e1 Fix schedule test failures
Includes removal of heavily-mocked test_list and test_reload
2015-08-18 10:48:01 -06:00
C. R. Oldham
1e6e4f0256 Only default proxy minion options that really have to change. 2015-08-18 10:31:26 -06:00
Mike Place
0f64be710f Merge pull request #26430 from rallytime/fix-26426
List public and private ips under the correct label
2015-08-18 10:20:32 -06:00
Pedro Algarvio
06dcaefcaa Fix missed typo 2015-08-18 17:18:59 +01:00
C. R. Oldham
6596b72219 Add proxy-specific default configuration and change default for proxy config file & logs to /etc/salt/proxy and /var/log/salt/proxy. 2015-08-18 10:16:54 -06:00
Mike Place
4d6ebc6954 Merge pull request #26307 from cachedout/fix_26234
Fix bug in top file ordering
2015-08-18 10:02:54 -06:00
Jorge Schrauwen
53de0b49d1 fix possible shell injection 2015-08-18 15:49:03 +00:00
Alexander Backlund
0cfe63776a Added versionadded info to new functions 2015-08-18 11:46:12 -04:00
Nicole Thomas
913451a414 Merge pull request #26431 from rallytime/bp-26417
Back-port #26417 to 2015.5
2015-08-18 09:41:58 -06:00
Nicole Thomas
96b8c1fe82 Merge pull request #26428 from cro/pm_20158_2
Update docs to reflect new pillar structure
2015-08-18 09:32:23 -06:00
scottjpack
0254a2e90e Changed t1 -> t2 micro
t1.micro no longer supports HVM AMIs.  Attempted launch with a t1.micro results in:

[ERROR   ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
2015-08-18 09:22:57 -06:00
rallytime
2ba97316c9 List public and private ips under the correct label
Fixes #26426
2015-08-18 09:19:26 -06:00
Mike Place
983619f1f6 Merge pull request #26429 from cachedout/tcp_freebsd_warn
Add release note regarding tcp transport on freebsd
2015-08-18 09:06:47 -06:00
Mike Place
fa88b7d35c Add release note regarding tcp transport on freebsd
Refs #26364
2015-08-18 09:06:13 -06:00
C. R. Oldham
b5a4a53062 Update documentation to reflect new pillar structure. 2015-08-18 09:03:23 -06:00