diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-24 18:55:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-24 18:55:14 +0000 |
| commit | ce617afaf0c3e5bd455f33cfade26072d1c56ab8 (patch) | |
| tree | e729fe86e026f7858a433f4c8c0101a7d7c9c794 /mcp/patches/0001-opendaylight-formula-neutron.patch | |
| parent | f0d5de1c3ccb8f422f51e63f14a113ee1a39e270 (diff) | |
| parent | 307beb5c9a5ef1d5e202c078e3daed3e47d1a645 (diff) | |
Merge "Switch nofeature-ha compute nodes to UCA repo" into stable/euphrates
Diffstat (limited to 'mcp/patches/0001-opendaylight-formula-neutron.patch')
| -rw-r--r-- | mcp/patches/0001-opendaylight-formula-neutron.patch | 22 |
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 |