Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "adding new scenraio documentation and updated the current one."
[joid.git]
/
ci
/
config_tpl
/
juju2
/
bundle_tpl
/
neutron-ovs.yaml
diff --git
a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index
286132b
..
1dd2210
100644
(file)
--- a/
ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/
ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@
-1,9
+1,21
@@
neutron-openvswitch:
charm: ./{{ ubuntu.release }}/neutron-openvswitch
neutron-openvswitch:
charm: ./{{ ubuntu.release }}/neutron-openvswitch
+{% if os.service.bindings %}
+{% if opnfv.spaces_dict.data is defined %}
+ bindings:
+ data: admin-api
+ options:
+{% else %}
+ bindings:
+ data: internal-api
+ options:
+{% endif %}
+{% else %}
options:
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
options:
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
+{% endif %}
{% if os.network.dpdk %}
enable-dpdk: true
#dpdk-driver: uio_pci_generic
{% if os.network.dpdk %}
enable-dpdk: true
#dpdk-driver: uio_pci_generic
@@
-12,18
+24,16
@@
#default-socket-cores: 1
{% endif %}
{% if opnfv.ext_port is defined %}
#default-socket-cores: 1
{% endif %}
{% if opnfv.ext_port is defined %}
-{% if os.network.dvr %}
{% if os.network.controller == 'nosdn' %}
{% if opnfv.data_port is defined %}
{% if os.network.controller == 'nosdn' %}
{% if opnfv.data_port is defined %}
- bridge-mappings: physnet1:br-
data external:br-ex
- data-port: br-
data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext
_port }}
+ bridge-mappings: physnet1:br-
ex physnet2:br-data
+ data-port: br-
ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data
_port }}
{% else %}
{% else %}
- bridge-mappings:
external
:br-ex
+ bridge-mappings:
physnet1
:br-ex
data-port: br-ex:{{ opnfv.ext_port }}
{% endif %}
{% else %}
data-port: br-ex:{{ opnfv.ext_port }}
{% endif %}
{% else %}
- ext-port: {{ opnfv.ext_port }}
-{% endif %}
+ ext-port: {{ opnfv.ext_port }}
{% endif %}
{% endif %}
{# Empty block to avoid bad block trim #}
{% endif %}
{% endif %}
{# Empty block to avoid bad block trim #}