From 591f6b3b229a68a0b76b68f491988a5fdbcb658c Mon Sep 17 00:00:00 2001 From: Adam Harwell Date: Wed, 21 Jun 2017 03:03:25 -0700 Subject: [PATCH] Add TLS-HELLO option for HealthMonitors Change-Id: I98c2844fac83b5a55901785d4389871badd7b8af Depends-On: I15a79b7fb0c2ff1020090b4057909a1f41a2c8ad --- doc/source/usage/osc/v2/load-balancer.rst | 8 ++++---- octaviaclient/osc/v2/health_monitor.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/usage/osc/v2/load-balancer.rst b/doc/source/usage/osc/v2/load-balancer.rst index aa38a1f..756e826 100644 --- a/doc/source/usage/osc/v2/load-balancer.rst +++ b/doc/source/usage/osc/v2/load-balancer.rst @@ -1075,7 +1075,7 @@ Create a health monitor --timeout --max-retries [--url-path ] - --type {PING,HTTP,TCP,HTTPS} + --type {PING,HTTP,TCP,HTTPS,TLS-HELLO} [--max-retries-down ] [--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-down ] [--url-path ] - [--type {PING,HTTP,TCP,HTTPS}] + [--type {PING,HTTP,TCP,HTTPS,TLS-HELLO}] [--enable | --disable] @@ -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. diff --git a/octaviaclient/osc/v2/health_monitor.py b/octaviaclient/osc/v2/health_monitor.py index 0222a88..b697c8e 100644 --- a/octaviaclient/osc/v2/health_monitor.py +++ b/octaviaclient/osc/v2/health_monitor.py @@ -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(