change the charm version to latest for rados-gw as well.

[joid.git] / ci / 02-deploybundle.sh

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 0d4166e..396f5ea 100755 (executable)
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -133,9 +133,6 @@ if [[ "$opnfvmodel" = "openstack" ]]; then
     #update source if trusty is target distribution
     var=os-$opnfvsdn-$fea-$opnfvtype"-"$opnfvdistro"_"$openstack
 
-    if ([ $osdomname ] && [ $osdomname != "null" ] && [ $osdomname != "None" ]); then
-        var=$var"_"publicapi
-    fi
 else
     var=k8-$opnfvsdn-$fea-baremetal-core
 fi
@@ -172,10 +169,9 @@ openfile_fix() {
 
 if [ "$opnfvsdn" = "ocl" ]
 then
-  ROLES="contrail-controller contrail-analytics contrail-analyticsdb"
   TAG="ubuntu16.04-4.0.0.0-20.tar.gz"
 
-  for ROLE in $ROLES
+  for ROLE in contrail-controller contrail-analytics contrail-analyticsdb
   do
     FILE="${ROLE}-${TAG}"
   if [ ! -f $FILE ]