diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-08-09 22:42:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-09 22:42:38 +0000 |
| commit | 89fe6869c63bfe43df92055e9d3a91bd65f3a8f8 (patch) | |
| tree | 1d3748cccdee888df7bc1675c3bcd8bc47c0f11b /ci | |
| parent | 4df6477f0b8b92ef6da1cd84a17d51b3e6ea31bb (diff) | |
| parent | 07c8c48f852f251455ccdee9ab11315d50c61bf3 (diff) | |
Merge "Download OCL container packages from OPNFV artifact repo (if not present). Updated ceph.yaml to use correct lxd numbers"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/02-deploybundle.sh | 15 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index 496707db..be11a1f0 100755 --- 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 dc4e101b..6b20d986 100644 --- 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: |