From 8726503615a9a23038174bcae749378febec93c1 Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Wed, 22 Feb 2023 09:26:37 +0100 Subject: [PATCH] Replace deprecated defined resource type of Manila Since [1], 'manila::service_instance' has been replaced by 'manila::backend::service_instance'. We have also to remove the use of 'use_guestagent_template' as it was removed in [2] Finally, since tox4 we need to set skipdist to False in order to install the package (needed for pbr to get the version). Previously with tox3, it was set to True but it was a bug apprently. [1] https://review.opendev.org/c/openstack/puppet-manila/+/873479 [2] https://review.opendev.org/c/openstack/puppet-trove/+/874367 Change-Id: I464675a5f78b1efcc3a277da4772dca5690dd842 --- .../modules/packstack/manifests/manila/backend/generic.pp | 2 +- packstack/puppet/modules/packstack/manifests/trove.pp | 4 +--- tox.ini | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp b/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp index 6b7e15e97..843ebf267 100644 --- a/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp +++ b/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp @@ -23,7 +23,7 @@ class packstack::manila::backend::generic () vcpus => '1', require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ], } - -> manila::service_instance{ 'generic': + -> manila::backend::service_instance{ 'generic': service_image_location => lookup('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'), service_instance_user => lookup('CONFIG_MANILA_SERVICE_INSTANCE_USER'), service_instance_password => lookup('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'), diff --git a/packstack/puppet/modules/packstack/manifests/trove.pp b/packstack/puppet/modules/packstack/manifests/trove.pp index 3ccc1b629..cb80dd76b 100644 --- a/packstack/puppet/modules/packstack/manifests/trove.pp +++ b/packstack/puppet/modules/packstack/manifests/trove.pp @@ -39,7 +39,5 @@ class packstack::trove () password => lookup('CONFIG_TROVE_KS_PW'), auth_url => lookup('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'), } - class { 'trove::taskmanager': - use_guestagent_template => false, - } + class { 'trove::taskmanager': } } diff --git a/tox.ini b/tox.ini index 2e9b7ffaa..a4dda71cd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 2.0 envlist = py27,py39,pep8,releasenotes -skipsdist = True +skipsdist = False [testenv] usedevelop = True @@ -14,6 +14,7 @@ deps = -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt +allowlist_externals = /usr/bin/find commands = /usr/bin/find . -type f -name "*.pyc" -delete stestr run {posargs}