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
This commit is contained in:
Jesse Pretorius 2018-10-23 16:56:25 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 19edaabf87
commit 1f54688f4c
2 changed files with 7 additions and 0 deletions

View File

@ -156,6 +156,7 @@ osa_enable_dashboard: true
osa_enable_network: true osa_enable_network: true
osa_enable_meter: false osa_enable_meter: false
osa_enable_object_storage: true 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_disable_serial: false
osa_enable_elk_metrics: false osa_enable_elk_metrics: false
osa_enable_os_profiler: false osa_enable_os_profiler: false

View File

@ -192,6 +192,12 @@ haproxy_hosts: *loadbalancer_block
### OpenStack ### 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 %} {% if osa_enable_identity | bool %}
# keystone # keystone
identity_hosts: *infra_block identity_hosts: *infra_block