diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-16 07:54:56 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-16 23:43:55 -0500 |
| commit | f1dfc0776d32dea2a2fe7e2cb2b15b1836a6b666 (patch) | |
| tree | b75bd8543a4ba5cc7919c43588b2522201c88c90 /ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | |
| parent | 498d228be6d2bb1f68b5d63813e01ecd68b315cd (diff) | |
cmodfiied to add juju 2.0 support.
Change-Id: I3981f796cfb9ceb9f32522f4fed831d66e389c48
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml new file mode 100644 index 00000000..286132b5 --- /dev/null +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml @@ -0,0 +1,29 @@ + neutron-openvswitch: + charm: ./{{ ubuntu.release }}/neutron-openvswitch + options: +{% if opnfv.spaces_dict.data is defined %} + os-data-network: {{ opnfv.spaces_dict.data.cidr }} +{% endif %} +{% if os.network.dpdk %} + enable-dpdk: true + #dpdk-driver: uio_pci_generic + #data-port: "" + #default-socket-memory: 1024 + #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 %} + bridge-mappings: physnet1:br-data external:br-ex + data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }} +{% else %} + bridge-mappings: external:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} +{% else %} + ext-port: {{ opnfv.ext_port }} +{% endif %} +{% endif %} +{% endif %} +{# Empty block to avoid bad block trim #} |