From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Fri, 8 Sep 2017 17:16:36 +0000 (+0000)
Subject: Merge "converting config to helm and setting demo values"
X-Git-Tag: 2.0.0-ONAP~678
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=89b39407da346a0ec34579efc8b181efada14b6d;hp=-c;p=oom.git

Merge "converting config to helm and setting demo values"
---

89b39407da346a0ec34579efc8b181efada14b6d
diff --combined kubernetes/robot/templates/robot-deployment.yaml
index 5c96058895,92d6421390..3a98f87d21
--- a/kubernetes/robot/templates/robot-deployment.yaml
+++ b/kubernetes/robot/templates/robot-deployment.yaml
@@@ -20,6 -20,8 +20,6 @@@ spec
          volumeMounts:
          - name: robot-eteshare
            mountPath: /share
 -        - name: robot-resources-openstack-keystone-int
 -          mountPath: /var/opt/OpenECOMP_ETE/robot/resources/openstack/keystone_interface.robot
          - name: robot-resources-asdc-interface
            mountPath: /var/opt/OpenECOMP_ETE/robot/resources/asdc_interface.robot
          - name: robot-resources-policy-interface
@@@ -28,6 -30,14 +28,14 @@@
            mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot
          - name: lighttpd-authorization
            mountPath: /etc/lighttpd/authorization
+         - name: robot-assets-asdc-base-clearwater-env
+           mountPath: /var/opt/OpenECOMP_ETE/robot/assets/asdc/base_clearwater/base_clearwater.env
+         - name: robot-assets-asdc-base-vfw-env
+           mountPath: /var/opt/OpenECOMP_ETE/robot/assets/asdc/base_vfw/base_vfw.env
+         - name: robot-assets-asdc-base-vlb-env
+           mountPath: /var/opt/OpenECOMP_ETE/robot/assets/asdc/base_vlb/base_vlb.env
+         - name: robot-assets-asdc-base-vlb-dns-env
+           mountPath: /var/opt/OpenECOMP_ETE/robot/assets/asdc/base_vlb/dnsscaling.env
          ports:
          - containerPort: 88
          readinessProbe:
@@@ -39,6 -49,9 +47,6 @@@
          - name: robot-eteshare
            hostPath:
              path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/eteshare
 -        - name: robot-resources-openstack-keystone-int
 -          hostPath:
 -            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/openstack/keystone_interface.robot
          - name: robot-resources-asdc-interface
            hostPath:
              path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/asdc_interface.robot
@@@ -51,5 -64,17 +59,17 @@@
          - name: lighttpd-authorization
            hostPath:
              path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization
+         - name: robot-assets-asdc-base-clearwater-env
+           hostPath:
+             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_clearwater/base_clearwater.env
+         - name: robot-assets-asdc-base-vfw-env
+           hostPath:
+             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_vfw/base_vfw.env
+         - name: robot-assets-asdc-base-vlb-env
+           hostPath:
+             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_vlb/base_vlb.env
+         - name: robot-assets-asdc-base-vlb-dns-env
+           hostPath:
+             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_vlb/dnsscaling.env
        imagePullSecrets:
        - name: "{{ .Values.nsPrefix }}-docker-registry-key"