From ffeea8b7aff158a65b5f8c7baf445c6f2206790f Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 30 Nov 2016 15:37:12 -0500 Subject: Fixes using single network (previously called flat) for deploy Also contains various network parsing fixes. JIRA: APEX-361 Change-Id: I5e40ed67267d5ded85adc2982a8726ebbceaeae5 Signed-off-by: Tim Rozet --- config/network/network_settings.yaml | 2 ++ config/network/network_settings_v6.yaml | 2 ++ config/network/network_settings_vlans.yaml | 2 ++ 3 files changed, 6 insertions(+) (limited to 'config') diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index c052a438..1cba64bb 100644 --- a/config/network/network_settings.yaml +++ b/config/network/network_settings.yaml @@ -215,3 +215,5 @@ apex: introspection_range: - 192.0.2.100 - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or overcloud_ip_range. + # If the external network 'public' is disabled, then this range will be re-used to configure the floating ip range + # for the overcloud default external network diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml index 6b1dd5de..54c4113f 100644 --- a/config/network/network_settings_v6.yaml +++ b/config/network/network_settings_v6.yaml @@ -178,3 +178,5 @@ apex: introspection_range: - 192.0.2.100 - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or overcloud_ip_range. + # If the external network 'public' is disabled, then this range will be re-used to configure the floating ip range + # for the overcloud default external network diff --git a/config/network/network_settings_vlans.yaml b/config/network/network_settings_vlans.yaml index 4e3da2f4..d892289f 100644 --- a/config/network/network_settings_vlans.yaml +++ b/config/network/network_settings_vlans.yaml @@ -215,3 +215,5 @@ apex: introspection_range: - 192.0.2.100 - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or overcloud_ip_range. + # If the external network 'public' is disabled, then this range will be re-used to configure the floating ip range + # for the overcloud default external network -- cgit 1.2.3-korg