From 5f9c7c91b237d12af8eb401b6edcf34d4315a142 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 6 Dec 2023 15:11:23 -0500 Subject: [PATCH] ubi9-ibm: unify ADD steps The "reef" template overrides the contents of the "ALL" template. As a result, prior to this change, we missed an ADD command in the generated Dockerfile. Unify and simplify the instructions so we include the proper steps for reef. Signed-off-by: Ken Dreyer --- ceph-releases/ALL/ubi9-ibm/daemon-base/__ADD__ | 1 + ceph-releases/reef/ubi9-ibm/daemon-base/__ADD__ | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 ceph-releases/reef/ubi9-ibm/daemon-base/__ADD__ diff --git a/ceph-releases/ALL/ubi9-ibm/daemon-base/__ADD__ b/ceph-releases/ALL/ubi9-ibm/daemon-base/__ADD__ index b6e23f915..d2e87c0ca 100644 --- a/ceph-releases/ALL/ubi9-ibm/daemon-base/__ADD__ +++ b/ceph-releases/ALL/ubi9-ibm/daemon-base/__ADD__ @@ -1 +1,2 @@ ADD ceph_call_home /usr/share/ceph/mgr/call_home_agent/ceph_call_home +ADD *.swidtag /var/lib/ceph/swidtag/ diff --git a/ceph-releases/reef/ubi9-ibm/daemon-base/__ADD__ b/ceph-releases/reef/ubi9-ibm/daemon-base/__ADD__ deleted file mode 100644 index 505b016a9..000000000 --- a/ceph-releases/reef/ubi9-ibm/daemon-base/__ADD__ +++ /dev/null @@ -1 +0,0 @@ -ADD *.swidtag /var/lib/ceph/swidtag/