From 1f54688f4c2e1a0a3fd3d0709bf5564ff52873a3 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 23 Oct 2018 16:56:25 +0100 Subject: [PATCH] MNAIO: Add legacy os-infra_hosts group back In https://review.openstack.org/611582 we removed the legacy group as it has been deprecated since Newton, however it appears to still be used by some downstream tests, so we add it back, but make it only get implemented if the associated services are enabled. Change-Id: I477a46d606d75d44a1ecd5bcfcb29c8308c65245 --- multi-node-aio/playbooks/group_vars/all.yml | 1 + multi-node-aio/playbooks/osa/openstack_user_config.yml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/multi-node-aio/playbooks/group_vars/all.yml b/multi-node-aio/playbooks/group_vars/all.yml index 682db7a8..8849355c 100644 --- a/multi-node-aio/playbooks/group_vars/all.yml +++ b/multi-node-aio/playbooks/group_vars/all.yml @@ -156,6 +156,7 @@ osa_enable_dashboard: true osa_enable_network: true osa_enable_meter: false osa_enable_object_storage: true +osa_enable_legacy_os_infra: "{{ (osa_enable_image | bool) and (osa_enable_orchestration | bool) and (osa_enable_dashboard | bool) and (osa_enable_compute | bool) }}" osa_disable_serial: false osa_enable_elk_metrics: false osa_enable_os_profiler: false diff --git a/multi-node-aio/playbooks/osa/openstack_user_config.yml b/multi-node-aio/playbooks/osa/openstack_user_config.yml index 6c21c2e3..2700573f 100644 --- a/multi-node-aio/playbooks/osa/openstack_user_config.yml +++ b/multi-node-aio/playbooks/osa/openstack_user_config.yml @@ -192,6 +192,12 @@ haproxy_hosts: *loadbalancer_block ### OpenStack ### +{% if osa_enable_legacy_os_infra | bool %} +# Legacy infra group +# Contains glance, heat, horizon, nova +os-infra_hosts: *infra_block +{% endif %} + {% if osa_enable_identity | bool %} # keystone identity_hosts: *infra_block