Commit Graph

96692 Commits

Author SHA1 Message Date
Daniel A. Wozniak
75ddeb3074
fix linter 2019-04-10 22:53:00 +00:00
Daniel A. Wozniak
e3e1d2ed08
fix reactor ping test 2019-04-10 22:52:52 +00:00
Daniel Wozniak
b6028b907b
Merge pull request #52403 from bdrung/fix-test-conditions
Fix test conditions
2019-04-03 10:07:53 -07:00
Daniel Wozniak
e5a755d45d
Merge pull request #52250 from twangboy/fix_grains
Fix the domain grain on Windows
2019-04-03 09:28:54 -07:00
Benjamin Drung
e74f78fca6 Skip ExtendTestCase if templates directory is missing
The release tarball does not contain the `templates` directory.
Therefore `ExtendTestCase` will fail:

```
======================================================================
ERROR: test_run (unit.utils.test_extend.ExtendTestCase)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/utils/test_extend.py", line 40, in test_run
    out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
  File "salt/utils/extend.py", line 242, in run
    MODULE_OPTIONS = _fetch_templates(os.path.join(salt_dir, 'templates'))
  File "salt/utils/extend.py", line 76, in _fetch_templates
    for item in os.listdir(src):
FileNotFoundError: [Errno 2] No such file or directory: ' templates'
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2019-04-03 16:33:07 +02:00
Benjamin Drung
0473683ace Skip SampleConfTest if sample conf directories are missing
The release tarball does not contain `conf/cloud.profiles.d`,
`conf/cloud.providers.d`, and `conf/cloud.maps.d`. Therefore the test
cases will fail:

```
======================================================================
ERROR: test_conf_cloud_maps_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 236, in test_conf_cloud_maps_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.maps.d/'

======================================================================
ERROR: test_conf_cloud_profiles_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 200, in test_conf_cloud_profiles_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.profiles.d/'

