X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fbundle_tpl%2Fsubordinate.yaml;h=645cd05745dacb841b3600333563550151fc795e;hb=62781fc5a43f756f00841cebe0b89d2a9d349ede;hp=1391ad8538a9879fce50a0ade6aef24b74d15893;hpb=8af52f45681275997204080f1cac854b255f2bcc;p=joid.git

diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml
index 1391ad85..645cd057 100644
--- 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,15 +15,15 @@
     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 is defined %}
+{% if os.lxd %}
     lxd:
       charm: local:{{ ubuntu.release }}/lxd
 {% endif %}