Refresh inventory collection requirements (#4296)

* Refresh inventory collection requirements

Fix bug specific to Docker development where the right folder of
  install was not specified in the setting

Add initial rhv/ovirt version for consistency

* Update unit test to ovirt name change
This commit is contained in:
Alan Rominger
2020-05-05 18:22:00 -04:00
committed by GitHub
parent 1ca29df0de
commit 961c5589c1
5 changed files with 12 additions and 9 deletions

View File

@@ -2491,8 +2491,9 @@ class rhv(PluginFileInjector):
"""
plugin_name = 'ovirt'
base_injector = 'template'
initial_version = '2.9'
namespace = 'ovirt'
collection = 'ovirt_collection'
collection = 'ovirt'
@property
def script_name(self):

View File

@@ -1 +1 @@
plugin: ovirt.ovirt_collection.ovirt
plugin: ovirt.ovirt.ovirt

View File

@@ -148,6 +148,9 @@ for setting in dir(this_module):
include(optional('/etc/tower/settings.py'), scope=locals())
include(optional('/etc/tower/conf.d/*.py'), scope=locals())
# Installed differently in Dockerfile compared to production versions
INVENTORY_COLLECTIONS_ROOT = '/vendor/inventory_collections'
BASE_VENV_PATH = "/venv/"
ANSIBLE_VENV_PATH = os.path.join(BASE_VENV_PATH, "ansible")
AWX_VENV_PATH = os.path.join(BASE_VENV_PATH, "awx")