Synchronise with kayobe @ bb22c94067b281ceec362061dd72c20d18342ab5

This commit is contained in:
Mark Goddard 2017-12-01 12:03:23 +00:00
parent cec52ed9d8
commit 663bf95e4c
2 changed files with 10 additions and 4 deletions

View File

@ -28,7 +28,10 @@
# Which MAC addresses to add as ports during introspection. One of 'all', # Which MAC addresses to add as ports during introspection. One of 'all',
# 'active' or 'pxe'. # 'active' or 'pxe'.
#inspector_port_addition: #inspector_add_ports:
# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
#inspector_keep_ports:
# Whether to enable discovery of nodes not managed by Ironic. # Whether to enable discovery of nodes not managed by Ironic.
#inspector_enable_discovery: #inspector_enable_discovery:

View File

@ -23,9 +23,12 @@
# Name of the network used to expose the internal OpenStack API endpoints. # Name of the network used to expose the internal OpenStack API endpoints.
#internal_net_name: #internal_net_name:
# Name of the network used to expose the external OpenStack API endpoints and # List of names of networks used to provide external network access via
# to provide external network access via Neutron. # Neutron.
#external_net_name: # Deprecated name: external_net_name
# If external_net_name is defined, external_net_names will default to a list
# containing one item, external_net_name.
#external_net_names:
# Name of the network used to expose the public OpenStack API endpoints. # Name of the network used to expose the public OpenStack API endpoints.
#public_net_name: #public_net_name: