X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=mcp%2Fpatches%2F0001-opendaylight-formula-neutron.patch;h=4bd161700664694a31b631af9e693d8e2717da77;hb=81561126307f15d4f65a743ed2431ea8c713a921;hp=157271aa348f92d7589863bcf4ca6b36da44660f;hpb=637ab12768237d45a37f3c41716d36d3de53821d;p=fuel.git

diff --git a/mcp/patches/0001-opendaylight-formula-neutron.patch b/mcp/patches/0001-opendaylight-formula-neutron.patch
index 157271aa3..4bd161700 100644
--- a/mcp/patches/0001-opendaylight-formula-neutron.patch
+++ b/mcp/patches/0001-opendaylight-formula-neutron.patch
@@ -12,10 +12,10 @@ Subject: [PATCH] Bring in opendaylight support
 
 Change-Id: Ie9073fafccba336f94b1996bd85c98d7a7f5060b
 
-diff --git a/neutron/files/ocata/dhcp_agent.ini b/neutron/files/ocata/dhcp_agent.ini
+diff --git a/neutron/files/pike/dhcp_agent.ini b/neutron/files/pike/dhcp_agent.ini
 index d327e64..739dddf 100644
---- a/neutron/files/ocata/dhcp_agent.ini
-+++ b/neutron/files/ocata/dhcp_agent.ini
+--- a/neutron/files/pike/dhcp_agent.ini
++++ b/neutron/files/pike/dhcp_agent.ini
 @@ -1,3 +1,8 @@
 +{%- if pillar.neutron.gateway is defined %}
 +{%- from "neutron/map.jinja" import gateway as neutron with context %}
@@ -33,10 +33,10 @@ index d327e64..739dddf 100644
 
  # Allows for serving metadata requests coming from a dedicated metadata access network whose CIDR is 169.254.169.254/16 (or larger prefix),
  # and is connected to a Neutron router from which the VMs send metadata:1 request. In this case DHCP Option 121 will not be injected in VMs,
-diff --git a/neutron/files/ocata/ml2_conf.ini b/neutron/files/ocata/ml2_conf.ini
+diff --git a/neutron/files/pike/ml2_conf.ini b/neutron/files/pike/ml2_conf.ini
 index b61e313..02da3b1 100644
---- a/neutron/files/ocata/ml2_conf.ini
-+++ b/neutron/files/ocata/ml2_conf.ini
+--- a/neutron/files/pike/ml2_conf.ini
++++ b/neutron/files/pike/ml2_conf.ini
 @@ -134,7 +134,8 @@ tenant_network_types = {{ server.backend.tenant_network_types }}
  {%- for mechanism_name, mechanism in server.get('backend', {}).get('mechanism', []).items() %}
  {%- do mechanism_drivers.append(mechanism.get('driver')) if 'driver' in mechanism %}
@@ -59,10 +59,10 @@ index b61e313..02da3b1 100644
 +username = {{ server.backend.user }}
 +password = {{ server.backend.password }}
 +{%- endif %}
-diff --git a/neutron/files/ocata/neutron-generic.conf.Debian b/neutron/files/ocata/neutron-generic.conf.Debian
-index 123386d..85b8076 100644
---- a/neutron/files/ocata/neutron-generic.conf.Debian
-+++ b/neutron/files/ocata/neutron-generic.conf.Debian
+diff --git a/neutron/files/pike/neutron-generic.conf.Debian b/neutron/files/pike/neutron-generic.conf.Debian
+index 123386d..d77f6c8 100644
+--- a/neutron/files/pike/neutron-generic.conf.Debian
++++ b/neutron/files/pike/neutron-generic.conf.Debian
 @@ -37,7 +37,7 @@ auth_strategy = keystone
 
  core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
@@ -72,6 +72,15 @@ index 123386d..85b8076 100644
 
  {% endif %}
 
+@@ -668,7 +668,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+ # needs to execute commands in Dom0 in the hypervisor of XenServer, this item
+ # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session
+ # to pass commands to Dom0. (string value)
+-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf
++#root_helper_daemon = <None>
+
+ # Seconds between nodes reporting state to server; should be less than
+ # agent_down_time, best if it is half or less than agent_down_time. (floating
 @@ -2092,3 +2092,8 @@ heartbeat_rate = 2
  # Sets the list of available ciphers. value should be a string in the OpenSSL
  # cipher list format. (string value)
@@ -81,10 +90,10 @@ index 123386d..85b8076 100644
 +[ovs]
 +ovsdb_connection = {{ neutron.backend.ovsdb_connection }}
 +{%- endif %}
-diff --git a/neutron/files/ocata/neutron-server.conf.Debian b/neutron/files/ocata/neutron-server.conf.Debian
-index 79376a2..c9630b8 100644
---- a/neutron/files/ocata/neutron-server.conf.Debian
-+++ b/neutron/files/ocata/neutron-server.conf.Debian
+diff --git a/neutron/files/pike/neutron-server.conf.Debian b/neutron/files/pike/neutron-server.conf.Debian
+index 79376a2..a7a4645 100644
+--- a/neutron/files/pike/neutron-server.conf.Debian
++++ b/neutron/files/pike/neutron-server.conf.Debian
 @@ -50,7 +50,7 @@ core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
  {% set l3_plugin = 'networking_ovn.l3.l3_ovn.OVNL3RouterPlugin' %}
  {% endif %}
@@ -94,6 +103,15 @@ index 79376a2..c9630b8 100644
  {%- if server.lbaas is defined -%},lbaasv2{%- endif -%}
  {%- if fwaas.get('enabled', False) -%},{{ fwaas[fwaas.api_version]['service_plugin'] }}{%- endif -%}
  {%- if server.get('qos', 'True') -%},neutron.services.qos.qos_plugin.QoSPlugin{%- endif -%}
+@@ -703,7 +703,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+ # needs to execute commands in Dom0 in the hypervisor of XenServer, this item
+ # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session
+ # to pass commands to Dom0. (string value)
+-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf
++#root_helper_daemon = <None>
+
+ # Seconds between nodes reporting state to server; should be less than
+ # agent_down_time, best if it is half or less than agent_down_time. (floating
 @@ -2245,3 +2245,8 @@ username = {{ server.identity.user }}
  password = {{ server.identity.password }}
  auth_url=http://{{ server.identity.host }}:35357