From d28262448321224aa5829294b23613091426e2e3 Mon Sep 17 00:00:00 2001
From: Chinasubbareddy M <cr3938@att.com>
Date: Fri, 28 Sep 2018 10:19:33 -0500
Subject: [PATCH] Ceph: Fix ceph issues

This is to test ceph failures we have seen recently  by adding
configmap as annotation .

Change-Id: Id04712ea451fc26e5e126a79572ac4858e54eaec
---
 global/software/charts/ucp/ceph/ceph-mon.yaml |  2 +-
 global/software/config/versions.yaml          | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/global/software/charts/ucp/ceph/ceph-mon.yaml b/global/software/charts/ucp/ceph/ceph-mon.yaml
index 46b1924b8..6c2a6663c 100644
--- a/global/software/charts/ucp/ceph/ceph-mon.yaml
+++ b/global/software/charts/ucp/ceph/ceph-mon.yaml
@@ -123,7 +123,7 @@ data:
             release_group: airship-ucp-ceph-mon
   values:
     logging:
-      fluentd: true
+      fluentd: false
     labels:
       job:
         node_selector_key: ucp-control-plane
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index e218151bf..d4dc93cf8 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -258,32 +258,32 @@ data:
         type: git
       ceph-client:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7c839c82b255c251d606fbbdf9d60ae4e8e9e250
         subpath: ceph-client
         type: git
       ceph-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7c839c82b255c251d606fbbdf9d60ae4e8e9e250
         subpath: helm-toolkit
         type: git
       ceph-mon:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7c839c82b255c251d606fbbdf9d60ae4e8e9e250
         subpath: ceph-mon
         type: git
       ceph-osd:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7c839c82b255c251d606fbbdf9d60ae4e8e9e250
         subpath: ceph-osd
         type: git
       ceph-provisioners:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7c839c82b255c251d606fbbdf9d60ae4e8e9e250
         subpath: ceph-provisioners
         type: git
       ceph-rgw:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7c839c82b255c251d606fbbdf9d60ae4e8e9e250
         subpath: ceph-rgw
         type: git
       deckhand: