diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-10-24 14:31:35 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-10-25 19:26:04 +0000 |
| commit | 40c3cfd7791c15f885c5df4bb81d1690120a38cf (patch) | |
| tree | 43bd47d387270e0b11c12e5e3ea5fc7ceccf0eee /config/network/network_settings_v6.yaml | |
| parent | 6a5ebb2abd246ab221c6b2d347a70127ba20a7bf (diff) | |
Clarifies ip ranges in network settings
Also includes other various fixes.
JIRA: APEX-292
Change-Id: I5e8cedce5af43544963c1e7de582e7646b1c841a
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config/network/network_settings_v6.yaml')
| -rw-r--r-- | config/network/network_settings_v6.yaml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml index dd2d066e..dc68274d 100644 --- a/config/network/network_settings_v6.yaml +++ b/config/network/network_settings_v6.yaml @@ -101,17 +101,6 @@ api_network: controller_interface: nic5 #public_network: -# enabled: true #If disabled, public_network traffic will collapse to admin network -# network_type: '' -# bridged_interface: '' -# cidr: 192.168.37.0/24 -# gateway: 192.168.37.1 -# floating_ip_range: 192.168.37.200,192.168.37.220 #Range to allocate to floating IPs for the public network with Neutron -# usable_ip_range: 192.168.37.10,192.168.37.199 #Usable IP range on the public network, usually this is a shared subnet -# provisioner_ip: 192.168.37.1 -# -#private_network: -# enabled: false #If disabled, underlay traffic will collapse to admin_network # ipv6: true #This flag is only needed if cidr is not provided, and bridged_interface # is used for address auto detection. # @@ -136,6 +125,7 @@ api_network: # #Other changes # - All IP addresses can now be IPv4 or IPv6, we will detect the correct family and configure accordingly. +# Note Admin and Private (tenant) networks must be IPV4. # Note that if any network is specified to be IPv6, we consider it a IPv6 deployment. IPv6 deployment does require additional # configurations in resulting network environment yaml, such as enabling ipv6 support for NOVA, RABBITMQ, etc. -#
\ No newline at end of file +# |