diff options
| author | Matt Martz <matt@sivel.net> | 2018-08-13 16:21:33 -0500 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2018-08-13 14:21:33 -0700 |
| commit | 1b2c6919803dca4a49042afd1f014a996499cc9d (patch) | |
| tree | 9fddd83d922c30bb4bcead54efe9bda2d87dc9e8 | |
| parent | 9ee6651a42fdc3b084132c032933acd565e78ce9 (diff) | |
| download | ansible-1b2c6919803dca4a49042afd1f014a996499cc9d.tar.gz | |
[2.6] Fix invocation output. Fixes #43447 (#43542) (#43646)
* [2.6] Fix invocation output. Fixes #43447 (#43542)
(cherry picked from commit 4094b01)
Co-authored-by: Matt Martz <matt@sivel.net>
* Add changelog for #43542
| -rw-r--r-- | changelogs/fragments/slack_callback_invocation.yaml | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/callback/slack.py | 28 |
2 files changed, 16 insertions, 14 deletions
diff --git a/changelogs/fragments/slack_callback_invocation.yaml b/changelogs/fragments/slack_callback_invocation.yaml new file mode 100644 index 0000000000..b7303a76e1 --- /dev/null +++ b/changelogs/fragments/slack_callback_invocation.yaml @@ -0,0 +1,2 @@ +bugfixes: +- slack callback - Fix invocation by looking up data from cli.options (https://github.com/ansible/ansible/pull/43542) diff --git a/lib/ansible/plugins/callback/slack.py b/lib/ansible/plugins/callback/slack.py index 4638c1b743..f53c68f412 100644 --- a/lib/ansible/plugins/callback/slack.py +++ b/lib/ansible/plugins/callback/slack.py @@ -76,6 +76,8 @@ class CallbackModule(CallbackBase): super(CallbackModule, self).__init__(display=display) + self._options = cli.options + if not HAS_PRETTYTABLE: self.disabled = True self._display.warning('The `prettytable` python module is not ' @@ -132,27 +134,25 @@ class CallbackModule(CallbackBase): '*Playbook initiated* (_%s_)' % self.guid ] invocation_items = [] - if self._plugin_options and self.show_invocation: - tags = self.get_option('tags') - skip_tags = self.get_option('skip_tags') - extra_vars = self.get_option('extra_vars') - subset = self.get_option('subset') - inventory = os.path.basename( - os.path.realpath(self.get_option('inventory')) - ) - - invocation_items.append('Inventory: %s' % inventory) - if tags and tags != 'all': - invocation_items.append('Tags: %s' % tags) + if self._options and self.show_invocation: + tags = self._options.tags + skip_tags = self._options.skip_tags + extra_vars = self._options.extra_vars + subset = self._options.subset + inventory = [os.path.abspath(i) for i in self._options.inventory] + + invocation_items.append('Inventory: %s' % ', '.join(inventory)) + if tags and tags != ['all']: + invocation_items.append('Tags: %s' % ', '.join(tags)) if skip_tags: - invocation_items.append('Skip Tags: %s' % skip_tags) + invocation_items.append('Skip Tags: %s' % ', '.join(skip_tags)) if subset: invocation_items.append('Limit: %s' % subset) if extra_vars: invocation_items.append('Extra Vars: %s' % ' '.join(extra_vars)) - title.append('by *%s*' % self.get_option('remote_user')) + title.append('by *%s*' % self._options.remote_user) title.append('\n\n*%s*' % self.playbook_name) msg_items = [' '.join(title)] |