XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-profiles/base-openstack/Chart.yaml b/xos-profiles/base-openstack/Chart.yaml
index e6003da..3f0f3f0 100644
--- a/xos-profiles/base-openstack/Chart.yaml
+++ b/xos-profiles/base-openstack/Chart.yaml
@@ -1,5 +1,4 @@
---
-
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for the "base-openstack" profile
name: base-openstack
+description: A Helm chart for the "base-openstack" profile
+icon: https://guide.opencord.org/logos/cord.svg
version: 0.1.0
+
+# xosproject/tosca-loader version
+appVersion: 1.1.3
diff --git a/xos-profiles/base-openstack/requirements.yaml b/xos-profiles/base-openstack/requirements.yaml
index 7f2578a..04cf7dc 100644
--- a/xos-profiles/base-openstack/requirements.yaml
+++ b/xos-profiles/base-openstack/requirements.yaml
@@ -1,5 +1,4 @@
---
-
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +15,11 @@
dependencies:
- name: onos-service
- version: 2.0.2-dev
+ version: 2.0.5
repository: file://../../xos-services/onos-service
- name: openstack
- version: 1.0.0
+ version: 1.0.2
repository: file://../../xos-services/openstack
- name: vtn-service
- version: 1.0.0
+ version: 1.0.1
repository: file://../../xos-services/vtn-service
diff --git a/xos-profiles/base-openstack/templates/tosca-job.yaml b/xos-profiles/base-openstack/templates/tosca-job.yaml
index 0b009e3..48d0b9e 100644
--- a/xos-profiles/base-openstack/templates/tosca-job.yaml
+++ b/xos-profiles/base-openstack/templates/tosca-job.yaml
@@ -35,8 +35,8 @@
restartPolicy: OnFailure
containers:
- name: {{ .Chart.Name }}-tosca-loader
- image: {{ tpl .Values.tosca_loaderImage . | quote }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/base-openstack/values.yaml b/xos-profiles/base-openstack/values.yaml
index 11cb5a8..8a9d1c8 100644
--- a/xos-profiles/base-openstack/values.yaml
+++ b/xos-profiles/base-openstack/values.yaml
@@ -22,9 +22,14 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'Always'
+# tosca loader container
+image:
+ repository: 'xosproject/tosca-loader'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
-tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
+global:
+ registry: ""
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"