summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorVincent Untz <vuntz@suse.com>2012-08-22 15:40:59 +0200
committerVincent Untz <vuntz@suse.com>2012-08-27 08:48:18 +0200
commitfa5be443bae880ab15d5079caa28d6862cbd13b9 (patch)
treec40e4f638deaec2b2215ec95560579593e4c3180 /nova/flags.py
parent68e9a9e351e5b7bc91148a939d470ba04a525020 (diff)
Allow connecting to a ssl-based glance
This introduces a new glance_api_insecure setting that can be used to not verify the certificate of the glance server against the certificate authorities. Fix bug 1042081. Change-Id: I0a9f081425854e9c01e00dfd641e42276c878c67
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 08a136963..9ca1577df 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -137,8 +137,13 @@ global_opts = [
help='default glance port'),
cfg.ListOpt('glance_api_servers',
default=['$glance_host:$glance_port'],
- help='A list of the glance api servers available to nova '
+ help='A list of the glance api servers available to nova. '
+ 'Prefix with https:// for ssl-based glance api servers. '
'([hostname|ip]:port)'),
+ cfg.BoolOpt('glance_api_insecure',
+ default=False,
+ help='Allow to perform insecure SSL (https) requests to '
+ 'glance'),
cfg.IntOpt('glance_num_retries',
default=0,
help='Number retries when downloading an image from glance'),