Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
1391ad8
..
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 %}
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
{% 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-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
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 %}
{% endif %}
-{% if os.lxd
is defined
%}
+{% if os.lxd %}
lxd:
charm: local:{{ ubuntu.release }}/lxd
{% endif %}
lxd:
charm: local:{{ ubuntu.release }}/lxd
{% endif %}