diff --git a/doc/source/configuring.rst b/doc/source/configuring.rst index 7764342be9..682c6ef021 100644 --- a/doc/source/configuring.rst +++ b/doc/source/configuring.rst @@ -227,6 +227,14 @@ The path to a Certifying Authority's cert file to use in SSL connections to the registry server, if any. Alternately, you may set the ``GLANCE_CLIENT_CA_FILE`` environ variable to a filepath of the CA cert file +* ``registry_client_insecure=False`` + +Optional. Default: False. + +When using SSL in connections to the registry server, do not require +validation via a certifying authority. This is the registry's equivalent of +specifying --insecure on the command line using glanceclient for the API + Configuring Logging in Glance ----------------------------- diff --git a/etc/glance-api.conf b/etc/glance-api.conf index abdb33c6ab..b873d5ab04 100644 --- a/etc/glance-api.conf +++ b/etc/glance-api.conf @@ -131,6 +131,12 @@ registry_client_protocol = http # GLANCE_CLIENT_CA_FILE environ variable to a filepath of the CA cert file #registry_client_ca_file = /path/to/ca/file +# When using SSL in connections to the registry server, do not require +# validation via a certifying authority. This is the registry's equivalent of +# specifying --insecure on the command line using glanceclient for the API +# Default: False +#registry_client_insecure = False + # ============ Notification System Options ===================== # Notifications can be sent when images are create, updated or deleted. diff --git a/glance/registry/__init__.py b/glance/registry/__init__.py index 6352624685..da4c0c8a56 100644 --- a/glance/registry/__init__.py +++ b/glance/registry/__init__.py @@ -37,6 +37,7 @@ registry_client_opts = [ cfg.StrOpt('registry_client_key_file'), cfg.StrOpt('registry_client_cert_file'), cfg.StrOpt('registry_client_ca_file'), + cfg.BoolOpt('registry_client_insecure', default=False), cfg.StrOpt('metadata_encryption_key', secret=True), ] registry_client_ctx_opts = [ @@ -84,7 +85,8 @@ def configure_registry_client(): 'use_ssl': CONF.registry_client_protocol.lower() == 'https', 'key_file': CONF.registry_client_key_file, 'cert_file': CONF.registry_client_cert_file, - 'ca_file': CONF.registry_client_ca_file + 'ca_file': CONF.registry_client_ca_file, + 'insecure': CONF.registry_client_insecure, }