Commit Graph

89434 Commits

Author SHA1 Message Date
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
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
Erik Johnson
1f43aa84fe
Fix incorrect use of six.string_types in ssh client
This was broken a few days ago when making PY3 incompatibility changes.
`six_text_type` needed to be used instead of `six.string_types`.
2017-12-18 08:31:38 -06:00
Nicole Thomas
0675139e2c
Merge pull request #44898 from terminalmage/revert-pr-32133
rest_cherrypy: revert addition of eauth user and groups to low chunks
2017-12-18 09:04:35 -05:00
Nicole Thomas
152b8aeaf2
Merge pull request #45044 from Ch3LL/fix_mac_tests
Fix swap_total for macosx grain detection
2017-12-18 08:56:17 -05:00
Ronald van Zantvoort
276e8828ae
libcloud_dns: pylint fix 2017-12-18 14:32:04 +01:00
Ronald van Zantvoort
c994423286
Merge branch '2017.7' into libcloud_dns_fixes 2017-12-18 12:49:33 +01:00
Ronald van Zantvoort
c72db283d5
libcloud_dns: Further fixes to state output, pylint fixes 2017-12-18 12:40:55 +01:00
rcallphin
04ab6a5e9d
Merge branch '2017.7' into fix-bug-vault-empty-policy 2017-12-16 09:57:37 -07:00
Nicole Thomas
5bd7854d27
Merge pull request #45042 from rallytime/py3-rsync-tests
Fix a couple of PY3 test failures in the rsync module
2017-12-16 08:18:24 -05:00
Nicole Thomas
04a2ea8cd1
Merge pull request #45019 from rallytime/merge-oxygen
[oxygen] Merge forward from 2017.7 to oxygen
2017-12-16 08:16:57 -05:00
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-16 08:16:23 -05:00
Ahmed AbouZaid
696cad0d02
correct comment 2017-12-16 01:12:44 +01:00
lomeroe
07d04c7bc7 lint fixes for static regexes 2017-12-15 15:04:51 -06:00
lomeroe
d17c46ce41 lint fixes
encode some of the more used characters in variables and re-use instead
of re-encoding them over and over

remove a line that was commented out
2017-12-15 15:04:51 -06:00
lomeroe
ab8e431729 do not decode registry.pol file wholesale, but instead decode individual
elements of the file

also fix issue where the get_policy_info function would not find
policies in the policy_data class by their "short" name (i.e. the key
name in the dict)
2017-12-15 15:04:51 -06:00
Nicole Thomas
d933af39a6
Merge pull request #42118 from fake-name/develop
Patches for https://github.com/saltstack/salt/issues/42106 and https://github.com/saltstack/salt/issues/42117
2017-12-15 15:51:33 -05:00
Nicole Thomas
567c363e5c
Merge pull request #44989 from vutny/oxygen-doc-schedule-util-duplicated
[Oxygen] [DOC] Add doc page reference for schedule util module
2017-12-15 14:49:48 -05:00
rallytime
ecb1e3cf82
Fix a couple of PY3 test failures in the rsync module
Fixes:
  - unit.modules.test_rsync.RsyncTestCase.test_rsync
  - unit.modules.test_rsync.RsyncTestCase.test_version
2017-12-15 14:32:32 -05:00
Ch3LL
4d6abeff66
Fix swap_total for macosx grain detection 2017-12-15 14:30:13 -05:00
Nicole Thomas
561ce04bd9
Merge branch 'oxygen' into revert-pr-32133 2017-12-15 13:16:33 -05:00
Erik Johnson
8cdb9ea54f
[PY3] Add print_function import to files with unicode_literals already added
This makes the 2.x usage invalid syntax and forces the use of print as a
function. This adds the import to the files which I've updated in the
last couple of days but forgot to add it.
2017-12-15 12:14:18 -06:00
Nicole Thomas
73e85874d8
Merge branch 'oxygen' into upstream-boto_s3_object 2017-12-15 12:36:17 -05:00
Nicole Thomas
76a4d70449
Merge pull request #43985 from bodhi-space/caller_ref_fix
Quick fix for caller_ref issues in boto_route53
2017-12-15 12:35:03 -05:00
Nicole Thomas
0b88ea7eb4
Lint: Remove unused import 2017-12-15 12:31:43 -05:00
Nicole Thomas
ba0cbea689
Lint: Remove extra blank line 2017-12-15 12:31:08 -05:00
Nicole Thomas
81ded2aaba
Merge pull request #44533 from cloudflare/nested-colors
Nested outputter colors depending on the function retcode
2017-12-15 12:28:02 -05:00
Nicole Thomas
abf34064a1
Merge pull request #44916 from jasperla/status/openbsd/meminfo
status.meminfo: add OpenBSD support
2017-12-15 12:25:56 -05:00
Nicole Thomas
4d6d640381
Merge pull request #44969 from rallytime/bp-41305
Back-port #41305 to 2016.11
2017-12-15 12:22:17 -05:00