summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-29 14:50:01 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-29 14:57:17 +0400
commitf3314c74504d8bc324211cd60241674f1998efd4 (patch)
tree3dbc65281a30822ccf74ef02c4ee5fd5342d22ad
parent3b338ea9f19052eb4cf3dc70d9d49d03cb602ef2 (diff)
[odl] Fire up ovs host config after other settings
Change-Id: I9a42e0373f551da9f5c968ae169e0eff1a58972e Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/patches/0001-Filter-out-OpenDaylight-client-on-computes.patch25
1 files changed, 11 insertions, 14 deletions
diff --git a/mcp/patches/0001-Filter-out-OpenDaylight-client-on-computes.patch b/mcp/patches/0001-Filter-out-OpenDaylight-client-on-computes.patch
index be8ba1ee4..f3ed7847d 100644
--- a/mcp/patches/0001-Filter-out-OpenDaylight-client-on-computes.patch
+++ b/mcp/patches/0001-Filter-out-OpenDaylight-client-on-computes.patch
@@ -103,22 +103,18 @@ index 418282d..e83a5b7 100644
{%- elif compute.backend.engine == "ovn" %}
diff --git a/neutron/opendaylight/client.sls b/neutron/opendaylight/client.sls
-index 57e6bcc..79ab0a2 100644
+index 57e6bcc..bb0cf65 100644
--- a/neutron/opendaylight/client.sls
+++ b/neutron/opendaylight/client.sls
-@@ -9,27 +9,27 @@ python-networking-odl:
+@@ -9,21 +9,16 @@ python-networking-odl:
{%- if not grains.get('noservices', False) %}
-ovs_set_manager:
-+neutron_odl_ovs_hostconfig:
- cmd.run:
+- cmd.run:
- - name: 'ovs-vsctl set-manager {{ neutron.opendaylight.ovsdb_server_iface }} {{ neutron.opendaylight.ovsdb_odl_iface }}'
- - unless: 'ovs-vsctl get-manager | fgrep -x {{ neutron.opendaylight.ovsdb_odl_iface }}'
-+ - name: 'neutron-odl-ovs-hostconfig --noovs_dpdk'
-+ - require:
-+ - pkg: python-networking-odl
-
+-
ovs_set_tunnel_endpoint:
cmd.run:
- name: 'ovs-vsctl set Open_vSwitch . other_config:local_ip={{ neutron.opendaylight.tunnel_ip }}'
@@ -133,13 +129,14 @@ index 57e6bcc..79ab0a2 100644
+ - unless: 'ovs-vsctl get Open_vSwitch . other_config | fgrep -q provider_mappings=\"{{ neutron.opendaylight.provider_mappings }}\"'
{%- endif %}
--neutron_odl_ovs_hostconfig:
+ neutron_odl_ovs_hostconfig:
+@@ -32,4 +27,9 @@ neutron_odl_ovs_hostconfig:
+ - require:
+ - pkg: python-networking-odl
+
+ovs_set_manager:
- cmd.run:
-- - name: 'neutron-odl-ovs-hostconfig --noovs_dpdk'
-- - require:
-- - pkg: python-networking-odl
++ cmd.run:
+ - name: 'ovs-vsctl set-manager {{ neutron.opendaylight.ovsdb_server_iface }} {{ neutron.opendaylight.ovsdb_odl_iface }}'
+ - unless: 'ovs-vsctl get-manager | fgrep -qx {{ neutron.opendaylight.ovsdb_odl_iface }}'
-
++
{%- endif %}