Merge "Move heat static configs to Armada manifest"

kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data

@@ -1,3 +1,3 @@
 SRC_DIR="stx-openstack-helm"
 COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd"
-TIS_PATCH_VER=4
+TIS_PATCH_VER=5

kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml

@@ -927,6 +927,10 @@ data:
             release_group: osh-openstack-heat
             component: test
   values:
+    endpoints:
+      oslo_cache:
+        hosts:
+          default: heat-memcached
     labels:
       api:
         node_selector_key: openstack-control-plane

kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml

@@ -927,6 +927,10 @@ data:
             release_group: osh-openstack-heat
             component: test
   values:
+    endpoints:
+      oslo_cache:
+        hosts:
+          default: heat-memcached
     labels:
       api:
         node_selector_key: openstack-control-plane

sysinv/sysinv/sysinv/sysinv/helm/heat.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018 Wind River Systems, Inc.
+# Copyright (c) 2018-2019 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -73,11 +73,6 @@ class HeatHelm(openstack.OpenstackBaseHelm):
                 'auth': self._get_endpoints_identity_overrides(
                     self.SERVICE_NAME, self.AUTH_USERS),
             },
-            'oslo_cache': {
-                'hosts': {
-                    'default': 'heat-memcached'
-                }
-            },
             'oslo_db': {
                 'auth': self._get_endpoints_oslo_db_overrides(
                     self.SERVICE_NAME, [self.SERVICE_NAME])