From 6885b6aa06fdec402dcb0b78871687621c830cbb Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Fri, 15 Jun 2018 07:08:24 +0200 Subject: [PATCH] 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 --- playbooks/zuul-stream/templates/ansible.cfg.j2 | 2 +- .../{action-general/command.pyi => actiongeneral/__init__.py} | 0 zuul/ansible/{action-general => actiongeneral}/command.py | 0 zuul/ansible/actiongeneral/command.pyi | 0 zuul/executor/server.py | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename zuul/ansible/{action-general/command.pyi => actiongeneral/__init__.py} (100%) rename zuul/ansible/{action-general => actiongeneral}/command.py (100%) create mode 100644 zuul/ansible/actiongeneral/command.pyi diff --git a/playbooks/zuul-stream/templates/ansible.cfg.j2 b/playbooks/zuul-stream/templates/ansible.cfg.j2 index e90a635f20..03dff15bb8 100644 --- a/playbooks/zuul-stream/templates/ansible.cfg.j2 +++ b/playbooks/zuul-stream/templates/ansible.cfg.j2 @@ -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 diff --git a/zuul/ansible/action-general/command.pyi b/zuul/ansible/actiongeneral/__init__.py similarity index 100% rename from zuul/ansible/action-general/command.pyi rename to zuul/ansible/actiongeneral/__init__.py diff --git a/zuul/ansible/action-general/command.py b/zuul/ansible/actiongeneral/command.py similarity index 100% rename from zuul/ansible/action-general/command.py rename to zuul/ansible/actiongeneral/command.py diff --git a/zuul/ansible/actiongeneral/command.pyi b/zuul/ansible/actiongeneral/command.pyi new file mode 100644 index 0000000000..e69de29bb2 diff --git a/zuul/executor/server.py b/zuul/executor/server.py index 357a6b811b..9d4504832f 100644 --- a/zuul/executor/server.py +++ b/zuul/executor/server.py @@ -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')