[CORD-3201]
Use new tosca-loader
Change-Id: I2f4ee6753e597417cc6e8031e386b167348479ac
diff --git a/xos-core/templates/core-secrets.yaml b/xos-core/templates/core-secrets.yaml
new file mode 100644
index 0000000..9d5a7c5
--- /dev/null
+++ b/xos-core/templates/core-secrets.yaml
@@ -0,0 +1,24 @@
+---
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
+
+apiVersion: v1
+kind: Secret
+metadata:
+ name: xos-admin-passwd-secret
+ namespace: default
+type: Opaque
+data:
+ password: {{ .Values.xosAdminPassword | b64enc }}
+
diff --git a/xos-core/templates/tests/test-xos-core-api.yaml b/xos-core/templates/tests/test-xos-core-api.yaml
index 24c7a8c..7899b00 100644
--- a/xos-core/templates/tests/test-xos-core-api.yaml
+++ b/xos-core/templates/tests/test-xos-core-api.yaml
@@ -35,12 +35,15 @@
value: 'xos-chameleon'
- name: SERVER_PORT
value: '9101'
+ - name: SITE_NAME
+ value: {{ .Values.cordSiteName | quote }}
- name: XOS_USER
value: {{ .Values.xosAdminUser | quote }}
- name: XOS_PASSWD
- value: {{ .Values.xosAdminPassword | quote}}
- - name: SITE_NAME
- value: {{ .Values.cordSiteName | quote }}
+ valueFrom:
+ secretKeyRef:
+ name: xos-admin-passwd-secret
+ key: password
command: ["pybot", "-L", "TRACE", "-d", "Log", "-T", "Ch_DeploymentTest.txt", "Ch_SiteTest.txt", "Ch_UsersTest.txt", "Ch_SliceTest.txt", "Ch_ServiceTest.txt"]
volumes:
- name: log-volume