diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index c8a54354cf..7bc3c80b5e 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -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): diff --git a/awx/main/tests/data/inventory/plugins/rhv/files/ovirt.yml b/awx/main/tests/data/inventory/plugins/rhv/files/ovirt.yml index a2aacf5656..0c7dec7b16 100644 --- a/awx/main/tests/data/inventory/plugins/rhv/files/ovirt.yml +++ b/awx/main/tests/data/inventory/plugins/rhv/files/ovirt.yml @@ -1 +1 @@ -plugin: ovirt.ovirt_collection.ovirt +plugin: ovirt.ovirt.ovirt diff --git a/awx/settings/development.py b/awx/settings/development.py index ac2a9fde94..b971931cf8 100644 --- a/awx/settings/development.py +++ b/awx/settings/development.py @@ -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") diff --git a/requirements/collections_requirements.yml b/requirements/collections_requirements.yml index 333ed62924..ea7abf5578 100644 --- a/requirements/collections_requirements.yml +++ b/requirements/collections_requirements.yml @@ -1,18 +1,18 @@ --- collections: - name: awx.awx - version: 9.3.0 + version: 11.2.0 # almost all versions should work - name: azure.azcollection version: 0.1.2 - name: amazon.aws version: 0.1.1 # version 0.1.0 seems to have gone missing - name: theforeman.foreman - version: 0.7.0 # contains the inventory plugin, but more patches are needed + version: 0.8.0 - name: google.cloud version: 0.0.9 # contains PR 167, should be good to go - name: openstack.cloud version: 0.0.1-dev85 # earlier had checksum mismatch - name: community.vmware version: 0.4.0 # first to contain necessary grouping and filtering features - - name: ovirt.ovirt_collection - version: 1.0.1 # new fix published, should be good to go + - name: ovirt.ovirt + version: 1.0.0 # contains naming fix, was originally named ovirt.ovirt_collection diff --git a/tools/collections/clone_vendor.sh b/tools/collections/clone_vendor.sh index 06f6e19956..0f4e087666 100644 --- a/tools/collections/clone_vendor.sh +++ b/tools/collections/clone_vendor.sh @@ -50,10 +50,10 @@ else echo "VMWare collection already exists" fi -if [ ! -d "$base_dir/ovirt/ovirt_collection" ] +if [ ! -d "$base_dir/ovirt/ovirt" ] then mkdir -p $base_dir/ovirt - git clone $base_dir/ovirt/ovirt_collection + git clone https://github.com/oVirt/ovirt-ansible-collection.git $base_dir/ovirt/ovirt else echo "Ovirt collection already exists" fi @@ -62,7 +62,6 @@ if [ ! -d "$base_dir/awx/awx" ] then mkdir -p $base_dir/awx ln -s $(shell pwd)/awx_collection $base_dir/awx/awx - git clone $base_dir/awx/awx else echo "awx collection already exists" fi