X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=kubernetes%2Faai%2Ftemplates%2Fsearch-data-service-deployment.yaml;h=28cc4f3236119828eb9c9521e4d2d79c11464915;hb=fe3f54169ad1a17d27c81a73c18336e9cf94a509;hp=392a754459901322d1c5c40ac55ba2883a295874;hpb=5b0d96fc56a21e340f394b0126bf91ba234a9f07;p=oom.git

diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index 392a754459..28cc4f3236 100644
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -1,10 +1,25 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #{{ if not .Values.disableAaiSearchDataService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: search-data-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-search-data-service
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.searchDataServiceReplicas }}
   selector:
     matchLabels:
       app: search-data-service
@@ -12,7 +27,7 @@ spec:
     metadata:
       labels:
         app: search-data-service
-      name: search-data-service
+      name: aai-search-data-service
     spec:
       containers:
       - name: search-data-service
@@ -73,10 +88,10 @@ spec:
           path: /etc/localtime
       - name: aai-search-data-service-config
         configMap:
-          name: search-data-configmap
+          name: aai-search-data-configmap
       - name: aai-search-data-service-auth-config
         secret:
-          secretName: search-data-keystone-secret
+          secretName: aai-search-data-keystone-secret
       - name: aai-search-data-search-policy-config
         configMap:
           name: aai-search-policy-configmap
@@ -89,16 +104,8 @@ spec:
         emptyDir: {}
       - name: aai-search-data-service-log-conf
         configMap:
-         name: aai-search-data-service-configmap
+         name: aai-search-data-service-log-configmap
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: aai-search-data-service-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
-data:
-{{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }}
 #{{ end }}