From 444a5ae67ffbf4f2f11296cb9b983558dc43cdd0 Mon Sep 17 00:00:00 2001
From: Chinasubbareddy Mallavarapu <cr3938@att.com>
Date: Mon, 2 Mar 2020 09:41:16 -0600
Subject: [PATCH] [libvirt] Use ceph image for ceph related scripts

This is to update two of init containers to use ceph confighelper image as
they are executing ceph based scripts and the image also will have latest
clients installed for ceph activities.

Change-Id: Ie4fbd8af2645d5bc5b7e4f0fd22874987a0f55f6
---
 libvirt/templates/daemonset-libvirt.yaml | 4 ++--
 libvirt/values.yaml                      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml
index 33dc7271..a950a096 100644
--- a/libvirt/templates/daemonset-libvirt.yaml
+++ b/libvirt/templates/daemonset-libvirt.yaml
@@ -62,7 +62,7 @@ spec:
 {{- if .Values.conf.ceph.enabled }}
         {{- if empty .Values.conf.ceph.cinder.keyring }}
         - name: ceph-admin-keyring-placement
-{{ tuple $envAll "libvirt" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ dict "envAll" $envAll "application" "libvirt" "container" "ceph_admin_keyring_placement" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           command:
             - /tmp/ceph-admin-keyring.sh
@@ -83,7 +83,7 @@ spec:
             {{ end }}
         {{ end }}
         - name: ceph-keyring-placement
-{{ tuple $envAll "libvirt" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ dict "envAll" $envAll "application" "libvirt" "container" "ceph_keyring_placement" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           env:
             - name: CEPH_CINDER_USER
diff --git a/libvirt/values.yaml b/libvirt/values.yaml
index 9eccb27d..1908a6fa 100644
--- a/libvirt/values.yaml
+++ b/libvirt/values.yaml
@@ -28,6 +28,7 @@ labels:
 images:
   tags:
     libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"