Skip to content
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

Add --set-metadata option to salt-call #37362

Merged
merged 1 commit into from
Nov 2, 2016

Conversation

skizunov
Copy link
Contributor

What does this PR do?

Works the same as the --metadata option in the salt command.
Since --metadata was already taken in salt-call to mean
something else, went with --set-metadata for salt-call.

Tests written?

No

Signed-off-by: Sergey Kizunov sergey.kizunov@ni.com

Works the same as the `--metadata` option in the `salt` command.
Since `--metadata` was already taken in `salt-call` to mean
something else, went with `--set-metadata` for `salt-call`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
@skizunov
Copy link
Contributor Author

skizunov commented Nov 1, 2016

The test failure doesn't seem related to this change:

23:34:48 ======================================================================
23:34:48 ERROR [0.026s]: test_uptime_return_success_not_supported (unit.modules.status_test.StatusTestCase)
23:34:48 [CPU:20.0%|MEM:33.7%|Z:0] 
23:34:48 ----------------------------------------------------------------------
23:34:48 Traceback (most recent call last):
23:34:48   File "/usr/lib/python2.7/site-packages/mock.py", line 1201, in patched
23:34:48     return func(*args, **keywargs)
23:34:48   File "/testing/tests/unit/modules/status_test.py", line 149, in test_uptime_return_success_not_supported
23:34:48     status.uptime()
23:34:48   File "/testing/salt/modules/status.py", line 180, in uptime
23:34:48     return __salt__['cmd.run']('uptime')
23:34:48 KeyError: 'cmd.run'

@cachedout
Copy link
Contributor

@skizunov That's an error that slipped in accidentially earlier today. It's resolved now and unrelated to your change as you mention.

@cachedout cachedout merged commit f54840f into saltstack:develop Nov 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants