VOL-1371 Allow specifying versions of onos apps
Also bump VERSION
Change-Id: I602e80a73200a11f75ea5e00a939ecd2f63a2abc
diff --git a/VERSION b/VERSION
index dfda3e0..f67d718 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.1.0
+6.2.0-dev
diff --git a/xos-profiles/seba-services/templates/_tosca.tpl b/xos-profiles/seba-services/templates/_tosca.tpl
index 32ce678..71c1792 100644
--- a/xos-profiles/seba-services/templates/_tosca.tpl
+++ b/xos-profiles/seba-services/templates/_tosca.tpl
@@ -61,7 +61,7 @@
name: olt
app_id: org.opencord.olt
url: {{ .oltAppUrl }}
- version: 2.1.0
+ version: {{ .oltAppVersion }}
dependencies: org.opencord.sadis
requirements:
- owner:
@@ -74,7 +74,7 @@
name: sadis
app_id: org.opencord.sadis
url: {{ .sadisAppUrl }}
- version: 2.2.0
+ version: {{ .sadisAppVersion }}
requirements:
- owner:
node: service#onos
@@ -86,7 +86,7 @@
name: dhcpl2relay
app_id: org.opencord.dhcpl2relay
url: {{ .dhcpl2relayAppUrl }}
- version: 1.5.0
+ version: {{ .dhcpl2relayAppVersion }}
dependencies: org.opencord.sadis
requirements:
- owner:
@@ -99,7 +99,7 @@
name: aaa
app_id: org.opencord.aaa
url: {{ .aaaAppUrl }}
- version: 1.8.0
+ version: {{ .aaaAppVersion }}
dependencies: org.opencord.sadis
requirements:
- owner:
@@ -112,7 +112,7 @@
name: kafka
app_id: org.opencord.kafka
url: {{ .kafkaAppUrl }}
- version: 1.0.0
+ version: {{ .kafkaAppVersion }}
dependencies: org.opencord.olt,org.opencord.aaa,org.opencord.dhcpl2relay
requirements:
- owner:
diff --git a/xos-profiles/seba-services/values.yaml b/xos-profiles/seba-services/values.yaml
index c9736f7..365a796 100644
--- a/xos-profiles/seba-services/values.yaml
+++ b/xos-profiles/seba-services/values.yaml
@@ -41,10 +41,19 @@
# ONOS applications
aaaAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/aaa/1.8.0/aaa-1.8.0.oar"
+aaaAppVersion: "1.8.0"
+
sadisAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/sadis-app/2.2.0/sadis-app-2.2.0.oar"
+sadisAppVersion: "2.2.0"
+
dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/dhcpl2relay/1.5.0/dhcpl2relay-1.5.0.oar"
+dhcpl2relayAppVersion: "1.5.0"
+
oltAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/olt-app/2.1.0/olt-app-2.1.0.oar"
+oltAppVersion: "2.1.0"
+
kafkaAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/kafka/1.0.0/kafka-1.0.0.oar"
+kafkaAppVersion: "1.0.0"
onosRestService: "onos-ui.default.svc.cluster.local"
kafkaService: "cord-kafka.default.svc.cluster.local:9092"