Update TOSCA and ONOS image for new ONOS VOLTHA deployment
Change-Id: I31eb66468149f34eada1f033b651527cb2698d58
diff --git a/helm-charts/profile/nem-att/templates/_tosca.tpl b/helm-charts/profile/nem-att/templates/_tosca.tpl
index 35d55bd..32c702c 100644
--- a/helm-charts/profile/nem-att/templates/_tosca.tpl
+++ b/helm-charts/profile/nem-att/templates/_tosca.tpl
@@ -322,12 +322,37 @@
rest_hostname: {{ .Values.onosVolthaRestService | quote }}
rest_port: 8181
+ onos_app#cord-config:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: cord-config
+ app_id: org.opencord.config
+ url: {{ .Values.cordConfigAppUrl }}
+ version: 1.4.0
+ requirements:
+ - owner:
+ node: service#ONOS_VOLTHA
+ relationship: tosca.relationships.BelongsToOne
+
onos_app#olt:
type: tosca.nodes.ONOSApp
properties:
- name: org.opencord.olt
+ name: olt
app_id: org.opencord.olt
- version: 1.4.1
+ url: {{ .Values.oltAppUrl }}
+ version: 2.0.0.SNAPSHOT
+ requirements:
+ - owner:
+ node: service#ONOS_VOLTHA
+ relationship: tosca.relationships.BelongsToOne
+
+ onos_app#sadis:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: sadis
+ app_id: org.opencord.sadis
+ url: {{ .Values.sadisAppUrl }}
+ version: 2.1.0
requirements:
- owner:
node: service#ONOS_VOLTHA
@@ -336,9 +361,10 @@
onos_app#dhcpl2relay:
type: tosca.nodes.ONOSApp
properties:
- name: org.opencord.dhcpl2relay
+ name: dhcpl2relay
app_id: org.opencord.dhcpl2relay
- version: 1.4.0
+ url: {{ .Values.dhcpl2relayAppUrl }}
+ version: 1.5.0.SNAPSHOT
requirements:
- owner:
node: service#ONOS_VOLTHA
@@ -347,9 +373,22 @@
onos_app#aaa:
type: tosca.nodes.ONOSApp
properties:
- name: org.opencord.aaa
+ name: aaa
app_id: org.opencord.aaa
- version: 1.6.0
+ url: {{ .Values.aaaAppUrl }}
+ version: 1.8.0.SNAPSHOT
+ requirements:
+ - owner:
+ node: service#ONOS_VOLTHA
+ relationship: tosca.relationships.BelongsToOne
+
+ onos_app#kafka:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: kafka
+ app_id: org.opencord.kafka
+ url: {{ .Values.kafkaAppUrl }}
+ version: 1.0.0.SNAPSHOT
requirements:
- owner:
node: service#ONOS_VOLTHA
diff --git a/helm-charts/profile/nem-att/values.yaml b/helm-charts/profile/nem-att/values.yaml
index 342556c..be7e280 100644
--- a/helm-charts/profile/nem-att/values.yaml
+++ b/helm-charts/profile/nem-att/values.yaml
@@ -39,3 +39,11 @@
kafkaService: "nem-core-kafka.default.svc.cluster.local"
hippie-oss:
kafkaService: "nem-core-kafka.default.svc.cluster.local"
+
+# onos-voltha applications
+cordConfigAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/cord-config/1.4.0/cord-config-1.4.0.oar"
+oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=2.0.0-SNAPSHOT&e=oar"
+sadisAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/sadis-app/2.1.0/sadis-app-2.1.0.oar"
+dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay&v=1.5.0-SNAPSHOT&e=oar"
+aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa&v=1.8.0-SNAPSHOT&e=oar"
+kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.0.0-SNAPSHOT&e=oar"
diff --git a/helm-charts/seba-substrate/values.yaml b/helm-charts/seba-substrate/values.yaml
index 97afe1e..50bbdb3 100644
--- a/helm-charts/seba-substrate/values.yaml
+++ b/helm-charts/seba-substrate/values.yaml
@@ -36,8 +36,6 @@
nameOverride: "onosv"
fullnameOverride: "onos-voltha"
- onosImage: 'voltha/voltha-onos:latest'
-
services:
openflowServiceType: ClusterIP
ovsdbServiceType: ClusterIP