Commit Graph

8970 Commits

Author SHA1 Message Date
Nicole Thomas
7fa89303a1 Merge pull request #39026 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-01-30 10:39:18 -07:00
Julien BONACHERA
1e06f388bb make openvswitch state work with python3 (#38873)
* openvswitch: add a basic unit test for openvswitch

* openvswitch: enclose comments_* variables into a map

* openvswitch: only prepare error messages if type parameter is present

* openvswitch: add test case: create a GRE port

* openvswitch: remove trailing whitespace

* openvswitch: add missing "comments" variable

* openvswitch: pep8 compliance

* openvswitch: mock dig.check_ip

* openvswitch: rename "type" argument into "tunnel_type"

* openvswitch: reference bridge_exists before assignment

* openvswitch: reference port_list before assignment

* openvswitch: add upgrade note about "type" option renaming
2017-01-30 09:56:10 -07:00
Mike Place
191a1e55ae Merge pull request #39006 from rallytime/python3-fixes
Various Python 3 compatibility fixes
2017-01-30 09:54:28 -07:00
Mike Place
984e6de244 Merge pull request #39024 from moio/minionswarm-set-machine-id
minionswarm.py: allow random machine id
2017-01-30 09:31:15 -07:00
Mike Place
80e4aa2ea2 Merge pull request #39022 from moio/minionswarm-reuse-existing-data
minionswarm.py: allow temporary data reuse
2017-01-30 09:29:30 -07:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/pillar/__init__.py
2017-01-30 09:06:27 -07:00
Silvio Moioli
f454dbd84c minionswarm.py: use predictable random numbers 2017-01-30 16:34:01 +01:00
Silvio Moioli
f27e0e8f4e minionswarm.py: allow random machine id 2017-01-30 14:21:52 +01:00
Silvio Moioli
382cf21b5f minionswarm.py: allow re-use of temporary files 2017-01-30 13:23:45 +01:00
Silvio Moioli
b2f7d3e3cf minionswarm.py: add option to specify temp dir 2017-01-30 13:23:45 +01:00
rallytime
fc3c9182ae [PY3] Fix find module unit tests
These unit tests exposed a bunch of python 3 incompatibilities in the
filebuffer util as well as the find util. The filebuffer changes should
be reviewed carefully.
2017-01-27 14:59:24 -07:00
rallytime
b0631ce005 [PY3] Fix timezone module unit tests
When writing to a file, the string needs to be converted to bytes first.
2017-01-27 12:15:39 -07:00
rallytime
76e95087fd Merge branch '2016.3' into '2016.11'
No conflicts.
2017-01-27 11:52:03 -07:00
rallytime
4b3ff0fe0f Skip the test_badload test until Jenkins move is complete
Once this happens, we need to re-enable the test. The move over
should also allow us to upgrade the version of salt-testing that
is applied to the test VMs. Once this is complete, we can apply
the `@flaky` decorator to this test. (salt-testing must be a
version newer than the September release.)
2017-01-27 09:51:30 -07:00
Nicole Thomas
7c93bcbb2a Add one more option to "allow_failure" for doc test (#38998) 2017-01-27 09:43:04 -07:00
rallytime
e91fcbeaac Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/minion.py
  - salt/modules/dockerng.py
  - salt/thorium/key.py
2017-01-26 16:02:06 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
2017-01-26 14:09:37 -07:00
Mike Place
efa83bc6f0 Merge pull request #38976 from rallytime/develop-docstring-fixes
More docstring fixes for the new sysmod doc test failures
2017-01-26 12:58:34 -07:00
Nicole Thomas
ca090fff1a Add new logging options to parsers_test mock for develop (#38974) 2017-01-26 12:47:23 -07:00
Nicole Thomas
a6c6e47842 Handle changing "is_default" value in moto package for boto test mock (#38973) 2017-01-26 12:05:30 -07:00
rallytime
089ad59b90 Update the vsphere execution module docs to satisfy failing doc test
- Added the "CLI Example:" syntax to function that were missing it
- Added docs to functions missing any docs and CLI examples
- Added to functions to allow_failure in sysmod test as needed
- Also adjusted the ordering of the allow_failure structure to make it
  easier to see which modules/funcitons were included (alphabetize)
2017-01-26 11:56:06 -07:00
Mike Place
3ec806c003 Merge pull request #38940 from isbm/isbm-sanitizers-fix-and-unit-test
Isbm sanitizers fix and unit test
2017-01-25 13:15:55 -07:00
Bo Maryniuk
a112b790fe Fix typo 2017-01-25 21:15:05 +01:00
Mike Place
bbadc37301 Merge pull request #38945 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-01-25 12:36:18 -07:00
Eric Radman
3e03f8a400 Fix ssh key deployment when using minimal salt-ssh roster
Allows this code path to succeed for a minimal roster file that does not
specify `ssh_options`

$ sudo salt-ssh 'login1*' test.ping
Permission denied for host login1, do you want to deploy the salt-ssh
key? (password required):
[Y/n] Y
Password for root@login1:
login1:
    True
2017-01-25 12:43:11 -05:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/utils/win_functions.py
2017-01-25 09:59:29 -07:00
rallytime
ee33a53a64 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/doc_test.py
2017-01-25 09:43:12 -07:00
Bo Maryniuk
47a16916c3 Add unit test 2017-01-25 15:44:38 +01:00
Stefano Pogliani
23468cbcd1 Apply glob pattern to file_roots and pillar_roots (master & minion).
Implements #38736
2017-01-23 23:30:34 +00:00
Pablo Suárez Hernández
4311b0b6de Increasing timeouts for running integrations tests 2017-01-23 16:55:48 +00:00
Mike Place
ec59ae67c8 Merge pull request #38859 from alxwr/2016.11
fix parsing of sockstat -4
2017-01-23 09:47:22 -07:00
Mike Place
5fe6db6201 Merge pull request #38850 from techhat/stripcache
Strip .p from cache file names
2017-01-23 09:28:45 -07:00
Alexander Weidinger
30fe5641c7 fix parsing of sockstat -4 2017-01-22 02:06:25 +01:00
Joseph Hall
109cb62e76 Remove .p from test 2017-01-20 20:22:57 -07:00
Megan Wilhite
2786e209c6 add 2016.11.2 changelog to release notes (#38848) 2017-01-20 15:32:45 -07:00
Nicole Thomas
1262fa8ef8 Merge pull request #38843 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-01-20 14:01:12 -07:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop'
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
2017-01-20 12:07:19 -07:00
Nicole Thomas
a275b9714e Merge pull request #38815 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-01-20 11:53:00 -07:00
Mike Place
efe1bf10e8 Merge pull request #38832 from terminalmage/issue38711
archive.extracted: Identify symlinks when checking for incorrect types
2017-01-20 11:36:14 -07:00
rallytime
ce6d1b103d Make sure we're using the opts dict mocking in parsers_test
The additional call to parser.parse_args(args) negates the first
patch to running self.config_func. We want the opts that we set
up in the above test to patch the setup args when the parse_args
func is called. This updates the mock to work with better with
patch and removes the additional parser.parse_args call.
2017-01-20 10:20:51 -07:00
Erik Johnson
d10c068e25 Update archive state unit tests to reflect symlinks in archive.list 2017-01-20 08:49:40 -06:00
Ch3LL
374dc1ab88 skip 2016.3.5 due to :doc: references 2017-01-19 16:14:22 -07:00
Eric Radman
9b5d28df0c Extend support for pillarenv_from_saltenv to master config
`pillarenv_from_saltenv` is already an option for minion config, this
change enables this feature on the master.

If set to `true` salt will derive the pillar environment set on the
master:

$ salt-run pillar.show_pillar saltenv=radman
my_passphrase:
    XYZ

$ sudo salt-run pillar.show_pillar saltenv=radman2
my_passphrase:
    ABC
2017-01-19 13:34:33 -05:00
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
2017-01-18 14:16:45 -07:00
Mike Place
d14f0c64eb Merge pull request #38812 from rallytime/pyobjects-test
Update pyobjects test to be a list
2017-01-18 14:06:00 -07:00
Mike Place
23b8b47258 Merge pull request #38809 from twangboy/fix_hostname_2016.3
Fix get_hostname to handle longer computer names
2017-01-18 12:31:59 -07:00
rallytime
f3e84c1ab7 Update pyobjects test to be a list
Refs the discussion in https://github.com/saltstack/salt/issues/21796#issuecomment-84454088
2017-01-18 12:16:30 -07:00
twangboy
d57a51f9f9 Fix tests for get_hostname 2017-01-18 11:27:50 -07:00
Mike Place
1033bbdde8 Merge pull request #38808 from vutny/fix-38388
Fix #38388
2017-01-18 11:19:35 -07:00
Megan Wilhite
a8a6215663 refine the os detection in archive test (#38807) 2017-01-18 11:03:55 -07:00