openstack/nova
Code Issues Proposed changes

conf: Fix indentation in conf/netconf

Browse Source 
I want to be able to copy-paste the same nova-net deprecation snippet to
relevant config opts. Also, conf options are mostly all written this
way.

Change-Id: I16e806ad24b2c2c1b3e4b28f3ea27c63f1a817db
Implements: blueprint centralize-config-options-pike
TrivialFix
This commit is contained in:
Stephen Finucane 2017-02-07 15:41:47 +00:00
parent 83df38ef4a
commit eb10dcf52d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nova/conf/netconf.py
View File

@ -23,8 +23,8 @@ from oslo_utils import netutils
netconf_opts = [
cfg.StrOpt("my_ip",
default=netutils.get_my_ipv4(),
help="""
default=netutils.get_my_ipv4(),
help="""
The IP address which the host is using to connect to the management network.
Possible values:
@ -39,8 +39,8 @@ Related options:
* vpn_ip
"""),
cfg.StrOpt("my_block_storage_ip",
default="$my_ip",
help="""
default="$my_ip",
help="""
The IP address which is used to connect to the block storage network.
Possible values:
@ -52,8 +52,8 @@ Related options:
* my_ip - if my_block_storage_ip is not set, then my_ip value is used.
"""),
cfg.StrOpt("host",
default=socket.gethostname(),
help="""
default=socket.gethostname(),
help="""
Hostname, FQDN or IP address of this host. Must be valid within AMQP key.
Possible values:
@ -61,8 +61,8 @@ Possible values:
* String with hostname, FQDN or IP address. Default is hostname of this host.
"""),
cfg.BoolOpt("use_ipv6",
default=False,
help="""
default=False,
help="""
Assign IPv6 and IPv4 addresses when creating instances.
Related options: