From 574e550a11b6fa5d5b0fa98c523cf2301bdf141f Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Thu, 28 Mar 2019 21:30:37 -0400 Subject: [PATCH] swift: move to br-storage always We added changes to gating config to use different config if we have nspawn however it is non-functional and causing issues for the metal builds. Let's restore the value to br-storage always until we resolve these issues. Change-Id: Ibffc81eeaa93d852e86ebe35afeae3c5a38dc43a --- etc/openstack_deploy/conf.d/swift.yml.aio | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/openstack_deploy/conf.d/swift.yml.aio b/etc/openstack_deploy/conf.d/swift.yml.aio index 2fcb8ec583..f910d66caf 100644 --- a/etc/openstack_deploy/conf.d/swift.yml.aio +++ b/etc/openstack_deploy/conf.d/swift.yml.aio @@ -2,8 +2,8 @@ global_overrides: swift: part_power: 8 - storage_network: "{{ (container_tech != 'nspawn') | ternary('br-storage', ansible_default_ipv4['alias']) }}" - replication_network: "{{ (container_tech != 'nspawn') | ternary('br-storage', ansible_default_ipv4['alias']) }}" + storage_network: br-storage + replication_network: br-storage drives: - name: swift1.img - name: swift2.img