X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fbundle_tpl%2Fbundle.yaml;h=4aae4fb02aa5830c855ea786b0a9122d70178ec8;hb=62781fc5a43f756f00841cebe0b89d2a9d349ede;hp=8f1c554624d6ef1e35db9f9f901ae675558e72ce;hpb=8cc46e65c20745e241b68b3d960fc3c96d64b970;p=joid.git

diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml
index 8f1c5546..4aae4fb0 100644
--- a/ci/bundle_tpl/bundle.yaml
+++ b/ci/bundle_tpl/bundle.yaml
@@ -1,40 +1,30 @@
 # vim: set ts=2 et:
 {{ ubuntu.release }}-{{ os.release }}-nodes:
   inherits: openstack-phase1
-
-
-{{ ubuntu.release }}-{{ os.release }}:
-  inherits: openstack-phase2
   overrides:
 {% include 'phase2-overrides.yaml' %}
 
+{{ ubuntu.release }}-{{ os.release }}:
+  inherits: openstack-phase2
 
 openstack-phase1:
   services:
     nodes:
       charm: "cs:{{ ubuntu.release }}/ubuntu"
+{% if os.ha.mode == 'ha' %}
+      num_units: 5
+{% else %}
       num_units: 2
+{% endif %}
     ntp:
       charm: "local:{{ ubuntu.release }}/ntp"
-  relations:
-    - - "ntp:juju-info"
-      - "nodes:juju-info"
-
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
-{% include 'relations.yaml' %}
-  services:
-{% if os.ha.mode == 'ha' %}
-    {% include 'haclusters.yaml' %}
-{% endif %}
 {% include 'mysql.yaml' %}
 {% include 'ceilometer.yaml' %}
 {% include 'ceph.yaml' %}
 {% include 'cinder.yaml' %}
 {% include 'glance.yaml' %}
 {% include 'opnfv-promise.yaml' %}
+{% include 'congress.yaml' %}
 {% include 'keystone.yaml' %}
 {% include 'nova-cloud-controller.yaml' %}
 {% include 'nova-compute.yaml' %}
@@ -43,5 +33,25 @@ openstack-phase2:
 {% include 'heat.yaml' %}
 {% include 'neutron-api.yaml' %}
 {% include 'neutron-gateway.yaml' %}
-{% if os.network.controller == 'nosdn' %}{% include 'neutron-ovs.yaml' %}
-{% elif os.network.controller == 'odl' %}{% include 'odl.yaml' %}{% endif %}
+{% if os.network.controller == 'odl' %}
+    {% include 'odl.yaml' %}
+{% elif os.network.controller == 'onos' %}
+    {% include 'onos.yaml' %}
+{% endif %}
+{% if os.ha.mode == 'ha' %}
+    {% include 'haclusters.yaml' %}
+{% endif %}
+
+  relations:
+    - - "ntp:juju-info"
+      - "nodes:juju-info"
+{% if os.ha.mode == 'ha' %}
+    {% include 'harelations.yaml' %}
+{% endif %}
+
+openstack-phase2:
+  inherits: openstack-phase1
+  relations:
+{% include 'relations.yaml' %}
+  services:
+{% include 'subordinate.yaml' %}