From abd01d8be96ffc295773a24cf165b80dbf75323a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Fri, 25 Oct 2024 20:46:46 +0900
Subject: [PATCH] Drop redundant cinder resource dependencies

cinder-backup does not really need cinder-api.

Also now cinder_type resource automatically requires that all cinder
services are up.

Change-Id: I84ad7d0b6035d6234edd692a3096859bd0fb6648
---
 .../puppet/modules/packstack/manifests/cinder/backend/lvm.pp    | 1 -
 .../puppet/modules/packstack/manifests/cinder/backend/netapp.pp | 1 -
 .../puppet/modules/packstack/manifests/cinder/backend/nfs.pp    | 1 -
 .../modules/packstack/manifests/cinder/backend/solidfire.pp     | 1 -
 packstack/puppet/modules/packstack/manifests/cinder/backup.pp   | 2 --
 5 files changed, 6 deletions(-)

diff --git a/packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp b/packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp
index 58bd2e72a..e39621081 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp
@@ -75,6 +75,5 @@
     cinder_type { 'iscsi':
       ensure     => present,
       properties => {'volume_backend_name' => 'lvm'},
-      require    => Class['cinder::api'],
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/cinder/backend/netapp.pp b/packstack/puppet/modules/packstack/manifests/cinder/backend/netapp.pp
index 9346b224b..646790ea8 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder/backend/netapp.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder/backend/netapp.pp
@@ -128,6 +128,5 @@
     cinder_type { $netapp_backend_name:
       ensure     => present,
       properties => {'volume_backend_name' => $netapp_backend_name},
-      require    => Class['cinder::api'],
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/cinder/backend/nfs.pp b/packstack/puppet/modules/packstack/manifests/cinder/backend/nfs.pp
index 824a7d094..2e7242be9 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder/backend/nfs.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder/backend/nfs.pp
@@ -12,6 +12,5 @@
     cinder_type { 'nfs':
       ensure     => present,
       properties => {'volume_backend_name' => 'nfs'},
-      require    => Class['cinder::api'],
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/cinder/backend/solidfire.pp b/packstack/puppet/modules/packstack/manifests/cinder/backend/solidfire.pp
index 8bea6b737..c80fc476f 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder/backend/solidfire.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder/backend/solidfire.pp
@@ -15,6 +15,5 @@
     cinder_type { $solidfire_backend_name:
       ensure     => present,
       properties => {'volume_backend_name' => $solidfire_backend_name },
-      require    => Class['cinder::api'],
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/cinder/backup.pp b/packstack/puppet/modules/packstack/manifests/cinder/backup.pp
index bc4b2ee35..33aa143e2 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder/backup.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder/backup.pp
@@ -8,6 +8,4 @@
       backup_swift_url          => "http://${cinder_backup_conf_ctrl_host}:8080/v1/AUTH_",
       backup_swift_service_auth => true
     }
-
-    Class['cinder::api'] ~> Service['cinder-backup']
 }