Fix improper move of gnocchi config

In the move of gnocchi static configurations from the overrides to
the Armada manifests, some configs were put in the wrong location.
This commit fixes this.

Story: 2003909
Task: 29535

Change-Id: Iac0ada67b7a7f6c44540c731fb505090362489a1
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>

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=5
+TIS_PATCH_VER=6

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

@@ -1042,6 +1042,11 @@ data:
             component: test
   values:
     conf:
+      gnocchi:
+        indexer:
+          driver: mariadb
+        keystone_authtoken:
+          interface: internal
       apache: |
         Listen 0.0.0.0:{{ tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 
@@ -1106,11 +1111,6 @@ data:
         anti:
           type:
             default: requiredDuringSchedulingIgnoredDuringExecution
-      gnocchi:
-        indexer:
-          driver: mariadb
-        keystone_authtoken:
-          interface: internal
     dependencies:
       static:
         db_sync:

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

@@ -1042,6 +1042,11 @@ data:
             component: test
   values:
     conf:
+      gnocchi:
+        indexer:
+          driver: mariadb
+        keystone_authtoken:
+          interface: internal
       apache: |
         Listen 0.0.0.0:{{ tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 
@@ -1106,11 +1111,6 @@ data:
         anti:
           type:
             default: requiredDuringSchedulingIgnoredDuringExecution
-      gnocchi:
-        indexer:
-          driver: mariadb
-        keystone_authtoken:
-          interface: internal
     dependencies:
       static:
         db_sync: