From ebcfc0d0a4777d1e3f14f531a39af284e689e5d2 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 10 Aug 2017 20:16:06 -0500 Subject: [PATCH] General improvements Adding more dynamic user config options. Change-Id: I6f30ea38e3680ffa2ef1a77eadc91cfa9d946971 Signed-off-by: Kevin Carter --- multi-node-aio/playbooks/inventory | 3 +++ multi-node-aio/playbooks/osa/openstack_user_config.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/multi-node-aio/playbooks/inventory b/multi-node-aio/playbooks/inventory index 0daf599e..52bbb704 100644 --- a/multi-node-aio/playbooks/inventory +++ b/multi-node-aio/playbooks/inventory @@ -68,6 +68,9 @@ swift3 [deploy_hosts] infra1 +[loadbalancer_hosts] +loadbalancer1 + ############################### OSA MNAIO HOSTS ############################### # The group "swift_hosts" is used in the MNAIO setup to create the basic drive diff --git a/multi-node-aio/playbooks/osa/openstack_user_config.yml b/multi-node-aio/playbooks/osa/openstack_user_config.yml index 2aeedb38..bb06060b 100644 --- a/multi-node-aio/playbooks/osa/openstack_user_config.yml +++ b/multi-node-aio/playbooks/osa/openstack_user_config.yml @@ -12,8 +12,8 @@ used_ips: - "10.0.248.0,10.0.248.200" global_overrides: - internal_lb_vip_address: "10.0.236.150" - external_lb_vip_address: "10.0.2.150" + internal_lb_vip_address: "{{ external_lb_vip_address | default(hostvars[groups['loadbalancer_hosts'][0]]['server_networks']['mgmt']['address'].split('/')[0]) }}" + external_lb_vip_address: "{{ external_lb_vip_address | default(hostvars[groups['loadbalancer_hosts'][0]]['ansible_host'].split('/')[0]) }}" tunnel_bridge: "br-vxlan" management_bridge: "br-mgmt" provider_networks: