Commit Graph

9481 Commits

Author SHA1 Message Date
Erik Johnson
0f296bb7a7
Update kernelpkg test to reflect pchanges removal 2019-04-18 11:01:21 -04:00
Erik Johnson
885d6ff281
Update file.touch unit tests to reflect addition of changes in test mode 2019-04-18 11:01:16 -04:00
Erik Johnson
4bc5fd008e
Add integration tests for test mode onchanges/prereq
Conflicts:
  - tests/unit/states/test_file.py
2019-04-18 11:00:59 -04:00
Erik Johnson
ed214c4cdb
Make it possible to use prereq with test and saltmod state mods
this requisite passes a __prerequired__ kwarg so these need to support
**kwargs for that reason.

This also changes the comment for salt.function in test mode because
it's inaccurate and doesn't make sense.

Conflicts:
  - salt/states/test.py
2019-04-18 10:59:19 -04:00
Erik Johnson
6db2beb6c0
Replace "pchanges" with "changes" to fix onchanges/prereq requisites
Since "pchanges" was never supported in the state compiler, and
"changes" is what these reqs always used, replacing "pchanges" with
"changes" will allow those requisites to work in test mode.

Conflicts:
  - salt/states/file.py
  - salt/states/linux_acl.py
  - salt/utils/napalm.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_file.py
2019-04-18 10:56:30 -04:00
Daniel Wozniak
e522ffe08c
Merge pull request #52570 from DSRCorporation/bugs/revert_51963_2019.2
Simplify IPCClient and prevent corrupt messages (Turn 2) 2019.2
2019-04-17 07:03:01 -07:00
Daniel Wozniak
9faa49cca4
Merge pull request #52490 from dwoz/issue_52134
Fix pillar include regression
2019-04-17 06:54:38 -07:00
Dmitry Kuzmenko
fabbcac8e6
A couple of race conditions fixes and a test update. 2019-04-17 02:00:22 +03:00
Ch3LL
294156743a
Merge branch '2018.3' into '2019.2'
Conflicts:
  - tests/unit/transport/test_ipc.py
2019-04-12 12:31:57 -04:00
Thomas S Hatch
dd7a4baa4f
Merge pull request #52046 from twangboy/use_reg_timezone
Use registry to get timezone
2019-04-12 09:58:55 -06:00
Daniel A. Wozniak
2ed650b91f
Merge remote-tracking branch 'saltstack/2019.2' into issue_52134 2019-04-12 03:52:06 +00:00
Daniel Wozniak
6eb2bce9be
Merge pull request #52334 from waynew/51879-fix-binary-pillar-return-error
51879 fix binary pillar return error
2019-04-11 20:45:16 -07:00
Daniel Wozniak
1b969c39cf
Merge pull request #52146 from twangboy/fix_test_symlink_2019.2
Add missing symlink test
2019-04-11 17:51:15 -07:00
Daniel Wozniak
7a1b8cad9e
Merge pull request #52341 from cbosdo/virt-state-fixes
virt.pool_running: fix pool start
2019-04-11 17:14:51 -07:00
Daniel Wozniak
6040282283
Merge pull request #52427 from garethgreenaway/52350_readd_and_gate_unicode_string_literal_support
[2019.2] Support for old yaml render
2019-04-11 17:06:36 -07:00
Daniel Wozniak
80d7aea13c
Merge pull request #52160 from cbosdo/virt-whitespace-fix
Virt whitespace fix
2019-04-11 17:04:24 -07:00
Daniel Wozniak
b551bbd2e1
Merge pull request #52008 from waynew/51832-re-allow-slash-includes
Allow `/` in pillar includes
2019-04-11 17:02:39 -07:00
Daniel Wozniak
7be04287de
Merge pull request #51913 from garethgreenaway/51818_fix_when_sk_is_empty
[2019.2] Fixes to utils/nacl.py
2019-04-11 16:56:56 -07:00
Daniel Wozniak
89f0bd8820
Merge branch '2019.2' into virt-state-fixes 2019-04-11 16:35:25 -07:00
Daniel Wozniak
ead856ee93
Merge branch '2019.2' into 51879-fix-binary-pillar-return-error 2019-04-11 16:33:20 -07:00
Gareth J. Greenaway
82f010ae29
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support 2019-04-11 15:56:35 -07:00
Daniel Wozniak
fd1f539c52
Merge branch '2019.2' into virt-whitespace-fix 2019-04-11 15:53:48 -07:00
Daniel Wozniak
8e1c882715
Merge branch '2019.2' into fix_test_symlink_2019.2 2019-04-11 15:52:39 -07:00
Daniel Wozniak
55d7488d18
Merge branch '2019.2' into 51818_fix_when_sk_is_empty 2019-04-11 15:41:09 -07:00
Daniel Wozniak
8440ae1b3d
Merge branch '2019.2' into 52116-fix-host-present-fail 2019-04-11 15:38:30 -07:00
Daniel Wozniak
dd002fdad8
Fix linter 2019-04-11 15:38:15 -07:00
Daniel Wozniak
4bb918524b
Merge pull request #52506 from bloomberg/2019_zmq_uri
2019.2: transport.zmq: fix bug introduced by b7df7e75cf
2019-04-11 14:12:50 -07:00
Megan Wilhite
ae81fee398
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support 2019-04-11 16:48:05 -04:00
Matt Phillips
b682ec5a19 transport.zmq: fix bug introduced by b7df7e75cf
this change was introduced to address evidently another bug where
somehow self.opts has no master_uri - but in the process it prioritized
using master_ip over master_uri even when master_uri _is_ there.
providing master_uri as a way of specifiying which msater you would like
to create a channel for is documented used elsewhere in the codebase in
multi-master scenarios (ie, event.send, saltutil.revoke_auth)
2019-04-11 13:58:19 -04:00
Matt Phillips
1e9dd7fd3f transport.zmq: fix bug introduced by b7df7e75cf
this change was introduced to address evidently another bug where
somehow self.opts has no master_uri - but in the process it prioritized
using master_ip over master_uri even when master_uri _is_ there.
providing master_uri as a way of specifiying which msater you would like
to create a channel for is documented used elsewhere in the codebase in
multi-master scenarios (ie, event.send, saltutil.revoke_auth)
2019-04-11 13:56:13 -04:00
Shane Lee
fc8e970221
Merge branch '2018.3' into use_reg_timezone 2019-04-11 10:53:08 -06:00
Daniel A. Wozniak
b0af11f3d3
Run include tests when pillar source changes 2019-04-10 22:41:47 +00:00
Daniel A. Wozniak
f45d29b222
Remove un-needed test 2019-04-10 19:16:14 +00:00
Daniel A. Wozniak
6d80789cf1
Fix ipc unit tests 2019-04-10 17:36:36 +00:00
Wayne Werner
ee3115fa94
Allow leading dots and / as pillar separators 2019-04-09 18:11:44 -05:00
Gareth J. Greenaway
b618d44759
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support 2019-04-08 14:55:37 -07:00
Gareth J. Greenaway
cb01a1b6bb
Merge branch '2019.2' into 51818_fix_when_sk_is_empty 2019-04-08 14:41:47 -07:00
Gareth J. Greenaway
1a1e333583
Merge branch '51818_fix_when_sk_is_empty' of github.com:garethgreenaway/salt into 51818_fix_when_sk_is_empty 2019-04-08 14:40:45 -07:00
Gareth J. Greenaway
dd2306921f
Adding tests for NACL changes. 2019-04-08 14:40:06 -07:00
Shane Lee
a429542e91
Merge branch '2019.2' into fix_test_symlink_2019.2 2019-04-08 13:37:18 -06:00
Daniel A. Wozniak
47203f7f79
Fix ipc unit tests 2019-04-08 17:17:20 +00:00
Cédric Bosdonnat
b297e7db20
virt: handle whitespaces in VM names
The disk creation code is now ready to handle whitespaces in virtual
machine name.
2019-04-08 15:31:13 +02:00
Cédric Bosdonnat
25b968151e
virt.pool_running: fix pool start
Building a libvirt pool starts it. When defining a new pool, we need to
let build start it or we will get libvirt errors.
2019-04-08 14:46:42 +02:00
Cédric Bosdonnat
30981d25b9
Remove unneeded kwargs in virt states
Avoid using kwargs to get the states parameters, perfer documented
named parameters with default value.

