From 4955a9c020855f74ab1a5e30d941c46f717485bc Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Wed, 20 May 2020 10:09:36 +0800
Subject: [PATCH] Use api_interface as migration_interface default value
normally, api_interface is treated as internal and security network plane,
use it as default migration_interface is more meaningful.
Change-Id: Ib9f4bcc19147a49dc09bd905dcd06be165a91b5e
---
ansible/group_vars/all.yml | 4 ++--
etc/kolla/globals.yml | 2 +-
...change-default-migration-interface-3cdf30eed98553fd.yaml | 6 ++++++
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 releasenotes/notes/change-default-migration-interface-3cdf30eed98553fd.yaml
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index b4ef05a7a8..15402a3675 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -199,7 +199,7 @@ storage_interface: "{{ network_interface }}"
cluster_interface: "{{ network_interface }}"
swift_storage_interface: "{{ storage_interface }}"
swift_replication_interface: "{{ swift_storage_interface }}"
-migration_interface: "{{ network_interface }}"
+migration_interface: "{{ api_interface }}"
tunnel_interface: "{{ network_interface }}"
octavia_network_interface: "{{ api_interface }}"
bifrost_network_interface: "{{ network_interface }}"
@@ -213,7 +213,7 @@ storage_address_family: "{{ network_address_family }}"
cluster_address_family: "{{ network_address_family }}"
swift_storage_address_family: "{{ 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 }}"
octavia_network_address_family: "{{ api_address_family }}"
bifrost_network_address_family: "{{ network_address_family }}"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index e79c03cce4..e4b9fb50ed 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -119,7 +119,7 @@
#cluster_address_family: "{{ network_address_family }}"
#swift_storage_address_family: "{{ 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 }}"
#octavia_network_address_family: "{{ api_address_family }}"
#bifrost_network_address_family: "{{ network_address_family }}"
diff --git a/releasenotes/notes/change-default-migration-interface-3cdf30eed98553fd.yaml b/releasenotes/notes/change-default-migration-interface-3cdf30eed98553fd.yaml
new file mode 100644
index 0000000000..c85dc373d7
--- /dev/null
+++ b/releasenotes/notes/change-default-migration-interface-3cdf30eed98553fd.yaml
@@ -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.