From 0d0a03272dbbf8a400f2140057ad00768182fc90 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Fri, 9 Nov 2018 08:56:18 -0600
Subject: [PATCH] Elasticsearch: Fix storage config, add label config for tests

This updates the Elasticsearch chart to use the correct
overrides for changing the default PVC size to something more
appropriate. This also includes the label configuration used for
selecting a node for the test pods.

Change-Id: I94366792ef89d709e8fcf50262deccdc724e3a2a
---
 .../charts/osh-infra/osh-infra-logging/elasticsearch.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml b/global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml
index c93dd8bab..aef5de75f 100644
--- a/global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml
+++ b/global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml
@@ -209,6 +209,9 @@ data:
       job:
         node_selector_key: openstack-control-plane
         node_selector_value: enabled
+      test:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
     monitoring:
       prometheus:
         enabled: true
@@ -351,9 +354,8 @@ data:
                 use_age: True
                 disk_space: 1200
     storage:
-      elasticsearch:
-        requests:
-          storage: 500Gi
+      requests:
+        storage: 500Gi
   dependencies:
     - osh-infra-helm-toolkit
 ...