Commit Graph

78184 Commits

Author SHA1 Message Date
Mike Place
9836d7dd29 Merge pull request #39076 from terminalmage/pr-38705
Re-submit PR #38705 against 2016.11 branch
2017-01-31 13:11:55 -07:00
Mike Place
9bdf2c1f08 Fix trailing whitespace 2017-01-31 12:39:35 -07:00
Mike Place
bdaa52ac4e Merge pull request #39043 from twangboy/develop
SaltTesting fixes for Windows
2017-01-31 12:27:39 -07:00
Mike Place
86b4b77bfe Merge pull request #39058 from sergeizv/fix-lvm-fullversion
Fix salt.modules.linux_lvm.fullversion
2017-01-31 12:01:12 -07:00
Winston Liu
c2d35d181f update botocore dependencies, skip if not met. 2017-01-31 10:49:34 -08:00
Winston Liu
01718e5802 function_present for boto_lambda state module now accepts Lambda Environment Variables. 2017-01-31 10:49:03 -08:00
Mike Place
721b245f90 Merge pull request #39066 from techhat/issue39051
127.0.0.0/8 is all loopback
2017-01-31 11:43:21 -07:00
Mike Place
c54d9f4e2a Merge pull request #39071 from sergeizv/fix-lvm-pvcreate
Fix modules.linux_lvm.pvcreate on existing LVM PVs
2017-01-31 11:36:53 -07:00
Mike Place
445a4d025b Additional newline to separate funcs
Needed for pylint
2017-01-31 11:30:38 -07:00
Mike Place
fd7911f65b Merge pull request #39073 from sergeizv/grammar-fixes-in-docstrings
Grammar fixes in docstrings
2017-01-31 11:25:26 -07:00
Mike Place
fa8053045b Merge pull request #39074 from sergeizv/remove-bad-comment
Remove bad comment
2017-01-31 11:23:15 -07:00
Daniel Wallace
bdd142b4eb use_keystoneauth should default to False if not specified 2017-01-31 12:14:40 -06:00
Nasenbaer
15db8d47ed Fix for #38704 archive extracted and dockerio states
Do not run file managed as state.single as this conflicts (and fails)
when additional state runs are already scheduled.
2017-01-31 11:51:04 -06:00
Erik Johnson
aa6bd51b6b Add Pillar Decryption info to Nitrogen release notes 2017-01-31 11:25:58 -06:00
Erik Johnson
18a58b2b63 Document pillar decryption feature in pillar docs 2017-01-31 11:25:58 -06:00
Erik Johnson
dec7cbf9c5 Add documentation on pillar decryption config items 2017-01-31 11:25:56 -06:00
Erik Johnson
894f365090 Update master config template with pillar decryption args 2017-01-31 11:24:09 -06:00
Erik Johnson
55f7dafad8 Decrypt pillar data at end of pillar compilation 2017-01-31 11:24:09 -06:00
Erik Johnson
d1fbdd7940 Add pillar_enc support to CLI pillar in pillar.items 2017-01-31 11:24:09 -06:00
Erik Johnson
8b979ab674 Rework minion-side pillar decryption for state subsystem 2017-01-31 11:24:09 -06:00
Erik Johnson
8c936666bf Add salt.utils.crypt 2017-01-31 11:24:09 -06:00
Erik Johnson
a34be54fc2 Add a new config option for list of available pillar decryption renderers
Also rename the option which specifies the default, to reduce confusion.
2017-01-31 11:24:09 -06:00
Erik Johnson
558c72f64a salt.utils: add default value for "default" in traversal funcs 2017-01-31 11:24:09 -06:00
Erik Johnson
322a9d84c2 Add new config params for pillar decryption 2017-01-31 11:24:04 -06:00
C. R. Oldham
fb9d884152 Add CLI Examples so tests will pass 2017-01-31 10:23:06 -07:00
Erik Johnson
83bde29810 Decrypt pillar override before it is passed to Pillar object
This allows pillar override to be available in an unencrypted state
during pillar compilation instead of clumsily bolting it on after the
fact.
2017-01-31 11:22:52 -06:00
Nicole Thomas
122422bc08 Bump openstack deprecation notice to Oxygen (#39067)
I spoke with @gtmanfred and this isn't ready to be removed just yet,
so we're bumping the removal to Oxygen.
2017-01-31 10:21:13 -07:00
Sergei Zviagintsev
f4bf77a996 Fix test name (#39061)
Remove an unnecessary underscore character from the name of the
linux_lvm.lvdisplay test:

  test__lvdisplay -> test_lvdisplay
2017-01-31 10:20:13 -07:00
Inveracity
fc4e51a295 bugfix adding subnetwork option to gce
Previously when deploying to custom networks salt-cloud would fail with the error described in #31071
Now it is possible to specify a subnetwork in the profile, to deploy to a custom network and a specific subnet in that network.
2017-01-31 18:08:26 +01:00
Nicole Thomas
73286ac9e7 Merge pull request #39064 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-01-31 10:07:06 -07:00
Sergei Zviagintsev
f1e3e86e6a Fix modules.linux_lvm.pvcreate on existing LVM PVs
If all the devices submitted to pvcreate() are already initialized as
LVM physical volumes and override is True (which is default), pvcreate()
should return True and no futher actions should be made. The
'not cmd[1:]' check which is suited for this scenario is incorrect, as
we previously filled the 'cmd' list with two elements and thus the
condition would be always False. This would cause pvcreate() to call the
pvcreate executable with no arguments if all the submitted devices are
already initialized as LVM PVs.

Fixes #39070
2017-01-31 17:57:57 +01:00
Sergei Zviagintsev
0f84ca2487 Add test for modules.linux_lvm.pvcreate on existing LVM PVs
If all the devices submitted to pvcreate() are already initialized as
LVM physical volumes, pvcreate() should return True and no futher
actions should be made.
2017-01-31 17:57:21 +01:00
Sergei Zviagintsev
3967992bfd Fix test for modules.linux_lvm.pvcreate
pvdisplay() would be called by pvcreate() twice: firstly to check
whether a device is already initialized for use by LVM and then to
ensure that the pvcreate executable did its job correctly. The test
replaces pvdisplay() with a mock that always returns True and thus
pvcreate() would think that a specified device is already initialized
and exit. In the other words, instead of testing physical volume
initialization the test simulates a case with all the submitted
devices already initialized.

Fix it by replacing pvdisplay with a mock that returns False on the
first call (thus pvcreate thinks that a device is not a PV yet) and True
on the second call (after the pvcreate executable is called).
2017-01-31 17:49:28 +01:00
Sergei Zviagintsev
7faa13adb3 Remove bad comment
The comment seems to stay there by mistake as it has no relation to
what's really going on (i.e. checking whether the device is already an
LVM PV). Remove it.
2017-01-31 17:48:35 +01:00
Nitin Kumar
dbb270a96d Merge pull request #7 from rajvidhimar/fix_facts_refresh
Fix facts refresh
2017-01-31 21:58:25 +05:30
Joseph Hall
ea43bb8101 127.0.0.0/8 is all loopback 2017-01-31 09:07:46 -07:00
rallytime
0e5fa1b8ae Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/vsphere.py
2017-01-31 08:57:44 -07:00
Nicole Thomas
88b171f863 Merge pull request #39048 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-01-31 08:55:48 -07:00
Mircea Ulinic
7118eff034 Avoid KeyError: 'multiprocessing'
Fix for #39059
2017-01-31 15:52:23 +00:00
Sergei Zviagintsev
e46c89f9ed Fix salt.modules.linux_lvm.fullversion
Due to an indentation error fullversion() returns only the last string
of 'lvm version' output. Fix it.

Fixes #39057
2017-01-31 16:26:08 +01:00
Sergei Zviagintsev
fb7ef99838 Fix mock emulating lvm version
'lvm version' produces multiline output whereas test_version and
test_fullversion use mocks with single-line output. Use real-life
'lvm version' output in those mocks instead.
2017-01-31 16:22:38 +01:00
Sergei Zviagintsev
517051a2e4 Simplify string manipulation
By explicitly checking the length of 'exc_str_prefix', omit the
try-except block, handling of the leading whitespace, and the comment on
what's going on.
2017-01-31 15:00:52 +01:00
rajvidhimar
eabc590ed7 Change grains 2017-01-31 18:12:07 +05:30
rajvidhimar
e4cb25f204 proxy 2017-01-31 18:08:24 +05:30
rajvidhimar
d8dfafdf8a Changes in facts dictionary 2017-01-31 17:52:44 +05:30
Ronald van Zantvoort
2e6d915cbf Salt-SSH cache roster lint fixes 2017-01-31 13:01:42 +01:00
Ronald van Zantvoort
a68d47de73 Introduction of a new Salt-SSH cache roster with vastly expanded options 2017-01-31 12:19:03 +01:00
Sergei Zviagintsev
a5210917fa Grammar fixes in docstrings
Remove unneeded 'an' articles
2017-01-31 12:09:02 +01:00
Nitin Kumar
ebe9a6c196 Merge pull request #6 from rajvidhimar/fix_facts_refresh
Bug fixes in facts_refresh and rpc
2017-01-31 16:18:52 +05:30
rajvidhimar
2716ee7600 Replace rpc-reply with rpc_reply in rpc function 2017-01-31 14:27:09 +05:30