diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-12-02 22:00:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-02 22:00:51 +0000 |
| commit | 6b0166ef6e4673afee9589d6b55e94236a31a721 (patch) | |
| tree | c6b54cb72fb99a48d5078c4c699ac24b397c4642 /config | |
| parent | d9f9c45d2c2a70877a0e9dd689ddb6173501ae0d (diff) | |
| parent | ffeea8b7aff158a65b5f8c7baf445c6f2206790f (diff) | |
Merge "Fixes using single network (previously called flat) for deploy"
Diffstat (limited to 'config')
| -rw-r--r-- | config/network/network_settings.yaml | 2 | ||||
| -rw-r--r-- | config/network/network_settings_v6.yaml | 2 | ||||
| -rw-r--r-- | config/network/network_settings_vlans.yaml | 2 |
3 files changed, 6 insertions, 0 deletions
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 |