summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-10-20 11:39:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-20 11:39:45 +0000
commitddfd21b52b73a06569b1806e31f9c37408d2cba2 (patch)
tree30810c3b4ffaf79ab505a914b2b824979c320efd
parent20d6606f935dd78017de5deba6584ca27e24f694 (diff)
parentc3cbf58b02524310c303b1c30662ce18c1dbd748 (diff)
Merge "added for newton support and integration."
-rw-r--r--ci/config_tpl/bundle_tpl/bundle.yaml4
-rw-r--r--ci/config_tpl/bundle_tpl/relations.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/bundle.yaml4
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/relations.yaml2
-rw-r--r--ci/default_deployment_config.yaml5
5 files changed, 16 insertions, 1 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' ]
diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml
index d89ce13c..ec6735c4 100644
--- a/ci/default_deployment_config.yaml
+++ b/ci/default_deployment_config.yaml
@@ -1,7 +1,7 @@
ubuntu:
release: xenial
os:
- release: mitaka
+ release: newton
hyperconverged: True
ha:
mode: ha
@@ -27,3 +27,6 @@ os:
hacluster_ceph_radosgw: False
public_api: False
huge_pages: False
+ service:
+ congress: True
+ promise: True