Download OCL container packages from OPNFV artifact repo (if not present).

Updated ceph.yaml to use correct lxd numbers

Change-Id: If147df8cc188e02dafe6d3ce80bd6d4d9f548eb7
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 496707d..be11a1f 100755 (executable)
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -182,5 +182,20 @@ else
     done
 fi
 
+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
+  do
+    FILE="${ROLE}-${TAG}"
+  if [ ! -f $FILE ]
+  then
+    curl -o $FILE http://artifacts.opnfv.org/ovno/containers/$FILE
+  fi
+  juju attach $ROLE ${ROLE}="./$FILE"
+done
+fi
 #lets gather the status of deployment once juju-deployer completed.
 juju status --format=tabular

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index dc4e101..6b20d98 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -39,8 +39,8 @@
 {% endfor %}
 {% else %}
         - "lxd:nodes/0"
-        - "lxd:nodes/0"
-        - "lxd:nodes/0"
+        - "lxd:nodes/1"
+        - "lxd:nodes/2"
 {% endif %}
 {% endif %}
     ceph-osd: