diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-20 06:37:23 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-20 06:37:23 -0500 |
| commit | c3cbf58b02524310c303b1c30662ce18c1dbd748 (patch) | |
| tree | 389eb6b57f2cd3598b5311e157b597bbdfd3719d /ci/config_tpl | |
| parent | aae355c5c32f12cc10d5b4c09d477c9203e19d05 (diff) | |
added for newton support and integration.
Change-Id: Ied0a3bc0d2389f1966af05f3d6e2ba34831cdec8
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/bundle.yaml | 4 | ||||
| -rw-r--r-- | ci/config_tpl/bundle_tpl/relations.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/bundle.yaml | 4 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/relations.yaml | 2 |
4 files changed, 12 insertions, 0 deletions
diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml index 61710816..8aab10f8 100644 --- a/ci/config_tpl/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/bundle_tpl/bundle.yaml @@ -47,9 +47,13 @@ openstack-phase1: {% include 'cinder.yaml' %} {% include 'glance.yaml' %} {% if opnfv.storage_dict.ceph is defined %} +{% if os.service.promise %} {% include 'opnfv-promise.yaml' %} +{% endif %} +{% if os.service.congress %} {% include 'congress.yaml' %} {% endif %} +{% 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 6d4d70c7..9eb860b9 100644 --- a/ci/config_tpl/bundle_tpl/relations.yaml +++ b/ci/config_tpl/bundle_tpl/relations.yaml @@ -38,10 +38,12 @@ - [ 'ceph-osd:mon', 'ceph:osd' ] - [ 'ceph-radosgw:mon', 'ceph:radosgw' ] - [ 'ceph-radosgw:identity-service', 'keystone:identity-service' ] +{% if os.service.congress %} - [ 'congress:shared-db', 'mysql:shared-db' ] - [ 'congress:identity-service', 'keystone:identity-service' ] - [ 'congress:amqp', 'rabbitmq-server:amqp' ] {% endif %} +{% endif %} - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ] - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ] - [ 'ceilometer:identity-service', 'keystone:identity-service' ] diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml index 1698f0d3..b0a0e861 100644 --- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml @@ -39,9 +39,13 @@ {% include 'cinder.yaml' %} {% include 'glance.yaml' %} {% if opnfv.storage_dict.ceph is defined %} +{% if os.service.promise %} {% include 'opnfv-promise.yaml' %} +{% endif %} +{% if os.service.congress %} {% include 'congress.yaml' %} {% endif %} +{% endif %} {% include 'keystone.yaml' %} {% include 'nova-cloud-controller.yaml' %} {% include 'nova-compute.yaml' %} diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml index 6d4d70c7..9eb860b9 100644 --- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml @@ -38,10 +38,12 @@ - [ 'ceph-osd:mon', 'ceph:osd' ] - [ 'ceph-radosgw:mon', 'ceph:radosgw' ] - [ 'ceph-radosgw:identity-service', 'keystone:identity-service' ] +{% if os.service.congress %} - [ 'congress:shared-db', 'mysql:shared-db' ] - [ 'congress:identity-service', 'keystone:identity-service' ] - [ 'congress:amqp', 'rabbitmq-server:amqp' ] {% endif %} +{% endif %} - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ] - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ] - [ 'ceilometer:identity-service', 'keystone:identity-service' ] |