← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ironic/vivid-updates

« back to all changes in this revision

Viewing changes to ironic/common/image_service.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-01-05 12:21:37 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20150105122137-171bqrdpcxqipunk
Tags: 2015.1~b1-0ubuntu1
* New upstream beta release:
  - d/control: Align version requirements with upstream release.
* d/watch: Update uversionmangle to deal with kilo beta versioning
  changes.
* d/control: Bumped Standards-Version to 3.9.6, no changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ironic/common/image_service.py
30
30
               default='http',
31
31
               help='Default protocol to use when connecting to glance. '
32
32
               'Set to https for SSL.'),
33
 
    cfg.StrOpt('glance_api_servers',
34
 
               help='A list of the glance api servers available to ironic. '
35
 
               'Prefix with https:// for SSL-based glance API servers. '
36
 
               'Format is [hostname|IP]:port.'),
 
33
    cfg.ListOpt('glance_api_servers',
 
34
                help='A list of the glance api servers available to ironic. '
 
35
                'Prefix with https:// for SSL-based glance API servers. '
 
36
                'Format is [hostname|IP]:port.'),
37
37
    cfg.BoolOpt('glance_api_insecure',
38
38
                default=False,
39
39
                help='Allow to perform insecure SSL (https) requests to '