Merge "Add module_path as option for ansible-playbook action" into stable/pike
This commit is contained in:
commit
972ae4061c
|
@ -221,6 +221,7 @@ class AnsiblePlaybookAction(actions.Action):
|
|||
self._kwargs_for_run = kwargs
|
||||
self._playbook = self._kwargs_for_run.pop('playbook', None)
|
||||
self.limit_hosts = self._kwargs_for_run.pop('limit_hosts', None)
|
||||
self.module_path = self._kwargs_for_run.pop('module_path', None)
|
||||
self.remote_user = self._kwargs_for_run.pop('remote_user', None)
|
||||
self.become = self._kwargs_for_run.pop('become', None)
|
||||
self.become_user = self._kwargs_for_run.pop('become_user', None)
|
||||
|
@ -342,6 +343,9 @@ class AnsiblePlaybookAction(actions.Action):
|
|||
if self.limit_hosts:
|
||||
command.extend(['--limit', self.limit_hosts])
|
||||
|
||||
if self.module_path:
|
||||
command.extend(['--module-path', self.module_path])
|
||||
|
||||
if self.remote_user:
|
||||
command.extend(['--user', self.remote_user])
|
||||
|
||||
|
|
|
@ -71,6 +71,7 @@ workflows:
|
|||
- playbook
|
||||
- inventory_file
|
||||
- queue_name: tripleo
|
||||
- module_path: /usr/share/ansible-modules
|
||||
|
||||
tags:
|
||||
- tripleo-common-managed
|
||||
|
@ -100,7 +101,8 @@ workflows:
|
|||
verbosity: 0
|
||||
ssh_private_key: <% $.private_key %>
|
||||
ssh_extra_args: '-o StrictHostKeyChecking=no'
|
||||
limit_hosts: <% $.nodes %>
|
||||
limit_hosts: <% $.nodes %>
|
||||
module_path: <% $.module_path %>
|
||||
on-success: node_update_passed
|
||||
on-error: node_update_failed
|
||||
publish:
|
||||
|
|
Loading…
Reference in New Issue