aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-11-24 12:10:08 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-11-24 13:20:55 +0000
commit307beb5c9a5ef1d5e202c078e3daed3e47d1a645 (patch)
treec18dc2c651f0c09398daa6d819cc92d9c435ccc6 /mcp/patches
parentabf9b9a8363e308daaaf297450222cf8c5397868 (diff)
Switch nofeature-ha compute nodes to UCA repo
Employ UCA repo on computes nodes for nosdn-nofeature-ha scenario as well to prevent a regression (creation of ports failed for 1+n instances) of neutron ovs agent from mcp/openstack repos. Change-Id: Ie65ae122096c0d3a93c09d46191787a934bd7d4f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 8ba3a1a4ed0ce41a76fa6d712778904bb56b60ac)
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/0001-opendaylight-formula-neutron.patch22
1 files changed, 20 insertions, 2 deletions
diff --git a/mcp/patches/0001-opendaylight-formula-neutron.patch b/mcp/patches/0001-opendaylight-formula-neutron.patch
index 157271aa3..8d02cd992 100644
--- a/mcp/patches/0001-opendaylight-formula-neutron.patch
+++ b/mcp/patches/0001-opendaylight-formula-neutron.patch
@@ -60,7 +60,7 @@ index b61e313..02da3b1 100644
+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
+index 123386d..d77f6c8 100644
--- a/neutron/files/ocata/neutron-generic.conf.Debian
+++ b/neutron/files/ocata/neutron-generic.conf.Debian
@@ -37,7 +37,7 @@ auth_strategy = keystone
@@ -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)
@@ -82,7 +91,7 @@ index 123386d..85b8076 100644
+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
+index 79376a2..a7a4645 100644
--- a/neutron/files/ocata/neutron-server.conf.Debian
+++ b/neutron/files/ocata/neutron-server.conf.Debian
@@ -50,7 +50,7 @@ core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
@@ -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