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
/
neutron-ovs.yaml
diff --git
a/ci/bundle_tpl/neutron-ovs.yaml
b/ci/bundle_tpl/neutron-ovs.yaml
index
1670d43
..
20bf1d9
100644
(file)
--- a/
ci/bundle_tpl/neutron-ovs.yaml
+++ b/
ci/bundle_tpl/neutron-ovs.yaml
@@
-1,12
+1,11
@@
neutron-openvswitch:
neutron-openvswitch:
- charm: "local:{{ ubuntu.release }}/neutron-openvswitch"
- num_units: 1
+ charm: local:{{ ubuntu.release }}/neutron-openvswitch
options:
{% if os.network.dpdk %}
enable-dpdk: true
#dpdk-driver: uio_pci_generic
options:
{% if os.network.dpdk %}
enable-dpdk: true
#dpdk-driver: uio_pci_generic
-{% endif %}
#data-port: ""
#default-socket-memory: 1024
#default-socket-cores: 1
#data-port: ""
#default-socket-memory: 1024
#default-socket-cores: 1
+{% endif %}
{# Empty block to avoid bad block trim #}
{# Empty block to avoid bad block trim #}