(cherry picked from commit c7c5d6ee88)
2019-04-08 14:39:35 +02:00
Cédric Bosdonnat
0871c028c6
virt: allow defining the VM type and arch when creating it
Some hypervisors can handle several CPU architectures or have different
virtualization types. This is reflected in libvirt by the OS type (badly
named, indeed) and the arch value. Allow users to set them when creating
a VM using either virt.init or virt.running.

Signed-off-by: Cédric Bosdonnat <cbosdonnat@suse.com>
(cherry picked from commit 2463ebe5a8)
2019-04-08 14:39:35 +02:00
Cédric Bosdonnat
1c65d25eb4
Updating running domains in virt.running
So far virt.running does nothing if the corresponding domain is already
defined. Use the new virt.update function to change the domain
configuration.

(cherry picked from commit 2a5f6ae5d6)
2019-04-08 14:39:35 +02:00
Cédric Bosdonnat
13d7819c7f
Add missing virt states unit tests
So far only the virt.running state is unit tested. Add tests for the
other states. Deprecated virt states have been purposedly left untested.

(cherry picked from commit fc75872fb6)
2019-04-08 14:39:34 +02:00
Cédric Bosdonnat
0681d865f6
virt.running support for all virt.init options
virt.running actually calls virt.init if the virtual machine doesn't
exist. Let the user define all the virt.init possible options in his
running states too.

(cherry picked from commit cb00a5f9b4)
2019-04-08 14:39:34 +02:00
Cédric Bosdonnat
c6a444ba87
Add test case for virt.running
Test virt.running when the domain needs to be edited and started. This
will prevent regressions when improving virt.running to handle the new
virt.init parameters.

(cherry picked from commit 495db345a5)
2019-04-08 14:39:34 +02:00
Cédric Bosdonnat
2db7a988b2
Let virt running state provide errors
As mentioned in issue 47972, applying the virt.running state doesn't
report any error if the libvirt create call actually failed.

This commit introduces proper handling of the libvirt errors to let
users see the libvirt error in case of failure.

Also add test cases for virt.running to prevent regression.

(cherry picked from commit 451e7da55b)
2019-04-08 14:39:12 +02:00