diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-06 00:03:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-06 00:03:42 +0000 |
| commit | 0f81e81552bdf0053fc0303c53dff455c17d56a6 (patch) | |
| tree | 53b0f53d58692fd54a55b9674c4719d61515e987 /ci/config_tpl/bundle_tpl/neutron-ovs.yaml | |
| parent | a56fce4f323d8a6a232f0205e03c6f601b7eefb5 (diff) | |
| parent | 5cc5559348a8a18a41cfd25cce446955d63afb83 (diff) | |
Merge "New scripts for configs generation, based on jinja2"
Diffstat (limited to 'ci/config_tpl/bundle_tpl/neutron-ovs.yaml')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/neutron-ovs.yaml | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml new file mode 100644 index 00000000..087783d8 --- /dev/null +++ b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml @@ -0,0 +1,31 @@ + neutron-openvswitch: + charm: local:{{ ubuntu.release }}/neutron-openvswitch + options: +{% if opnfv.spaces_dict.data is defined %} + os-data-network: {{ opnfv.spaces_dict.data.cidr }} +{% else %} + #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 #} |