SEBA-457 cleanse helm-charts of deployment and siterole objects
Change-Id: I8a4a4f5a641556dcb2522482580ff9d35369d8c8
diff --git a/examples/openstack-instance-tosca.yaml b/examples/openstack-instance-tosca.yaml
index 9666d64..1e12cfa 100644
--- a/examples/openstack-instance-tosca.yaml
+++ b/examples/openstack-instance-tosca.yaml
@@ -23,7 +23,6 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - custom_types/deployment.yaml
- custom_types/flavor.yaml
- custom_types/image.yaml
- custom_types/node.yaml
@@ -51,12 +50,6 @@
name: m1.small
must-exist: true
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: mydeployment
- must-exist: true
-
mysite:
type: tosca.nodes.Site
properties:
@@ -88,9 +81,6 @@
- image:
node: Ubuntu-14.04
relationship: tosca.relationships.BelongsToOne
- - deployment:
- node: MyDeployment
- relationship: tosca.relationships.BelongsToOne
- flavor:
node: m1.small
relationship: tosca.relationships.BelongsToOne
diff --git a/xos-profiles/base-kubernetes/Chart.yaml b/xos-profiles/base-kubernetes/Chart.yaml
index 1b632a3..d7f2c0b 100644
--- a/xos-profiles/base-kubernetes/Chart.yaml
+++ b/xos-profiles/base-kubernetes/Chart.yaml
@@ -16,7 +16,7 @@
name: base-kubernetes
description: A Helm chart for XOS's "base-kubernetes" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.3
+version: 1.0.4
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml b/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml
index 607a676..5da5d15 100644
--- a/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml
+++ b/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml
@@ -21,8 +21,6 @@
data:
010-fixtures.yaml: |
{{ toYaml .Values.toscaRecipes.fixtures | indent 4 }}
- 020-deployment.yaml: |
-{{ toYaml .Values.toscaRecipes.deployment | indent 4 }}
040-cord-services.yaml: |
{{ toYaml .Values.toscaRecipes.cordServices | indent 4 }}
050-service-graph-constraints.yaml: |
diff --git a/xos-profiles/base-kubernetes/values.yaml b/xos-profiles/base-kubernetes/values.yaml
index 77c45c1..68d2753 100644
--- a/xos-profiles/base-kubernetes/values.yaml
+++ b/xos-profiles/base-kubernetes/values.yaml
@@ -41,7 +41,6 @@
tosca_definitions_version: tosca_simple_yaml_1_0
description: Some basic fixtures
imports:
- - custom_types/siterole.yaml
- custom_types/networkparametertype.yaml
- custom_types/networktemplate.yaml
topology_template:
@@ -73,21 +72,7 @@
type: tosca.nodes.NetworkParameterType
properties:
name: neutron_port_name
- # ----------------------------------------------------------------------------
- # Roles
- # ----------------------------------------------------------------------------
- siterole#admin:
- type: tosca.nodes.SiteRole
- properties:
- role: admin
- siterole#pi:
- type: tosca.nodes.SiteRole
- properties:
- role: pi
- siterole#tech:
- type: tosca.nodes.SiteRole
- properties:
- role: tech
+
# -----------------------------------------------------------------------------
# Network Templates
# -----------------------------------------------------------------------------
@@ -112,18 +97,6 @@
translation: none
shared_network_name: ext-net
- deployment:
- tosca_definitions_version: tosca_simple_yaml_1_0
- imports:
- - custom_types/deployment.yaml
- description: deployment config, generated by platform-install
- topology_template:
- node_templates:
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: MyDeployment
-
cordServices:
tosca_definitions_version: tosca_simple_yaml_1_0
description: Set up Kubernetes Service
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"
diff --git a/xos-profiles/demo-exampleservice/Chart.yaml b/xos-profiles/demo-exampleservice/Chart.yaml
index 7a83cbb..78b3c7d 100644
--- a/xos-profiles/demo-exampleservice/Chart.yaml
+++ b/xos-profiles/demo-exampleservice/Chart.yaml
@@ -17,7 +17,7 @@
description: A Helm chart that launches and configures ExampleService. It's assumed that base-kubernetes profile is installed.
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.3
+version: 1.0.4
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/demo-exampleservice/values.yaml b/xos-profiles/demo-exampleservice/values.yaml
index 496a20f..c2f3a78 100644
--- a/xos-profiles/demo-exampleservice/values.yaml
+++ b/xos-profiles/demo-exampleservice/values.yaml
@@ -31,7 +31,6 @@
xosAdminPassword: "letmein"
cordSiteName: "mysite"
-cordDeploymentName: "mydeployment"
addresspool_public_cidr: "10.8.1.0/24"
addresspool_public_gateway_ip: "10.8.1.1"
diff --git a/xos-profiles/demo-simpleexampleservice/Chart.yaml b/xos-profiles/demo-simpleexampleservice/Chart.yaml
index 1199009..e345d96 100644
--- a/xos-profiles/demo-simpleexampleservice/Chart.yaml
+++ b/xos-profiles/demo-simpleexampleservice/Chart.yaml
@@ -17,7 +17,7 @@
description: A Helm chart that launches and configures SimpleExampleService. It's assumed that base-kubernetes profile is installed.
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.6
+version: 1.0.7
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/demo-simpleexampleservice/values.yaml b/xos-profiles/demo-simpleexampleservice/values.yaml
index da687b1..1373cf5 100644
--- a/xos-profiles/demo-simpleexampleservice/values.yaml
+++ b/xos-profiles/demo-simpleexampleservice/values.yaml
@@ -40,4 +40,3 @@
xosAdminPassword: "letmein"
cordSiteName: "mysite"
-cordDeploymentName: "mydeployment"
diff --git a/xos-profiles/mcord/Chart.yaml b/xos-profiles/mcord/Chart.yaml
index e86fd78..969aa7e 100644
--- a/xos-profiles/mcord/Chart.yaml
+++ b/xos-profiles/mcord/Chart.yaml
@@ -17,7 +17,7 @@
description: A Helm chart for the "mcord" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.10
+version: 1.0.11
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/mcord/templates/_tosca.tpl b/xos-profiles/mcord/templates/_tosca.tpl
index eb7f151..175f406 100644
--- a/xos-profiles/mcord/templates/_tosca.tpl
+++ b/xos-profiles/mcord/templates/_tosca.tpl
@@ -33,10 +33,6 @@
site_url: http://mysite.opencord.us/
hosts_nodes: true
- {{ .Values.cordDeploymentName }}:
- type: tosca.nodes.Deployment
- properties:
- name: {{ .Values.cordDeploymentName }}
{{- end -}}
{{- define "mcord.onosTosca" -}}
diff --git a/xos-profiles/mcord/values.yaml b/xos-profiles/mcord/values.yaml
index a7a818b..15f110d 100644
--- a/xos-profiles/mcord/values.yaml
+++ b/xos-profiles/mcord/values.yaml
@@ -35,7 +35,6 @@
xosAdminPassword: "letmein"
cordSiteName: "mysite"
-cordDeploymentName: "mydeployment"
onosRestService: "onos-ui.default.svc.cluster.local"
kafkaService: "cord-kafka.default.svc.cluster.local:9092"
diff --git a/xos-profiles/rcord-lite/Chart.yaml b/xos-profiles/rcord-lite/Chart.yaml
index 031b4e0..52476db 100644
--- a/xos-profiles/rcord-lite/Chart.yaml
+++ b/xos-profiles/rcord-lite/Chart.yaml
@@ -16,7 +16,7 @@
name: rcord-lite
description: A Helm chart for XOS's "rcord-lite" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.4
+version: 1.0.5
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/rcord-lite/templates/_tosca.tpl b/xos-profiles/rcord-lite/templates/_tosca.tpl
index f1c9e10..41e6d0f 100644
--- a/xos-profiles/rcord-lite/templates/_tosca.tpl
+++ b/xos-profiles/rcord-lite/templates/_tosca.tpl
@@ -251,41 +251,6 @@
relationship: tosca.relationships.BelongsToOne
{{- end -}}
-{{- define "rcord-lite.basicFixturesTosca" -}}
-tosca_definitions_version: tosca_simple_yaml_1_0
-description: Some basic fixtures
-imports:
- - custom_types/siterole.yaml
- - custom_types/deployment.yaml
-topology_template:
- node_templates:
-
-# ----------------------------------------------------------------------------
-# Roles
-# ----------------------------------------------------------------------------
- siterole#admin:
- type: tosca.nodes.SiteRole
- properties:
- role: admin
- siterole#pi:
- type: tosca.nodes.SiteRole
- properties:
- role: pi
- siterole#tech:
- type: tosca.nodes.SiteRole
- properties:
- role: tech
-
-# -----------------------------------------------------------------------------
-# Deployment
-# -----------------------------------------------------------------------------
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: MyDeployment
-{{- end -}}
-
-
{{- define "rcord-lite.serviceGraphTosca" -}}
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
diff --git a/xos-profiles/rcord-lite/templates/tosca-configmap.yaml b/xos-profiles/rcord-lite/templates/tosca-configmap.yaml
index 032a055..3321ce9 100644
--- a/xos-profiles/rcord-lite/templates/tosca-configmap.yaml
+++ b/xos-profiles/rcord-lite/templates/tosca-configmap.yaml
@@ -19,8 +19,6 @@
metadata:
name: rcord-lite-tosca
data:
- 010-fixtures.yaml: |
-{{ include "rcord-lite.basicFixturesTosca" . | indent 4 }}
020-rcord-subscriber-service.yaml: |
{{ include "rcord.serviceTosca" .Values.rcord | indent 4 }}
030-volt-service.yaml: |
diff --git a/xos-profiles/seba-services/Chart.yaml b/xos-profiles/seba-services/Chart.yaml
index 6bc215d..4141686 100644
--- a/xos-profiles/seba-services/Chart.yaml
+++ b/xos-profiles/seba-services/Chart.yaml
@@ -17,7 +17,7 @@
name: seba-services
description: A Helm chart for XOS's "SEBA" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.6
+version: 1.0.7
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/seba-services/templates/_tosca.tpl b/xos-profiles/seba-services/templates/_tosca.tpl
index 71c1792..1e4ca3c 100644
--- a/xos-profiles/seba-services/templates/_tosca.tpl
+++ b/xos-profiles/seba-services/templates/_tosca.tpl
@@ -222,10 +222,8 @@
tosca_definitions_version: tosca_simple_yaml_1_0
description: Some basic fixtures
imports:
- - custom_types/deployment.yaml
- custom_types/networkparametertype.yaml
- custom_types/networktemplate.yaml
- - custom_types/siterole.yaml
topology_template:
node_templates:
@@ -257,22 +255,6 @@
properties:
name: neutron_port_name
-# ----------------------------------------------------------------------------
-# Roles
-# ----------------------------------------------------------------------------
- siterole#admin:
- type: tosca.nodes.SiteRole
- properties:
- role: admin
- siterole#pi:
- type: tosca.nodes.SiteRole
- properties:
- role: pi
- siterole#tech:
- type: tosca.nodes.SiteRole
- properties:
- role: tech
-
# -----------------------------------------------------------------------------
# Network Templates
# -----------------------------------------------------------------------------
@@ -299,13 +281,6 @@
translation: none
shared_network_name: ext-net
-# -----------------------------------------------------------------------------
-# Deployment
-# -----------------------------------------------------------------------------
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: MyDeployment
{{- end -}}
diff --git a/xos-profiles/seba-services/templates/tosca-configmap.yaml b/xos-profiles/seba-services/templates/tosca-configmap.yaml
index 2ca2edd..3b78537 100644
--- a/xos-profiles/seba-services/templates/tosca-configmap.yaml
+++ b/xos-profiles/seba-services/templates/tosca-configmap.yaml
@@ -19,8 +19,6 @@
metadata:
name: seba-services-tosca
data:
- 010-fixtures.yaml: |
-{{ include "seba-services.basicFixturesTosca" . | indent 4 }}
020-rcord-subscriber-service.yaml: |
{{ include "rcord.serviceTosca" .Values.rcord | indent 4 }}
030-volt-service.yaml: |
diff --git a/xos-services/openstack/Chart.yaml b/xos-services/openstack/Chart.yaml
index fd5497b..ab47746 100644
--- a/xos-services/openstack/Chart.yaml
+++ b/xos-services/openstack/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for XOS's "openstack" service
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.1.5
+version: 1.1.6
appVersion: 1.1.5
diff --git a/xos-services/openstack/templates/_tosca.tpl b/xos-services/openstack/templates/_tosca.tpl
index ad56d09..3adabcd 100644
--- a/xos-services/openstack/templates/_tosca.tpl
+++ b/xos-services/openstack/templates/_tosca.tpl
@@ -144,12 +144,6 @@
name: {{ .cordSiteName }}
must-exist: true
- {{ .cordDeploymentName }}:
- type: tosca.nodes.Deployment
- properties:
- name: {{ .cordDeploymentName }}
- must-exist: true
-
service#openstack:
type: tosca.nodes.OpenStackService
properties:
@@ -159,42 +153,18 @@
admin_password: {{ .keystoneAdminPassword }}
admin_tenant: {{ .keystoneAdminTenant }}
- {{ .cordSiteName }}_{{ .cordDeploymentName }}_openstack:
- type: tosca.nodes.Controller
- requirements:
- - deployment:
- node: {{ .cordDeploymentName }}
- relationship: tosca.relationships.BelongsToOne
- properties:
- name: {{ .cordSiteName }}_{{ .cordDeploymentName }}_openstack
- backend_type: OpenStack
- version: Newton
- auth_url: http://keystone.openstack.svc.cluster.local/v3
- admin_user: {{ .keystoneAdminUser }}
- admin_password: {{ .keystoneAdminPassword }}
- admin_tenant: {{ .keystoneAdminTenant }}
- domain: {{ .keystoneDomain }}
+ # TODO: deal with the lack of controller objects
+ # TODO: All of this probably ends up in OpenStack service after the refactor
+# {{ .cordSiteName }}_somedeployment_openstack:
+# type: tosca.nodes.Controller
+# properties:
+# name: {{ .cordSiteName }}_somedeployment_openstack
+# backend_type: OpenStack
+# version: Newton
+# auth_url: http://keystone.openstack.svc.cluster.local/v3
+# admin_user: {{ .keystoneAdminUser }}
+# admin_password: {{ .keystoneAdminPassword }}
+# admin_tenant: {{ .keystoneAdminTenant }}
+# domain: {{ .keystoneDomain }}
- {{ .cordSiteName }}_deployment_{{ .cordDeploymentName }}:
- type: tosca.nodes.SiteDeployment
- requirements:
- - site:
- node: {{ .cordSiteName }}
- relationship: tosca.relationships.BelongsToOne
- - deployment:
- node: {{ .cordDeploymentName }}
- relationship: tosca.relationships.BelongsToOne
- - controller:
- node: {{ .cordSiteName }}_{{ .cordDeploymentName }}_openstack
- relationship: tosca.relationships.BelongsToOne
-
- {{ .cordSiteName }}_openstack_controller:
- type: tosca.nodes.ControllerSite
- requirements:
- - site:
- node: {{ .cordSiteName }}
- relationship: tosca.relationships.BelongsToOne
- - controller:
- node: {{ .cordSiteName }}_{{ .cordDeploymentName }}_openstack
- relationship: tosca.relationships.BelongsToOne
{{- end -}}