From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 20 Oct 2016 11:37:23 +0000 (-0500)
Subject: added for newton support and integration.
X-Git-Tag: danube.1.0~118^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F23423%2F1;p=joid.git

added for newton support and integration.

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

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,9 +38,11 @@
     - [ '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' ]
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,9 +38,11 @@
     - [ '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' ]
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