modified to integrete ONOS.

[joid.git] / ci / bundle_tpl / subordinate.yaml

diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml
index c84cdd7..645cd05 100644 (file)
--- a/ci/bundle_tpl/subordinate.yaml
+++ b/ci/bundle_tpl/subordinate.yaml
@@ -4,7 +4,8 @@
     cinder-ceph:
       charm: local:{{ ubuntu.release }}/cinder-ceph
 {% endif %}
-{% if os.network.controller == 'nosdn' %}{% include 'neutron-ovs.yaml' %}
+{% if os.network.controller == 'nosdn' %}
+    {% include 'neutron-ovs.yaml' %}
 {% elif os.network.controller == 'odl' %}
     neutron-api-odl:
       charm: local:{{ ubuntu.release }}/neutron-api-odl
@@ -14,13 +15,13 @@
     openvswitch-odl:
       charm: local:{{ ubuntu.release }}/openvswitch-odl
 {% elif os.network.controller == 'nons' %}
-    openvswitch-onos:
-      charm: local:{{ ubuntu.release }}/openvswitch-onos
     neutron-api-onos:
       charm: local:{{ ubuntu.release }}/neutron-api-onos
       options:
         overlay-network-type: 'vxlan'
         security-groups: True
+    openvswitch-onos:
+      charm: local:{{ ubuntu.release }}/openvswitch-onos
 {% endif %}
 {% if os.lxd %}
     lxd: