openstack/deb-murano
Code Issues Proposed changes

Set the port to use oslo_config PortOpt

Browse Source 
Since oslo_config has already supported PortOpt,
let's use the new type for port options.

And add help for file_server.

Change-Id: Id03c33e6200fe8bddce2e754df35e74e82e60b1e
Depends-On: Ida294b05a85f5bef587b761fcd03c28c7a3474d8
Closes-Bug: #1508792
This commit is contained in:
zhu.rong 2015-10-22 14:15:48 +08:00
parent 93db3555ca
commit c4d07caf2f
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
murano/common/config.py
View File

@ -14,14 +14,11 @@
# under the License.
from oslo_config import cfg
from oslo_config import types
from oslo_log import log as logging
from murano.common.i18n import _
from murano import version
portType = types.Integer(1, 65535)
paste_deploy_opts = [
cfg.StrOpt('flavor', help='Paste flavor'),
cfg.StrOpt('config_file', help='Path to Paste config file'),
@ -30,10 +27,9 @@ paste_deploy_opts = [
bind_opts = [
cfg.StrOpt('bind-host', default='0.0.0.0',
help='Address to bind the Murano API server to.'),
cfg.Opt('bind-port',
type=portType,
default=8082,
help='Port the bind the Murano API server to.'),
cfg.PortOpt('bind-port',
default=8082,
help='Port the bind the Murano API server to.'),
]
rabbit_opts = [
@ -41,10 +37,9 @@ rabbit_opts = [
help='The RabbitMQ broker address which used for communication '
'with Murano guest agents.'),
cfg.Opt('port',
type=portType,
default=5672,
help='The RabbitMQ broker port.'),
cfg.PortOpt('port',
default=5672,
help='The RabbitMQ broker port.'),
cfg.StrOpt('login', default='guest',
help='The RabbitMQ login.'),
@ -261,7 +256,8 @@ glance_opts = [
]
file_server = [
cfg.StrOpt('file_server', default='')
cfg.StrOpt('file_server', default='',
help='Set a file server.')
]
CONF = cfg.CONF