diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-07-01 09:02:24 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-07-01 09:13:43 -0500 |
| commit | 62781fc5a43f756f00841cebe0b89d2a9d349ede (patch) | |
| tree | 1ae3a9867dcff0053a1221aa6bd5ace5c5ef3a49 /ci/bundle_tpl/subordinate.yaml | |
| parent | 737cb665e95ec8ddd927cab528bd1acd83674e38 (diff) | |
modified to integrete ONOS.
Change-Id: Ic787c583c36805aca13ec0a954b23d89a1addc8d
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/bundle_tpl/subordinate.yaml')
| -rw-r--r-- | ci/bundle_tpl/subordinate.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml index c84cdd72..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,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: |