SEBA-457 cleanse helm-charts of deployment and siterole objects
Change-Id: I8a4a4f5a641556dcb2522482580ff9d35369d8c8
diff --git a/xos-profiles/base-openstack/Chart.yaml b/xos-profiles/base-openstack/Chart.yaml
index b59e238..143158c 100644
--- a/xos-profiles/base-openstack/Chart.yaml
+++ b/xos-profiles/base-openstack/Chart.yaml
@@ -16,7 +16,7 @@
name: base-openstack
description: A Helm chart for the "base-openstack" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.1.3
+version: 0.1.4
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/base-openstack/requirements.yaml b/xos-profiles/base-openstack/requirements.yaml
index 122c59d..2cd2a20 100644
--- a/xos-profiles/base-openstack/requirements.yaml
+++ b/xos-profiles/base-openstack/requirements.yaml
@@ -18,7 +18,7 @@
version: 2.0.12
repository: file://../../xos-services/onos-service
- name: openstack
- version: 1.1.5
+ version: 1.1.6
repository: file://../../xos-services/openstack
- name: vtn-service
version: 1.0.4
diff --git a/xos-profiles/base-openstack/templates/_tosca.tpl b/xos-profiles/base-openstack/templates/_tosca.tpl
index 6ffeedb..e39f9a4 100644
--- a/xos-profiles/base-openstack/templates/_tosca.tpl
+++ b/xos-profiles/base-openstack/templates/_tosca.tpl
@@ -37,10 +37,6 @@
site_url: http://mysite.opencord.us/
hosts_nodes: true
- {{ .Values.cordDeploymentName }}:
- type: tosca.nodes.Deployment
- properties:
- name: {{ .Values.cordDeploymentName }}
{{- end -}}
{{- define "base-openstack.serviceGraphTosca" -}}
@@ -205,12 +201,6 @@
name: {{ .Values.cordSiteName }}
must-exist: true
- deployment:
- type: tosca.nodes.Deployment
- properties:
- name: {{ .Values.cordDeploymentName }}
- must-exist: true
-
site_deployment:
type: tosca.nodes.SiteDeployment
requirements:
diff --git a/xos-profiles/base-openstack/values.yaml b/xos-profiles/base-openstack/values.yaml
index 8a9d1c8..1dbda7e 100644
--- a/xos-profiles/base-openstack/values.yaml
+++ b/xos-profiles/base-openstack/values.yaml
@@ -35,7 +35,6 @@
xosAdminPassword: "letmein"
cordSiteName: &site "mysite"
-cordDeploymentName: &deployment "mydeployment"
keystoneAdminUser: "admin"
keystoneAdminPassword: "password"