diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-01-04 22:56:39 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-01-04 22:57:29 -0600 |
| commit | 9a825022ab2c447c1c77fde86c3731d89d1626dd (patch) | |
| tree | a0e84850b1bbbf5908f72c695e02a3e009327c8b /ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | |
| parent | 6d8bbf8f16d1db5a3251aef5af6a671fd9a68503 (diff) | |
modified as per openstack team.
Change-Id: Ic14bdf0806d1d5a5bbfecc51284321f2ba99f4e3
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml index 266ac709..21155c49 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml @@ -2,7 +2,8 @@ charm: ./{{ ubuntu.release }}/neutron-openvswitch options: {% if opnfv.spaces_dict.data is defined %} - os-data-network: {{ opnfv.spaces_dict.data.cidr }} + bindings: + data: admin {% endif %} {% if os.network.dpdk %} enable-dpdk: true @@ -12,7 +13,6 @@ #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 @@ -25,5 +25,4 @@ ext-port: {{ opnfv.ext_port }} {% endif %} {% endif %} -{% endif %} {# Empty block to avoid bad block trim #} |