← Back to branch summary

~ubuntu-branches/ubuntu/vivid/openstack-trove/vivid

« back to all changes in this revision

Viewing changes to trove/common/cfg.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Chuck Short, Corey Bryant
  • Date: 2015-01-06 13:39:46 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20150106133946-fqecrqyhzcw5nj0i
Tags: 2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open up for vivid.
* debian/control: Update bzr branches. 

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
  - d/p/fix-requirements: Align requirements with Ubuntu.
* d/control: Bumped Standards-Version to 3.9.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
trove/common/cfg.py
62
62
    cfg.StrOpt('nova_compute_url', help='URL without the tenant segment.'),
63
63
    cfg.StrOpt('nova_compute_service_type', default='compute',
64
64
               help='Service type to use when searching catalog.'),
 
65
    cfg.StrOpt('nova_compute_endpoint_type', default='publicURL',
 
66
               help='Service endpoint type to use when searching catalog.'),
65
67
    cfg.StrOpt('neutron_url', help='URL without the tenant segment.'),
66
68
    cfg.StrOpt('neutron_service_type', default='network',
67
69
               help='Service type to use when searching catalog.'),
 
70
    cfg.StrOpt('neutron_endpoint_type', default='publicURL',
 
71
               help='Service endpoint type to use when searching catalog.'),
68
72
    cfg.StrOpt('cinder_url', help='URL without the tenant segment.'),
69
73
    cfg.StrOpt('cinder_service_type', default='volumev2',
70
74
               help='Service type to use when searching catalog.'),
 
75
    cfg.StrOpt('cinder_endpoint_type', default='publicURL',
 
76
               help='Service endpoint type to use when searching catalog.'),
71
77
    cfg.StrOpt('heat_url', help='URL without the tenant segment.'),
72
78
    cfg.StrOpt('heat_service_type', default='orchestration',
73
79
               help='Service type to use when searching catalog.'),
 
80
    cfg.StrOpt('heat_endpoint_type', default='publicURL',
 
81
               help='Service endpoint type to use when searching catalog.'),
74
82
    cfg.StrOpt('swift_url', help='URL ending in AUTH_.'),
75
83
    cfg.StrOpt('swift_service_type', default='object-store',
76
84
               help='Service type to use when searching catalog.'),
 
85
    cfg.StrOpt('swift_endpoint_type', default='publicURL',
 
86
               help='Service endpoint type to use when searching catalog.'),
77
87
    cfg.StrOpt('trove_auth_url', default='http://0.0.0.0:5000/v2.0',
78
88
               help='Trove authentication URL.'),
79
89
    cfg.StrOpt('host', default='0.0.0.0',