diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-09-16 13:24:03 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-09-16 16:32:41 -0500 |
| commit | 64d633617d7b5a2dc635d95558cf5dbbdcbc5fe7 (patch) | |
| tree | f1f41930caa775d5e42e70af6f9046ac9e918365 | |
| parent | d2ca237a4e5c2e2cb6e2f7faa88895a50d979e50 (diff) | |
correct the path as per distro passes.
Change-Id: I1d8f19c27da7b728a5fae68262b8112cb2310de3
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
| -rwxr-xr-x | ci/02-deploybundle.sh | 3 | ||||
| -rw-r--r-- | ci/config_tpl/bundle_tpl/bundle.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/bundle_tpl/relations.yaml | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index 536fd055..3b5f7e18 100755 --- 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 507241af..c9e8bdf8 100644 --- 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 7b925f6d..8dd64759 100644 --- 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' ] |