New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2018.3] Merge forward from 2017.7 to 2018.3 #48297

Merged
merged 30 commits into from Jun 30, 2018

Conversation

Projects
None yet
7 participants
@rallytime
Contributor

rallytime commented Jun 25, 2018

Conflicts:

  • salt/modules/x509.py
  • salt/runners/cloud.py
  • tests/unit/modules/test_state.py

terminalmage and others added some commits Jun 8, 2018

Add sync option to state.apply/state.sls
This allows for custom types to be synced before executing states, when
not running a highstate.
Remove redundant mocking
This mocking was added to setup_loader_modules and is no longer needed
in individual tests.
Sebastian Gerlach
Change 2018.3.2 to 2018.3.3
A quick bugfix release was added after 2018.3.1, so this code will not
make it in until 2018.3.3.
zer0def
Fixes another case of legacy configuration key usage warning getting …
…in the way of changing container's state.
Sebastian Gerlach
SDB cache module: AttributeError: 'Cache' object has no attribute 'set'
I was looking at the
[SDB cache module](https://docs.saltstack.com/en/latest/ref/sdb/all/salt.sdb.cache.html#module-salt.sdb.cache)
and it appears that there's a little bug (probably caused by some recent changes
in the caching system):

```bash
Exception occurred in runner sdb.set: Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/client/mixins.py", line 382, in _low
    data['return'] = self.functions[fun](*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/runners/sdb.py", line 42, in set_
    return salt.utils.sdb.sdb_set(uri, value, __opts__, __utils__)
  File "/usr/lib/python2.7/dist-packages/salt/utils/sdb.py", line 77, in sdb_set
    return loaded_db[fun](query, value, profile=profile)
  File "/usr/lib/python2.7/dist-packages/salt/sdb/cache.py", line 72, in set_
    cache.set(profile['bank'], key=key, value=value)
AttributeError: 'Cache' object has no attribute 'set'
```

The `set` method doesn't exist: https://github.com/saltstack/salt/blob/2017.7.7/salt/sdb/cache.py#L72

This change is enough to fix the issue:

```bash
bar
```

Moreover it seems to fix both the Execution Module and the Runner, as the Runner
simply invokes the same code, via ``salt.utils.sdb``.
Merge pull request #48242 from asnell/asnell-patch-1
Add sample list data via command line pillar
Merge pull request #48037 from terminalmage/fix-custom-types-sync-docs
Add "sync_mods" argument to state.apply/state.sls
Merge pull request #48238 from mirceaulinic/fix-sdb-cache
SDB cache module: AttributeError: 'Cache' object has no attribute 'set'
Merge pull request #48232 from gtmanfred/cloud
do not expand kwargs for cloud.action
Merge pull request #48080 from lusche/2017.7
Bugfix #47984 messed up cert serial
Merge pull request #48234 from dwoz/thin_dir
Fix py2 thin dir issues
Merge pull request #48219 from zer0def/lxc-bootstrap-fixes
Fix: LXC legacy configuration key warnings falsely report errors during state change
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/x509.py
  - salt/runners/cloud.py
  - tests/unit/modules/test_state.py
@rallytime

This comment has been minimized.

Contributor

rallytime commented Jun 25, 2018

re-run py

@rallytime rallytime merged commit 89857ea into saltstack:2018.3 Jun 30, 2018

9 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
WIP ready for review
Details
default Pull Requests » Salt PR - Main Build - PY2/PY3 #9865
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26342 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18388 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6138 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24066 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11108 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23023 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20191 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jun 30, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment