openstack/openstack-manuals
Code Issues Proposed changes

Merge "Rectify default config values for nsx plugin"

Browse Source
This commit is contained in:
Jenkins 2015-06-19 07:08:23 +00:00 committed by Gerrit Code Review
commit d197a205ca
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/admin-guide-cloud/networking/section_networking_adv_features.xml
View File

@ -1400,7 +1400,7 @@
<tr>
<td><literal>state_sync_interval</literal></td>
<td><literal>nsx_sync</literal></td>
<td>120 seconds</td>
<td>10 seconds</td>
<td>Integer; no constraint.</td>
<td>Interval in seconds between two run of the synchronization task. If
the synchronization task takes more than
@ -1421,7 +1421,7 @@
<tr>
<td><literal>min_sync_req_delay</literal></td>
<td><literal>nsx_sync</literal></td>
<td>10 seconds</td>
<td>1 second</td>
<td>Integer. Must not exceed
<literal>state_sync_interval</literal>.</td>
<td>The value of this option can be tuned according to the observed load

5
doc/admin-guide-cloud/networking/section_networking_config-plugins.xml
View File

@ -111,10 +111,9 @@ allow_overlapping_ips = True</programlisting>
connection failures:</para>
<programlisting language="ini">nsx_user = <replaceable>ADMIN_USER_NAME</replaceable>
nsx_password = <replaceable>NSX_USER_PASSWORD</replaceable>
req_timeout = <replaceable>NSX_REQUEST_TIMEOUT</replaceable> # (seconds) default 30 seconds
http_timeout = <replaceable>HTTP_REQUEST_TIMEOUT</replaceable> # (seconds) default 10 seconds
http_timeout = <replaceable>HTTP_REQUEST_TIMEOUT</replaceable> # (seconds) default 75 seconds
retries = <replaceable>HTTP_REQUEST_RETRIES</replaceable> # default 2
redirects = <replaceable>HTTP_REQUEST_MAX_REDIRECTS</replaceable> # default 3
redirects = <replaceable>HTTP_REQUEST_MAX_REDIRECTS</replaceable> # default 2
nsx_controllers = <replaceable>API_ENDPOINT_LIST</replaceable> # comma-separated list</programlisting>
<para>To ensure correct operations, the <literal>nsx_user</literal> user
must have administrator credentials on the NSX platform.</para>