From 88e510415faff86507f825de972a5881a207995c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 9 Jun 2022 02:18:52 +0900
Subject: [PATCH] Glance: Ensure nfs is mounted before starting glance-api

The glance-api service requires that access to NFS backend is ready
before the service is started. This adds systemd service dependency to
enforce that ordering.

Closes-Bug: #1977991
Depends-on: https://review.opendev.org/c/openstack/tripleo-ansible/+/839295
Change-Id: Ic4f596a9489d6b9923f55c987e107d33ebb710e7
---
 deployment/glance/glance-api-container-puppet.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index 45c21c6eab..468c3fcf1e 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -787,6 +787,12 @@ outputs:
             net: host
             privileged: {if: [cinder_backend_enabled, true, false]}
             restart: always
+            depends_on:
+              if:
+                - or:
+                    - {get_param: GlanceNfsEnabled}
+                    - {get_param: GlanceNetappNfsEnabled}
+                - var-lib-glance-images.mount
             healthcheck:
               test: /openstack/healthcheck
             volumes: *glance_volumes