zuul
/
zuul
Code Issues Proposed changes

Rename action-general to actiongeneral 

Some deployment methods require an __init__.py file in every directory
containing python files. However action-general is no valid package
name so we need to rename that.

Change-Id: If15b0a6166538debc52df41c06767978ef183b05
This commit is contained in:
Tobias Henkel 2018-06-15 07:08:24 +02:00
parent 057d664ecc
commit 6885b6aa06
No known key found for this signature in database
GPG Key ID: 03750DEC158E5FA2
5 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/zuul-stream/templates/ansible.cfg.j2
View File

@ -3,7 +3,7 @@ inventory = {{ ansible_user_dir }}/inventory.yaml
gathering = smart
gather_subset = !all
lookup_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/lookup
action_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/action-general:{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/action
action_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/actiongeneral:{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/action
callback_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/callback:{{ ansible_user_dir }}/src/git.openstack.org/openstack/ara/ara/plugins/callbacks
module_utils = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/module_utils
stdout_callback = zuul_stream

0
zuul/ansible/action-general/command.pyi → zuul/ansible/actiongeneral/__init__.py
View File

0
zuul/ansible/action-general/command.py → zuul/ansible/actiongeneral/command.py
View File

0
zuul/ansible/actiongeneral/command.pyi Normal file
View File

2
zuul/executor/server.py
View File

@ -1861,7 +1861,7 @@ class ExecutorServer(object):
self.library_dir = os.path.join(plugin_dir, 'library')
self.action_dir = os.path.join(plugin_dir, 'action')
self.action_dir_general = os.path.join(plugin_dir, 'action-general')
self.action_dir_general = os.path.join(plugin_dir, 'actiongeneral')
self.callback_dir = os.path.join(plugin_dir, 'callback')
self.lookup_dir = os.path.join(plugin_dir, 'lookup')
self.filter_dir = os.path.join(plugin_dir, 'filter')