Merge "Use api_interface as migration_interface default value"

This commit is contained in:
Zuul 2020-06-04 12:11:23 +00:00 committed by Gerrit Code Review
commit cb156b9235
3 changed files with 9 additions and 3 deletions

View File

@ -199,7 +199,7 @@ storage_interface: "{{ network_interface }}"
cluster_interface: "{{ network_interface }}" cluster_interface: "{{ network_interface }}"
swift_storage_interface: "{{ storage_interface }}" swift_storage_interface: "{{ storage_interface }}"
swift_replication_interface: "{{ swift_storage_interface }}" swift_replication_interface: "{{ swift_storage_interface }}"
migration_interface: "{{ network_interface }}" migration_interface: "{{ api_interface }}"
tunnel_interface: "{{ network_interface }}" tunnel_interface: "{{ network_interface }}"
octavia_network_interface: "{{ api_interface }}" octavia_network_interface: "{{ api_interface }}"
bifrost_network_interface: "{{ network_interface }}" bifrost_network_interface: "{{ network_interface }}"
@ -213,7 +213,7 @@ storage_address_family: "{{ network_address_family }}"
cluster_address_family: "{{ network_address_family }}" cluster_address_family: "{{ network_address_family }}"
swift_storage_address_family: "{{ storage_address_family }}" swift_storage_address_family: "{{ storage_address_family }}"
swift_replication_address_family: "{{ swift_storage_address_family }}" swift_replication_address_family: "{{ swift_storage_address_family }}"
migration_address_family: "{{ network_address_family }}" migration_address_family: "{{ api_address_family }}"
tunnel_address_family: "{{ network_address_family }}" tunnel_address_family: "{{ network_address_family }}"
octavia_network_address_family: "{{ api_address_family }}" octavia_network_address_family: "{{ api_address_family }}"
bifrost_network_address_family: "{{ network_address_family }}" bifrost_network_address_family: "{{ network_address_family }}"

View File

@ -119,7 +119,7 @@
#cluster_address_family: "{{ network_address_family }}" #cluster_address_family: "{{ network_address_family }}"
#swift_storage_address_family: "{{ storage_address_family }}" #swift_storage_address_family: "{{ storage_address_family }}"
#swift_replication_address_family: "{{ swift_storage_address_family }}" #swift_replication_address_family: "{{ swift_storage_address_family }}"
#migration_address_family: "{{ network_address_family }}" #migration_address_family: "{{ api_address_family }}"
#tunnel_address_family: "{{ network_address_family }}" #tunnel_address_family: "{{ network_address_family }}"
#octavia_network_address_family: "{{ api_address_family }}" #octavia_network_address_family: "{{ api_address_family }}"
#bifrost_network_address_family: "{{ network_address_family }}" #bifrost_network_address_family: "{{ network_address_family }}"

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The default ``migration_interface`` is moved from ``network_interface`` to
``api_interface``, which is treaded as internal and security network plane
in most case.