From 8280669ceb3a0d2764d3626c5c51ffe7cc4463d0 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 3 Mar 2025 01:38:41 +0900 Subject: [PATCH] Allow installation of nfs client by another module The nfs client package is required by cinder as well. Allow adding additional tags so that the package can be defined in puppet-cinder. Related-Bug: #2100712 Change-Id: I670305e279320b0be2b4490089ee154c5de2b263 --- manifests/backend/dellemc_isilon.pp | 2 +- manifests/backend/dellemc_powermax.pp | 2 +- manifests/backend/dellemc_unity.pp | 2 +- manifests/backend/dellemc_vnx.pp | 2 +- manifests/backend/flashblade.pp | 2 +- manifests/backend/hitachi_hnas.pp | 2 +- manifests/backend/netapp.pp | 2 +- manifests/data/backup/nfs.pp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifests/backend/dellemc_isilon.pp b/manifests/backend/dellemc_isilon.pp index cd2cf86c..fbe76323 100644 --- a/manifests/backend/dellemc_isilon.pp +++ b/manifests/backend/dellemc_isilon.pp @@ -101,6 +101,6 @@ define manila::backend::dellemc_isilon ( ensure_packages('nfs-client', { name => $::manila::params::nfs_client_package_name, ensure => $package_ensure, - tag => 'manila-support-package', }) + Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' } } diff --git a/manifests/backend/dellemc_powermax.pp b/manifests/backend/dellemc_powermax.pp index 69017e9a..1a866349 100644 --- a/manifests/backend/dellemc_powermax.pp +++ b/manifests/backend/dellemc_powermax.pp @@ -130,7 +130,7 @@ define manila::backend::dellemc_powermax ( ensure_packages('nfs-client', { name => $::manila::params::nfs_client_package_name, ensure => $package_ensure, - tag => 'manila-support-package', }) + Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' } } diff --git a/manifests/backend/dellemc_unity.pp b/manifests/backend/dellemc_unity.pp index 81658238..6fe56550 100644 --- a/manifests/backend/dellemc_unity.pp +++ b/manifests/backend/dellemc_unity.pp @@ -169,8 +169,8 @@ define manila::backend::dellemc_unity ( ensure_packages('nfs-client', { name => $::manila::params::nfs_client_package_name, ensure => $package_ensure, - tag => 'manila-support-package', }) + Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' } if $manage_storops { # Python library storops is required to run Unity driver. diff --git a/manifests/backend/dellemc_vnx.pp b/manifests/backend/dellemc_vnx.pp index 47e00d12..5d2a89cd 100644 --- a/manifests/backend/dellemc_vnx.pp +++ b/manifests/backend/dellemc_vnx.pp @@ -153,8 +153,8 @@ define manila::backend::dellemc_vnx ( ensure_packages('nfs-client', { name => $::manila::params::nfs_client_package_name, ensure => $package_ensure, - tag => 'manila-support-package', }) + Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' } } diff --git a/manifests/backend/flashblade.pp b/manifests/backend/flashblade.pp index 382ffae2..b860bf39 100644 --- a/manifests/backend/flashblade.pp +++ b/manifests/backend/flashblade.pp @@ -95,8 +95,8 @@ define manila::backend::flashblade ( ensure_packages('nfs-client', { name => $::manila::params::nfs_client_package_name, ensure => $package_ensure, - tag => 'manila-support-package', }) + Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' } } diff --git a/manifests/backend/hitachi_hnas.pp b/manifests/backend/hitachi_hnas.pp index ae126646..87b33ef9 100644 --- a/manifests/backend/hitachi_hnas.pp +++ b/manifests/backend/hitachi_hnas.pp @@ -116,6 +116,6 @@ define manila::backend::hitachi_hnas ( ensure_packages('nfs-client', { name => $::manila::params::nfs_client_package_name, ensure => $package_ensure, - tag => 'manila-support-package', }) + Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' } } diff --git a/manifests/backend/netapp.pp b/manifests/backend/netapp.pp index 0efcdd54..3f05ee0e 100644 --- a/manifests/backend/netapp.pp +++ b/manifests/backend/netapp.pp @@ -189,6 +189,6 @@ define manila::backend::netapp ( ensure_packages('nfs-client', { name => $::manila::params::nfs_client_package_name, ensure => $package_ensure, - tag => 'manila-support-package', }) + Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' } } diff --git a/manifests/data/backup/nfs.pp b/manifests/data/backup/nfs.pp index 1fa66ea8..62713245 100644 --- a/manifests/data/backup/nfs.pp +++ b/manifests/data/backup/nfs.pp @@ -50,6 +50,6 @@ class manila::data::backup::nfs ( ensure_packages('nfs-client', { name => $::manila::params::nfs_client_package_name, ensure => $package_ensure, - tag => 'manila-support-package', }) + Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' } }