From bba15961e7ffeaa27bb1d0f9c2f975a7f187fdd5 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 25 Jul 2017 12:47:44 -0500 Subject: modified to accomodate OCL Change-Id: Ib8227c4050b51adc2c466511bedf47e45a817db1 Signed-off-by: Narinder Gupta --- ci/config_tpl/bundle_tpl/neutron-ovs.yaml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 ci/config_tpl/bundle_tpl/neutron-ovs.yaml (limited to 'ci/config_tpl/bundle_tpl/neutron-ovs.yaml') diff --git a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml deleted file mode 100644 index 6c612819..00000000 --- a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml +++ /dev/null @@ -1,29 +0,0 @@ - neutron-openvswitch: - charm: local:{{ 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-ex physnet2:br-data - data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }} -{% else %} - bridge-mappings: physnet1: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 #} -- cgit 1.2.3-korg