openstack
/
python-octaviaclient
Code Issues Proposed changes

Merge "Add TLS-HELLO option for HealthMonitors"

This commit is contained in:
Jenkins 2017-06-28 16:49:48 +00:00 committed by Gerrit Code Review
parent d89e4d3916 591f6b3b22
commit c1696b58a9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/usage/osc/v2/load-balancer.rst
View File

@ -1075,7 +1075,7 @@ Create a health monitor
--timeout <timeout>
--max-retries <max_retries>
[--url-path <url_path>]
--type {PING,HTTP,TCP,HTTPS}
--type {PING,HTTP,TCP,HTTPS,TLS-HELLO}
[--max-retries-down <max_retries_down>]
[--project <project>]
[--enable | --disable]
@ -1110,7 +1110,7 @@ Create a health monitor
Set the HTTP URL path of the request sent by the monitor to test the health of a backend member.
.. option:: --type {PING,HTTP,TCP,HTTPS}
.. option:: --type {PING,HTTP,TCP,HTTPS,TLS-HELLO}
Set the type of health monitor.
@ -1152,7 +1152,7 @@ Update a health monitor
[--max-retries <max_retries>]
[--max-retries-down <max_retries_down>]
[--url-path <url_path>]
[--type {PING,HTTP,TCP,HTTPS}]
[--type {PING,HTTP,TCP,HTTPS,TLS-HELLO}]
[--enable | --disable]
<health_monitor>
@ -1189,7 +1189,7 @@ Update a health monitor
Set the HTTP URL path of the request sent by the monitor to test the health of a backend member.
.. option:: --type {PING,HTTP,TCP,HTTPS}
.. option:: --type {PING,HTTP,TCP,HTTPS,TLS-HELLO}
Set the type of health monitor.

4
octaviaclient/osc/v2/health_monitor.py
View File

@ -86,9 +86,9 @@ class CreateHealthMonitor(command.ShowOne):
)
parser.add_argument(
'--type',
metavar="{PING,HTTP,TCP,HTTPS}",
metavar="{PING,HTTP,TCP,HTTPS,TLS-HELLO}",
required=True,
choices=['PING', 'HTTP', 'TCP', 'HTTPS'],
choices=['PING', 'HTTP', 'TCP', 'HTTPS', 'TLS-HELLO'],
help="Set the type of health monitor."
)
parser.add_argument(