Merge "Allow connecting to a ssl-based glance"

2012-08-28 01:53:23 +00:00
parent f3337d3935 12ac9f8c2a
commit 030b17350c
1 changed files with 6 additions and 1 deletions
--- 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'),