Make ONOS app version configurable in vtn-external.yaml TOSCA
Change-Id: Ia7470f270146f920c486d4a57249d0fc9eb4815a
diff --git a/cord-pod/Makefile b/cord-pod/Makefile
index ed627e5..e5091b7 100644
--- a/cord-pod/Makefile
+++ b/cord-pod/Makefile
@@ -7,6 +7,7 @@
BOOTSTRAP_PROJECT=cordpodbs
XOS_BOOTSTRAP_PORT=81
XOS_UI_PORT=80
+ONOS_APP_VERSION=1.0-rc4
ADMIN_USERNAME=padmin@vicci.org
ADMIN_PASSWORD=letmein
RUN_TOSCA_BOOTSTRAP=python ../common/run_tosca.py $(XOS_BOOTSTRAP_PORT) $(ADMIN_USERNAME) $(ADMIN_PASSWORD)
@@ -140,7 +141,7 @@
export SETUPDIR=.; bash ../common/make-images-yaml.sh
vtn-external.yaml:
- export SETUPDIR=.; bash ./make-vtn-external-yaml.sh
+ export SETUPDIR=.; bash ./make-vtn-external-yaml.sh $(ONOS_APP_VERSION)
fabric.yaml:
export SETUPDIR=.; bash ./make-fabric-yaml.sh
diff --git a/cord-pod/make-vtn-external-yaml.sh b/cord-pod/make-vtn-external-yaml.sh
index b97b712..c126e7e 100644
--- a/cord-pod/make-vtn-external-yaml.sh
+++ b/cord-pod/make-vtn-external-yaml.sh
@@ -1,3 +1,4 @@
+ONOS_APP_VERSION=$1
FN=$SETUPDIR/vtn-external.yaml
rm -f $FN
@@ -114,7 +115,7 @@
node: service#vtn
relationship: tosca.relationships.UsedByService
properties:
- install_dependencies: http://mavenrepo:8080/repository/org/opencord/cord-config/1.0.0-rc1/cord-config-1.0.0-rc1.oar,http://mavenrepo:8080/repository/org/opencord/vtn/1.0.0-rc1/vtn-1.0.0-rc1.oar
+ install_dependencies: http://mavenrepo:8080/repository/org/opencord/cord-config/${ONOS_APP_VERSION}/cord-config-${ONOS_APP_VERSION}.oar,http://mavenrepo:8080/repository/org/opencord/vtn/${ONOS_APP_VERSION}/vtn-${ONOS_APP_VERSION}.oar
dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
autogenerate: vtn-network-cfg
EOF