Merge "Drop example in config file comments"

This commit is contained in:
Zuul 2018-07-03 09:54:23 +00:00 committed by Gerrit Code Review
commit 0bec74fcfc
2 changed files with 8 additions and 36 deletions

View File

@ -180,23 +180,10 @@ _opts = [
'For each network a section/group needs to be added to '
'the configuration file with these parameters set: '
'cidr, dhcp_start, dhcp_end, inspection_iprange, '
'gateway and masquerade.'
'\n\n'
'Example:\n\n'
'subnets = subnet1,subnet2\n'
'\n'
'An example section/group in config file:\n'
'\n'
'[subnet1]\n'
'cidr = 192.168.10.0/24\n'
'dhcp_start = 192.168.10.100\n'
'dhcp_end = 192.168.10.200\n'
'inspection_iprange = 192.168.10.20,192.168.10.90\n'
'gateway = 192.168.10.254\n'
'masquerade = True'
'\n'
'[subnet2]\n'
'. . .\n')),
'gateway and masquerade. Note: The section/group must '
'be placed before or after any other section. (See '
'the example section [ctlplane-subnet] in the sample '
'configuration file.)')),
cfg.StrOpt('local_subnet',
default=SUBNETS_DEFAULT[0],
help=('Name of the local subnet, where the PXE boot and DHCP '

View File

@ -43,24 +43,9 @@
# Comma separated list of names/tags. For each network a section/group
# needs to be added to the configuration file with these parameters
# set: cidr, dhcp_start, dhcp_end, inspection_iprange, gateway and
# masquerade.
#
# Example:
#
# subnets = subnet1,subnet2
#
# An example section/group in config file:
#
# [subnet1]
# cidr = 192.168.10.0/24
# dhcp_start = 192.168.10.100
# dhcp_end = 192.168.10.200
# inspection_iprange = 192.168.10.20,192.168.10.90
# gateway = 192.168.10.254
# masquerade = True
# [subnet2]
# . . .
# (list value)
# masquerade. Note: The section/group must be placed before or after
# any other section. (See the example section [ctlplane-subnet] in the
# sample configuration file.) (list value)
#subnets = ctlplane-subnet
# Name of the local subnet, where the PXE boot and DHCP interfaces for
@ -188,7 +173,7 @@
#enable_container_images_build = true
# Array of host/port combiniations of docker insecure registries.
# (string value)
# (list value)
#docker_insecure_registries =
# One Time Password to register Undercloud node with an IPA server.