Revert "XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy"
This reverts commit 1f58c2afbd680c8c618bff6f66e9982515dd1caf.
Change-Id: I0d7ef37a420168276472675b005482d6d11daabd
diff --git a/xos-profiles/base-openstack/Chart.yaml b/xos-profiles/base-openstack/Chart.yaml
index d95aa4b..e6003da 100644
--- a/xos-profiles/base-openstack/Chart.yaml
+++ b/xos-profiles/base-openstack/Chart.yaml
@@ -15,9 +15,7 @@
# limitations under the License.
apiVersion: v1
+appVersion: "1.0"
description: A Helm chart for the "base-openstack" profile
name: base-openstack
version: 0.1.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
diff --git a/xos-profiles/base-openstack/requirements.yaml b/xos-profiles/base-openstack/requirements.yaml
index 7c93104..7f2578a 100644
--- a/xos-profiles/base-openstack/requirements.yaml
+++ b/xos-profiles/base-openstack/requirements.yaml
@@ -16,11 +16,11 @@
dependencies:
- name: onos-service
- version: 2.0.5
+ version: 2.0.2-dev
repository: file://../../xos-services/onos-service
- name: openstack
- version: 1.0.1
+ version: 1.0.0
repository: file://../../xos-services/openstack
- name: vtn-service
- version: 1.0.1
+ version: 1.0.0
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 48d0b9e..0b009e3 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: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: {{ tpl .Values.tosca_loaderImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/base-openstack/values.yaml b/xos-profiles/base-openstack/values.yaml
index 8a9d1c8..11cb5a8 100644
--- a/xos-profiles/base-openstack/values.yaml
+++ b/xos-profiles/base-openstack/values.yaml
@@ -22,14 +22,9 @@
nameOverride: ""
fullnameOverride: ""
-# tosca loader container
-image:
- repository: 'xosproject/tosca-loader'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
+imagePullPolicy: 'Always'
-global:
- registry: ""
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"