From 05ae35bf6c06aceb6a4394152a48b333cbb44f13 Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Fri, 13 Dec 2019 17:27:35 +0000 Subject: [PATCH] Support customising nova-conductor and proxy groups for cells Change-Id: Ife90d839a5184a3b692c49e0411cd1ac6467f25a Story: 2004291 Task: 37804 --- .../templates/overcloud-services.j2 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 index 9377968f6..988f61288 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 @@ -20,19 +20,31 @@ glance nova [nova-conductor:children] +{% if 'cell-control' in kolla_overcloud_inventory_top_level_group_map %} +cell-control +{% else %} nova +{% endif %} [nova-super-conductor:children] nova [nova-novncproxy:children] +{% if 'cell-control' in kolla_overcloud_inventory_top_level_group_map %} +cell-control +{% else %} nova +{% endif %} [nova-scheduler:children] nova [nova-spicehtml5proxy:children] +{% if 'cell-control' in kolla_overcloud_inventory_top_level_group_map %} +cell-control +{% else %} nova +{% endif %} # NOTE: HA for nova-compute services with ironic is still an experimental # feature. Provide the option to use a single compute host, even when multiple @@ -46,7 +58,11 @@ nova {% endif %} [nova-serialproxy:children] +{% if 'cell-control' in kolla_overcloud_inventory_top_level_group_map %} +cell-control +{% else %} nova +{% endif %} # Neutron [neutron-server:children]