← Back to branch summary

~ubuntu-branches/ubuntu/trusty/heat/trusty

« back to all changes in this revision

Viewing changes to heat/common/config.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2013-09-08 21:51:19 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20130908215119-r939tu4aumqgdrkx
Tags: 2013.2~b3-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/control: Add python-netaddr as build-dep.
* debian/heat-common.install: Remove heat-boto and associated man-page
* debian/heat-common.install: Remove heat-cfn and associated man-page
* debian/heat-common.install: Remove heat-watch and associated man-page
* debian/patches/fix-sqlalchemy-0.8.patch: Dropped

[ Adam Gandelman ]
* debian/patches/default-kombu.patch: Dropped.
* debian/patches/default-sqlite.patch: Refreshed.
* debian/*.install, rules: Install heat.conf.sample as common
  config file in heat-common. Drop other per-package configs, they
  are no longer used.
* debian/rules: Clean pbr .egg from build dir if it exists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/common/config.py
26
26
 
27
27
from heat.common import wsgi
28
28
 
29
 
from heat.openstack.common.gettextutils import _
30
29
from heat.openstack.common import log as logging
31
30
from heat.openstack.common import rpc
32
31
 
41
40
 
42
41
 
43
42
service_opts = [
44
 
    cfg.IntOpt('report_interval',
45
 
               default=10,
46
 
               help='seconds between nodes reporting state to datastore'),
47
43
    cfg.IntOpt('periodic_interval',
48
44
               default=60,
49
45
               help='seconds between running periodic tasks'),
50
 
    cfg.StrOpt('ec2_listen',
51
 
               default="0.0.0.0",
52
 
               help='IP address for EC2 API to listen'),
53
 
    cfg.IntOpt('ec2_listen_port',
54
 
               default=8773,
55
 
               help='port for ec2 api to listen'),
56
 
    cfg.StrOpt('osapi_compute_listen',
57
 
               default="0.0.0.0",
58
 
               help='IP address for OpenStack API to listen'),
59
 
    cfg.IntOpt('osapi_compute_listen_port',
60
 
               default=8774,
61
 
               help='list port for osapi compute'),
62
 
    cfg.StrOpt('osapi_volume_listen',
63
 
               default="0.0.0.0",
64
 
               help='IP address for OpenStack Volume API to listen'),
65
 
    cfg.IntOpt('osapi_volume_listen_port',
66
 
               default=8776,
67
 
               help='port for os volume api to listen'),
68
46
    cfg.StrOpt('heat_metadata_server_url',
69
47
               default="",
70
48
               help='URL of the Heat metadata server'),
82
60
               help='Instance connection to cfn/cw API validate certs if ssl'),
83
61
    cfg.StrOpt('heat_stack_user_role',
84
62
               default="heat_stack_user",
85
 
               help='Keystone role for heat template-defined users')]
 
63
               help='Keystone role for heat template-defined users'),
 
64
    cfg.IntOpt('max_template_size',
 
65
               default=524288,
 
66
               help='Maximum raw byte size of any template.'),
 
67
    cfg.IntOpt('max_nested_stack_depth',
 
68
               default=3,
 
69
               help='Maximum depth allowed when using nested stacks.')]
86
70
 
87
71
db_opts = [
88
72
    cfg.StrOpt('sql_connection',
102
86
               help='Driver to use for controlling instances'),
103
87
    cfg.ListOpt('plugin_dirs',
104
88
                default=['/usr/lib64/heat', '/usr/lib/heat'],
105
 
                help='List of directories to search for Plugins')]
 
89
                help='List of directories to search for Plugins'),
 
90
    cfg.StrOpt('environment_dir',
 
91
               default='/etc/heat/environment.d',
 
92
               help='The directory to search for environment files'),
 
93
    cfg.StrOpt('deferred_auth_method',
 
94
               choices=['password', 'trusts'],
 
95
               default='password',
 
96
               help=_('Select deferred auth method, '
 
97
                      'stored password or trusts')),
 
98
    cfg.ListOpt('trusts_delegated_roles',
 
99
                default=['heat_stack_owner'],
 
100
                help=_('Subset of trustor roles to be delegated to heat'))]
 
101
 
106
102
 
107
103
rpc_opts = [
108
104
    cfg.StrOpt('host',
111
107
                    'This can be an opaque identifier.'
112
108
                    'It is not necessarily a hostname, FQDN, or IP address.')]
113
109
 
 
110
auth_password_group = cfg.OptGroup('auth_password')
 
111
auth_password_opts = [
 
112
    cfg.BoolOpt('multi_cloud',
 
113
                default=False,
 
114
                help=_('Allow orchestration of multiple clouds')),
 
115
    cfg.ListOpt('allowed_auth_uris',
 
116
                default=[],
 
117
                help=_('Allowed keystone endpoints for auth_uri when '
 
118
                       'multi_cloud is enabled. At least one endpoint needs '
 
119
                       'to be specified.'))]
 
120
 
114
121
cfg.CONF.register_opts(db_opts)
115
122
cfg.CONF.register_opts(engine_opts)
116
123
cfg.CONF.register_opts(service_opts)
117
124
cfg.CONF.register_opts(rpc_opts)
118
125
cfg.CONF.register_group(paste_deploy_group)
119
126
cfg.CONF.register_opts(paste_deploy_opts, group=paste_deploy_group)
 
127
cfg.CONF.register_group(auth_password_group)
 
128
cfg.CONF.register_opts(auth_password_opts, group=auth_password_group)
120
129
 
121
130
 
122
131
def rpc_set_default():