Commit Graph

89564 Commits

Author SHA1 Message Date
Nicole Thomas
dafd2fc61f
Merge pull request #45083 from Ch3LL/gce_test_fix
Force gce cloud test name to be lowercase
2017-12-20 06:46:23 -05:00
Nicole Thomas
19997e4d81
Merge pull request #45092 from terminalmage/fix-pip-test
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
2017-12-20 05:52:08 -05:00
Nicole Thomas
b1dc0de02f
Merge pull request #45038 from terminalmage/fix-missing-exc
docker_image: Fix missing exc in except, pass proper args to docker.build
2017-12-19 19:50:21 -05:00
Erik Johnson
109c9936d3
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
2017-12-19 18:37:59 -06:00
angeloudy
cf411f8984
Merge branch '2017.7' into 2017.7 2017-12-20 09:51:34 +11:00
angeloudy
177fd18671
fix TypeError in python 3
move 383d1e9970 to 2017.7
python3 expect str instead of bytes
2017-12-20 09:49:07 +11:00
Erik Johnson
7a60cfd171
Clear Python 2 .pyc files when Python 3 suite runs
This prevents import errors when Python 2 .pyc files exist and the test
suite is run under Python 3.
2017-12-19 15:35:10 -06:00
Erik Johnson
e65237c390
Update test to match how file.append works 2017-12-19 15:34:31 -06:00
Erik Johnson
4501d0d6f9
Fix nested structure test for py2 and py3 2017-12-19 15:34:11 -06:00
Erik Johnson
52903e2f09
Handle non-strings passed to exception constructors 2017-12-19 15:33:07 -06:00
Erik Johnson
76011565aa
Convert line differently depending on filehandle's mode 2017-12-19 15:32:28 -06:00
Nicole Thomas
b5e98dd2ad
Merge branch 'oxygen' into isbm-sql-pillar-bugfix 2017-12-19 15:17:52 -05:00
twangboy
42607982cb
Update docs for new support
Fix some types in the help for the installer
2017-12-19 11:10:05 -07:00
Erik Johnson
7d6b679ac4
Fix fake importer for Python 3
Python 3 does not appear to pass all values to the `__import__` builtin
when they do not differ from the defaults. Therefore, the fake import
fails because of missing positional args.

This fix simply uses the defaults from Python 2 and 3's `__import__`
builtin.
2017-12-19 12:09:36 -06:00
Erik Johnson
016ffbe7f8
Fix incorrectly-written VMware tests 2017-12-19 12:09:36 -06:00
Erik Johnson
c6f54ecff4
Make lazydict workaround PY3-compatible 2017-12-19 12:09:36 -06:00
Erik Johnson
2d0e96385f
Fix import of ipaddress on PY3
This should only be imported on PY2
2017-12-19 12:09:36 -06:00
Erik Johnson
0f16821826
docker-py logs() function returns bytestrings 2017-12-19 12:09:36 -06:00
Erik Johnson
d265b671b9
Fix incorrect type coercion 2017-12-19 12:09:36 -06:00
Erik Johnson
0b81631022
Add exception logging when we fail to start the container 2017-12-19 12:09:36 -06:00
Erik Johnson
3589667927
Make sorting a list of dicts PY3-compatible 2017-12-19 12:09:36 -06:00
Erik Johnson
744329ea90
Must use six.text_type to get exception message 2017-12-19 12:09:36 -06:00
Erik Johnson
a88f1cb80e
Fix state.sls_id in salt-ssh
Additionally, update the other funcs to pull the SLS opts from the new
salt.uilts.state.get_sls_opts().
2017-12-19 12:09:36 -06:00
Erik Johnson
15296e59a5
Add debug logging to SSHCase 2017-12-19 12:09:35 -06:00
Erik Johnson
fa66e54dd6
Pass through SLS opts to compile_state 2017-12-19 12:09:35 -06:00
Erik Johnson
aecbd151aa
Fix incorrect use of six.string_types 2017-12-19 12:09:35 -06:00
Erik Johnson
387378c4b6
Properly support pillarenv in docker.sls_build 2017-12-19 12:09:35 -06:00
Erik Johnson
76a7c0b593
docker_image: Fix missing exc in except, pass proper args to docker.build 2017-12-19 12:09:35 -06:00
rallytime
4f21a2bbfd
Merge branch '2016.11' into '2017.7'
Conflicts:
  - pkg/windows/installer/Salt-Minion-Setup.nsi
  - salt/runners/manage.py