======================================================================
ERROR: test_conf_cloud_providers_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 218, in test_conf_cloud_providers_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.providers.d/'
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2019-04-03 16:32:58 +02:00
Daniel Wozniak
28f947e35a
Merge pull request #52213 from garethgreenaway/beacon_state_dont_save_test_true
[2018.3] Don't save beacons when test=True
2019-03-28 18:04:33 -07:00
Daniel Wozniak
10d041b63e
Merge pull request #52344 from twangboy/os_release_embedded
Fall back to old way of getting osrelease grain if new way fails
2019-03-28 11:06:47 -07:00
Gareth J. Greenaway
e88d3ba2a2
Merge pull request #52345 from garethgreenaway/52197_incron_cannot_have_comments
[2018.3] removing use of comments from incron modules
2019-03-28 11:03:02 -07:00
Gareth J. Greenaway
070837aaa9
Merge branch '2018.3' into 52197_incron_cannot_have_comments 2019-03-28 10:08:38 -07:00
Shane Lee
a77ec81e6f
Merge branch '2018.3' into fix_grains 2019-03-28 09:59:09 -06:00
Megan Wilhite
bda3ca2071
Merge pull request #51749 from terminal-labs/salt-cloud-map-alt-update
Salt cloud map alt update
2019-03-28 09:52:26 -04:00
Gareth J. Greenaway
8461608438
Updating the incron module, state module and tests to remove use of comments. 2019-03-27 16:53:28 -07:00
twangboy
74ab4d3792
Use old way to get osrelease if new way fails 2019-03-27 17:03:13 -06:00
Daniel Wozniak
a743fff416
Merge pull request #52113 from twangboy/fix_lgpo
Fix issue with default language in LGPO
2019-03-27 15:53:29 -07:00
Daniel Wozniak
7040643a82
Merge pull request #52172 from garethgreenaway/51959_fix_acl_present_output
[2018.3] Changes to linux_acl state.
2019-03-27 15:51:52 -07:00
Daniel Wozniak
45d6cadd9f
Merge pull request #52283 from dmurphy18/fix_cpe_name_amzn2
Update to allow for malformed CPE_NAME from some OS's
2019-03-27 15:50:58 -07:00
Daniel Wozniak
14a6b9d417
Merge pull request #52306 from terminal-labs/replace-ping-with-version
Replaced `test.ping` with `test.version`
2019-03-27 15:50:06 -07:00
Daniel Wozniak
7b2b5217bf
Merge pull request #51963 from DSRCorporation/bugs/49147_ipc_subscriber
Allow multiple instances of IPCMessageSubscriber in one process
2019-03-27 15:48:55 -07:00
Shane Lee
87bb513d63 Fix failing symlink test (#52145) 2019-03-27 14:58:57 -06:00
Dmitry Kuzmenko
37aeba3143
Minor: Fix typo in docstring 2019-03-27 23:39:00 +03:00
Dmitry Kuzmenko
cc46e9c498
Merge branch '2018.3' into bugs/49147_ipc_subscriber 2019-03-27 23:37:31 +03:00
Dmitry Kuzmenko
23733bde5a
Regression test for parallel IPCMessageSubscriber support 2019-03-27 23:33:10 +03:00
Alan Cugler
9ca0f72308 Changed where to mention the map files compatibility for minion configuration options.
This is a result of @Ch3LL suggestion on the PR itself for this doc change.
2019-03-27 12:42:03 -05:00
Alan Cugler
364ef065e8 Added mention of map file alternative for minion configuration options.
Fixes: #51127
2019-03-27 12:42:03 -05:00
Megan Wilhite
8255901b33 document regex_replace Jinja filter (#52326)
Fixes #48952.
2019-03-27 10:14:07 -06:00
Gareth J. Greenaway
3211397cef
Merge pull request #52310 from garethgreenaway/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2019-03-26 11:31:14 -07:00
Gareth J. Greenaway
9324b83c53
Merge branch '2018.3' into merge-2018.3 2019-03-26 09:38:14 -07:00
Alan Cugler
c04ba6e35e
Changed a text artifact from the ping function to supporting text for the version function. 2019-03-26 09:58:26 -05:00
Gareth J. Greenaway
71e9b665ba
Merge pull request #52312 from terminal-labs/zone-clarification
Added in an explaination of the --zone flag
2019-03-25 15:03:13 -07:00
Gareth J. Greenaway
ae0e18fd8d
Merge branch '2018.3' into zone-clarification 2019-03-25 14:42:33 -07:00
Alan Cugler
e8c8dba161
Added in an explaination of the --zone flag
approved in #52251
2019-03-25 16:10:29 -05:00
Gareth J. Greenaway
4908ed3048
Merge branch '2017.7' into merge-2018.3 2019-03-25 13:28:15 -07:00
Shane Lee
582d306164
Merge pull request #52307 from Akm0d/doc_fix
Fix x509 inconsistent file name in state example
2019-03-25 13:11:14 -06:00
Akmod
4da0fd62d3
Fix x509 inconsistent file name in state example
Solves issue: https://github.com/saltstack/salt/issues/52166
2019-03-25 11:47:27 -06:00
Alan Cugler
0b1eb00dc4
Replaced test.ping with test.version
Result of issue #52277

Any where `test.ping` still exists in the docs was left
because of the context in those docs.
2019-03-25 12:09:48 -05:00
Shane Lee
bb4a70409a
Merge branch '2018.3' into fix_lgpo 2019-03-25 09:26:01 -06:00
Shane Lee
2cdf48ed67
Merge pull request #52276 from terminal-labs/replace-github-dead-link
Replace GitHub dead link
2019-03-22 18:28:20 -06:00
Gareth J. Greenaway
a2fbbe05e1
Merge branch '2018.3' into replace-github-dead-link 2019-03-22 11:55:43 -07:00
Shane Lee
8fa0e51336
Merge pull request #52290 from Akm0d/doc_fix
Add missing master/minion docs for log_rotate*
2019-03-22 12:48:13 -06:00
Gareth J. Greenaway
08728cf660
Merge branch '2018.3' into replace-github-dead-link 2019-03-22 11:32:15 -07:00
Akmod
ca00e4bf20 Merge branch '2018.3' of github.com:saltstack/salt into doc_fix 2019-03-22 11:29:54 -06:00
Akmod
8e1ec15c39 Add missing master/minion docs for log_rotate*
Adds log_rotate_backup_count and log_rotate_max_bytes to the
minion and master config documentation
Solves issue: #51921
2019-03-22 11:26:01 -06:00
Gareth J. Greenaway
8c53890222
Merge branch '2018.3' into 51959_fix_acl_present_output 2019-03-22 10:22:48 -07:00
Dmitry Kuzmenko
2bc2a7d83e
Merge branch '2018.3' into bugs/49147_ipc_subscriber 2019-03-22 18:02:55 +03:00
David Murphy
cbe5f7d267 Update to allow for malformed CPE_NAME from some OS's 2019-03-21 17:26:38 -06:00
Shane Lee
d2fd84fca0
Merge pull request #51724 from clinta/docker-create-with-ip
add networking_config to container create fixes #51723
2019-03-21 17:06:54 -06:00
Shane Lee
c933663466
Merge branch '2018.3' into docker-create-with-ip 2019-03-21 15:01:20 -06:00
Shane Lee
838a7aa072
Merge pull request #51753 from terminal-labs/docs-sphinx-ref-deadlink-fix
Docs sphinx ref and role terminology dead link replaced
2019-03-21 13:38:56 -06:00
Shane Lee
f2b6abd9f2
Merge branch '2018.3' into docs-sphinx-ref-deadlink-fix 2019-03-21 13:38:41 -06:00