correct the path as per distro passes.

Change-Id: I1d8f19c27da7b728a5fae68262b8112cb2310de3
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 536fd05..3b5f7e1 100755 (executable)
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -19,8 +19,7 @@ sed -i -- "s|distro=trusty|distro=$opnfvdistro|g" ./fetch-charms.sh
 
 ./fetch-charms.sh $opnfvdistro
 
-mkdir trusty
-tar xvf common/scaleio.tar -C ./trusty/ --strip=2 juju-scaleio/trusty/
+tar xvf common/scaleio.tar -C ./$opnfvdistro/ --strip=2 juju-scaleio/trusty/
 
 osdomname=''
 

diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml
index 507241a..c9e8bdf 100644 (file)
--- a/ci/config_tpl/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/bundle_tpl/bundle.yaml
@@ -46,8 +46,10 @@ openstack-phase1:
 {% endif %}
 {% include 'cinder.yaml' %}
 {% include 'glance.yaml' %}
+{% if opnfv.storage_dict.ceph is defined %}
 {% include 'opnfv-promise.yaml' %}
 {% include 'congress.yaml' %}
+{% endif %}
 {% include 'keystone.yaml' %}
 {% include 'nova-cloud-controller.yaml' %}
 {% include 'nova-compute.yaml' %}

diff --git a/ci/config_tpl/bundle_tpl/relations.yaml b/ci/config_tpl/bundle_tpl/relations.yaml
index 7b925f6..8dd6475 100644 (file)
--- a/ci/config_tpl/bundle_tpl/relations.yaml
+++ b/ci/config_tpl/bundle_tpl/relations.yaml
@@ -38,6 +38,9 @@
     - [ 'ceph-osd:mon', 'ceph:osd' ]
     - [ 'ceph-radosgw:mon', 'ceph:radosgw' ]
     - [ 'ceph-radosgw:identity-service', 'keystone:identity-service' ]
+    - [ 'congress:shared-db', 'mysql:shared-db' ]
+    - [ 'congress:identity-service', 'keystone:identity-service' ]
+    - [ 'congress:amqp', 'rabbitmq-server:amqp' ]
 {% endif %}
     - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ]
     - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ]
@@ -48,9 +51,6 @@
     - [ 'heat:shared-db', 'mysql:shared-db' ]
     - [ 'heat:identity-service', 'keystone:identity-service' ]
     - [ 'heat:amqp', 'rabbitmq-server:amqp' ]
-    - [ 'congress:shared-db', 'mysql:shared-db' ]
-    - [ 'congress:identity-service', 'keystone:identity-service' ]
-    - [ 'congress:amqp', 'rabbitmq-server:amqp' ]
     - [ 'aodh:amqp', 'rabbitmq-server:amqp' ]
     - [ 'aodh:shared-db', 'mysql:shared-db' ]
     - [ 'aodh:identity-service', 'keystone:identity-service' ]