2017-12-19 12:57:51 -05:00
twangboy
ff06d5fdb1
Add ability to pass custom config
- Adds `/custom-config=` switch where you can pass the name of the
custom config file that resides in the same directory as the installer
or the full path to a custom config in another location
- Changes from using `/use-existing-config` to `/default-config` since
existing config is default anyway
- If you pass a minion or master setting, the default is to use the
default config
- Passing minion or master settins will modify the default config or the
custom config
- Changed from using a checkbox to denote existing config to a drop down
box to denote the type of config to use. Options are `Default Config`,
`Existing Config`, and `Custom Config`
- `Existing Config` is only added to the drop down if an existing config
is found on the system.
- Adds a file picker to the config dialog that allows you to browse to
the custom config. The file picker is only displayed when the config
type is `Custom Config`
- Improves the writing of multimaster settings to the default or custom
config. If multimaster is configured in the custom config and the user
passes multiple master settings those settings are written properly
- If there is an existing config and the config type is NOT `Existing
Config`, the existing config is backed up (given the .bak extension)
instead of deleted. This includes the `minion.d` directory.
- If "/custom-config` is passed from the command line but the specified
file does not exist, the installer just ends instead of uninstalling
salt. (This is for Silent installations)
- If the Config Specified in the GUI does not exist, the installer will
not continue until a valid file is specified.
- Changes the `/passive` switch in the vcredist installation to `/quiet`
for installation on headless systems.
2017-12-19 10:28:52 -07:00
Nicole Thomas
e0d7b330fa
Merge pull request #44650 from frogunder/status
add status.pid test
2017-12-19 11:21:08 -05:00
Nicole Thomas
49a6a8f02e
Merge branch '2017.7' into avoid_unneeded_pip_install 2017-12-19 11:19:57 -05:00
Nicole Thomas
324b7d4058
Merge pull request #44078 from rossengeorgiev/fix-41044
user.present: allow date param to be 0
2017-12-19 10:59:28 -05:00
Nicole Thomas
48a59761df
Merge pull request #44970 from rallytime/update-bootstrap-script
Update bootstrap script to latest release: 2017.12.13
2017-12-19 10:49:05 -05:00
rallytime
f69ab1483f
Version added update for new boto_s3 module and state 2017-12-19 10:37:39 -05:00
Nicole Thomas
f311c6a700
Merge pull request #43296 from lyft/upstream-boto_s3_object
Upstream new boto_s3 execution/state modules
2017-12-19 10:26:26 -05:00
Nicole Thomas
aea1a584a5
Merge pull request #45054 from AAbouZaid/toml_serializer
Add TOML serializer.
2017-12-19 10:23:22 -05:00
Ch3LL
5336dac2e1
Force gce cloud test name to be lowercase 2017-12-19 10:07:06 -05:00
Nicole Thomas
6ecb2c7d5e
Merge pull request #45076 from garethgreenaway/oxygen_fixing_failing_file_tests
[oxygen] fixing failing file tests
2017-12-19 09:54:55 -05:00
Nicole Thomas
422d8b8f1b
Merge pull request #44944 from lomeroe/update_regpol_encoding
win_lgpo registry.pol encoding updates
2017-12-19 09:42:48 -05:00
Nicole Thomas
637fdaed58
Merge pull request #45069 from rallytime/bp-45040
Back-port #45040 to 2016.11
2017-12-19 09:25:57 -05:00
Gareth J. Greenaway
8c5d515ccd
Merge branch 'oxygen' into scheduler_fixes_loop_interval 2017-12-18 15:24:16 -08:00
Gareth J. Greenaway
3270f926df
Fix for failing file comment & uncomment tests with python 3.5 2017-12-18 14:46:50 -08:00
Chris Fane
de53c45c29 Backport #27160 to 2016.11 2017-12-18 21:07:06 +00:00
Jan Harasym
aa438e1605
Installation Fails on headless machines.
Installation fails on headless machines if `/passive` is set, `/passive` will display an installation progress bar on windows desktop. `/quiet` suppresses the GUI and does not fail when there is no desktop session available. Fixes #45036.
2017-12-18 13:56:58 -05:00
Tom Williams
0ca0f37805
44303 - resolves #44303 2017-12-18 13:54:17 -05:00
Nicole Thomas
a4adc82ddd
Merge pull request #45064 from terminalmage/fix-sshclient
Fix incorrect use of six.string_types in ssh client
2017-12-18 13:13:41 -05:00
Nicole Thomas
8331d51628
Merge pull request #45041 from terminalmage/add-print_function
[PY3] Add print_function import to files with unicode_literals already added
2017-12-18 11:45:26 -05:00
Gareth J. Greenaway
047e76cb31
Merge branch 'oxygen' into scheduler_fixes_loop_interval 2017-12-18 08:10:39 -08:00
Nicole Thomas
d9a4b9681e
Merge pull request #44938 from The-Loeki/libcloud_dns_fixes
Libcloud dns fixes
2017-12-18 10:47:18 -05:00