diff --git a/karbor/common/config.py b/karbor/common/config.py index ddf8456b..05f748dc 100644 --- a/karbor/common/config.py +++ b/karbor/common/config.py @@ -97,7 +97,6 @@ service_client_opts = [ 'values are: public, admin, internal.'), cfg.StrOpt('ca_cert_file', - default=None, help='Location of the CA certificate file ' 'to use for client requests in SSL connections.'), diff --git a/karbor/services/protection/clients/cinder.py b/karbor/services/protection/clients/cinder.py index caa21210..f755d4e6 100644 --- a/karbor/services/protection/clients/cinder.py +++ b/karbor/services/protection/clients/cinder.py @@ -30,7 +30,6 @@ cinder_client_opts = [ ':: - ' 'Only used if cinder_endpoint is unset'), cfg.StrOpt(SERVICE + '_ca_cert_file', - default=None, help='Location of the CA certificate file ' 'to use for client requests in SSL connections.'), cfg.BoolOpt(SERVICE + '_auth_insecure', diff --git a/karbor/services/protection/clients/eisoo.py b/karbor/services/protection/clients/eisoo.py index ec3d09f0..69e3b91a 100644 --- a/karbor/services/protection/clients/eisoo.py +++ b/karbor/services/protection/clients/eisoo.py @@ -26,10 +26,8 @@ eisoo_client_opts = [ cfg.StrOpt(SERVICE + '_endpoint', help='URL of the eisoo endpoint.'), cfg.StrOpt(SERVICE + '_app_id', - default=None, help='App id for eisoo authentication.'), cfg.StrOpt(SERVICE + '_app_secret', - default=None, help='App secret for eisoo authenticaiton.'), ] diff --git a/karbor/services/protection/clients/glance.py b/karbor/services/protection/clients/glance.py index 271fdb37..d44b9c57 100644 --- a/karbor/services/protection/clients/glance.py +++ b/karbor/services/protection/clients/glance.py @@ -30,7 +30,6 @@ glance_client_opts = [ ':: - ' 'Only used if glance_endpoint is unset'), cfg.StrOpt(SERVICE + '_ca_cert_file', - default=None, help='Location of the CA certificate file ' 'to use for client requests in SSL connections.'), cfg.BoolOpt(SERVICE + '_auth_insecure', diff --git a/karbor/services/protection/clients/heat.py b/karbor/services/protection/clients/heat.py index 1ed8a265..bc4518b3 100644 --- a/karbor/services/protection/clients/heat.py +++ b/karbor/services/protection/clients/heat.py @@ -34,7 +34,6 @@ heat_client_opts = [ ':: - ' 'Only used if cinder_endpoint is unset'), cfg.StrOpt(SERVICE + '_ca_cert_file', - default=None, help='Location of the CA certificate file ' 'to use for client requests in SSL connections.'), cfg.BoolOpt(SERVICE + '_auth_insecure', diff --git a/karbor/services/protection/clients/neutron.py b/karbor/services/protection/clients/neutron.py index 7c8369f3..a1e693aa 100644 --- a/karbor/services/protection/clients/neutron.py +++ b/karbor/services/protection/clients/neutron.py @@ -30,7 +30,6 @@ neutron_client_opts = [ ':: - ' 'Only used if neutron_endpoint is unset'), cfg.StrOpt(SERVICE + '_ca_cert_file', - default=None, help='Location of the CA certificate file ' 'to use for client requests in SSL connections.'), cfg.BoolOpt(SERVICE + '_auth_insecure', diff --git a/karbor/services/protection/clients/nova.py b/karbor/services/protection/clients/nova.py index bc7d4b44..6d1b22fb 100644 --- a/karbor/services/protection/clients/nova.py +++ b/karbor/services/protection/clients/nova.py @@ -32,7 +32,6 @@ nova_client_opts = [ ':: - ' 'Only used if nova_endpoint is unset'), cfg.StrOpt(SERVICE + '_ca_cert_file', - default=None, help='Location of the CA certificate file ' 'to use for client requests in SSL connections.'), cfg.BoolOpt(SERVICE + '_auth_insecure',