CORD-3099 Update ONOS app versions for ONOS 1.13
Change-Id: Ieebc6dae581e874f2555ffca007e28fc4843185a
diff --git a/configs/onos-cord.yaml b/configs/onos-cord.yaml
deleted file mode 100644
index e4d4fb9..0000000
--- a/configs/onos-cord.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Parameters for running ONOS with VTN
-#
-# helm install onos -f configs/onos-cord.yaml -n onos-cord
-
-# VTN is not working with 1.13 at present
-onosImage: 'onosproject/onos:1.12.0'
diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index 67438b4..ccdfee3 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -72,7 +72,7 @@
relationship: tosca.relationships.BelongsToOne
properties:
name: VTN_ONOS_app
- install_dependencies: https://repo.maven.apache.org/maven2/org/opencord/cord-config/1.3.1/cord-config-1.3.1.oar, https://repo.maven.apache.org/maven2/org/opencord/vtn/1.5.0/vtn-1.5.0.oar
+ install_dependencies: {{ .cordConfigAppURL }}, {{ .vtnAppURL }}
dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
VTN_ONOS_app_autogenerate:
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index ba1216d..e1d50d1 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -29,6 +29,9 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+cordConfigAppURL: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/cord-config/1.4.0-SNAPSHOT/cord-config-1.4.0-20180524.071425-262.oar"
+vtnAppURL: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/vtn/1.6.0-SNAPSHOT/vtn-1.6.0-20180524.071556-118.oar"
+
resources: {}
nodeSelector: {}