Daniel Wallace
e8dc8baf71
if line in output of localectl is empty, ignore it
2018-10-29 14:29:14 -05:00
Nicole Thomas
10ba8b42a8
Merge pull request #50276 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-10-29 15:05:14 -04:00
Nicole Thomas
0f1dc08d41
Merge pull request #50282 from twangboy/fix_test_diskusage
...
Fix `unit.beacons.test_diskusage` on Windows
2018-10-29 14:37:12 -04:00
Nicole Thomas
e00c507670
Merge pull request #50287 from whytewolf/boto_vpc
...
minor correction to boto_vpc.route_table_present example
2018-10-29 14:24:12 -04:00
Thomas "Whytewolf" Phipps
5a396441a3
minor correction to boto_vpc.route_table_present example, subnet_names was on wrong indent level
2018-10-29 11:15:57 -07:00
Daniel Wallace
37ae06cefb
Merge pull request #50280 from gtmanfred/2017.7
...
fix InstallRequirement.from_line for pip 18.1
2018-10-29 12:10:03 -05:00
Cédric Bosdonnat
ce1288e437
virt: changing disk bus should update it in the VM
...
So far two disks are considered equal if they have the same source file.
When a user only wants to change the disk bus, then the disk comparison
algorithm will consider it unchanged.
Now disks are compared on source and target bus. The other disk
variables can be left out side the target device is computed.
2018-10-29 18:06:34 +01:00
Cédric Bosdonnat
7c91803d73
virt: expose source_file disk property to user
...
User may want to update or create a VM with a disk image created or
provided by a third party tool. In order to do this, let the user set
a source_file property to the disk.
Thus a {'name': 'myimage', 'source_file': '/path/to/image'} disk will
just use the provided disk image.
2018-10-29 18:06:27 +01:00
rallytime
96a225d501
Revert "Remove saltclass pillar unit test for list expansion"
...
This reverts commit 85a9395c2a
2018-10-29 13:05:09 -04:00
rallytime
086371f567
Revert "Remove pgjsonb returner unit tests"
...
This reverts commit ab4a670ff2
2018-10-29 13:03:40 -04:00
rallytime
4e930a0fed
Revert "Remove "test_custom" from grains section of filename_map"
...
This reverts commit 68ab3eef55
2018-10-29 13:03:27 -04:00
rallytime
fffe689f98
Revert "Remove test_error from scheduler tests"
...
This reverts commit 68146983cb
2018-10-29 13:03:12 -04:00
rallytime
ff9e5f9b25
Revert "Remove test files for beacons that don't exist in 2018.3"
...
This reverts commit dfa05b978e
2018-10-29 12:58:25 -04:00
rallytime
3f2712fbc1
Merge branch '2018.3' into 'fluorine'
...
Conflicts:
- tests/unit/states/test_virt.py
- tests/unit/test_config.py
2018-10-29 12:36:28 -04:00
twangboy
fd369dd115
Mock is_windows = False
2018-10-29 10:25:56 -06:00
Nicole Thomas
f7c2f04574
Merge pull request #50182 from terminalmage/issue50050
...
Backport runtests.py modifications from develop to 2018.3
2018-10-29 12:25:06 -04:00
rallytime
f05abb09de
Merge branch '2017.7' into '2018.3'
2018-10-29 11:22:36 -04:00
Nicole Thomas
6ae8a33ced
Merge pull request #50281 from dubb-b/add_subnet
...
Add subnet
2018-10-29 11:20:12 -04:00
Nicole Thomas
4fdcf7c4a7
Lint: Add extra blank line
2018-10-29 11:17:12 -04:00
Brett Benassi
cebfd8ad03
Fixing lint error
2018-10-29 09:08:48 -06:00
rallytime
113d76e045
Revert "Move jinja templating tests alongside salt/utils/jinja.py's tests"
...
This reverts commit 6d9c2eb6b0
2018-10-29 11:05:33 -04:00
Brett Benassi
0da6301d5a
Merge branch '2017.7' of https://github.com/saltstack/salt into add_subnet
2018-10-29 08:58:05 -06:00
Brett Benassi
2df611565a
Adding subnetID so it knows the right VPC to build the node in.
2018-10-29 08:57:22 -06:00
Daniel Wallace
58080747e1
fix InstallRequirement.from_line for pip 18.1
...
Fixes #49967
2018-10-29 09:53:21 -05:00
rallytime
3057ca4b0b
Lint fix: add extra blank line in core.py
2018-10-29 10:46:46 -04:00
rallytime
8968f9d164
Revert "Rename test_map_conf test file to respect naming convention"
...
This reverts commit 8326a09921
2018-10-29 10:46:29 -04:00
rallytime
85a9395c2a
Remove saltclass pillar unit test for list expansion
...
This test only applies to functionality present in Fluorine or newer.
This commit will need to be reverted again in the fluorine branch.
2018-10-29 10:34:24 -04:00
rallytime
3d95673be0
Use get_config_dir() instead of self.config_dir
...
This attribute does not exist in the 2018.3 branch. Use the function
for now, and then change this back on the merge-forward.
2018-10-29 10:23:00 -04:00
rallytime
e8b3a62b31
Add init file back in for unit/client pkg
...
This file was accidentally removed during some test renaming. The absence
of this file prevents the test from running due to an ImportError.
2018-10-29 10:19:52 -04:00
rallytime
a0cfbdcb79
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-10-29 09:55:06 -04:00
Jodok Batlogg
1e10c6e589
add support for clonenum parameter
2018-10-29 09:39:31 -04:00
Thayne Harbaugh
0a1e607748
When the minion key is denied by the master then exit status 77 (permission denied)
2018-10-29 09:35:33 -04:00
Nicole Thomas
1e8b092256
Merge pull request #50267 from m03/fix-aptly-config-paths-20183
...
Fix missing aptly config paths
2018-10-29 09:27:22 -04:00
Mike Place
25a8dbe3e9
Merge pull request #50237 from twangboy/fix_test_cmdmod
...
Fix `unit.modules.test_cmdmod` on Windows in Kitchen
2018-10-29 13:56:47 +01:00
Anna Martynova
d059edd45f
apt: speedup installing packages with '>=' or '<=' and reduced memory consumption
2018-10-29 13:53:35 +03:00
m03
319bb31944
Fix missing aptly config paths
2018-10-28 11:32:45 -07:00
Daniel Wallace
b94a43b09e
Merge pull request #50184 from ethanculler/fix-minion-return-exception-with-return
...
Added handling for minion return exceptions containing the word "return"
2018-10-26 19:16:56 -05:00
Daniel Wallace
6b009b4290
Merge pull request #50258 from dubb-b/fix_cloud_ec2
...
Adding securitygroupname as the config instead of securitygroup
2018-10-26 18:03:06 -05:00
Brett Benassi
6a1e9f0a7f
Adding securitygroupname as the config instead of securitygroup
2018-10-26 15:38:48 -06:00
Daniel Wallace
3e1aac9dad
Merge pull request #50251 from gtmanfred/2017.7
...
bump salt version to 2017.7.8 for test bootstrapping
2018-10-26 15:54:50 -05:00
Cédric Bosdonnat
d527dd29cc
Rename states/test_libvirt.py into states/test_virt.py
...
Modules test files are named after the module itself, the state virt
module needs to comply with that rule too.
2018-10-26 16:05:03 -04:00
rallytime
ab4a670ff2
Remove pgjsonb returner unit tests
...
The tests that are written in this file are for functions not present
in the 2018.3 branch.
This commit will need to be reverted in the merge-forward to `fluorine`.
2018-10-26 15:58:46 -04:00
rallytime
68ab3eef55
Remove "test_custom" from grains section of filename_map
...
This test is for functionality only available in fluorine and newer.
Removing this for 2018.3.
2018-10-26 15:17:12 -04:00
Gareth J. Greenaway
8935e3c58b
Porting #50216 to fluorine.
2018-10-26 12:03:51 -07:00
rallytime
68146983cb
Remove test_error from scheduler tests
...
These tests are not present on 2018.3
2018-10-26 14:54:25 -04:00
rallytime
c55dcf02eb
Add init file back in for integration/cloud/clouds pkg
...
This was accdientally removed during some cloud test file renaming, which
prevents the test from running due to an ImportError
2018-10-26 14:32:03 -04:00
Daniel A. Wozniak
59ac284efc
Do not allow age to be a negative number
2018-10-26 10:24:37 -07:00
Daniel Wallace
061e5997cc
bump salt version to 2017.7.8
2018-10-26 12:07:48 -05:00
twangboy
9a2547b526
Encode os.linesep
2018-10-26 10:00:23 -06:00
Nicole Thomas
303f991f6a
Merge pull request #50225 from rallytime/merge-fluorine
...
[fluorine] Merge forward from 2018.3 to fluorine
2018-10-26 09:32:36 -04:00
