From a2159e2bb933a76d900349db82ee4e7b4ada9a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 1 Oct 2019 10:39:36 +0200 Subject: [PATCH] CI: Remove multinode non-ceph glance exception MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is not required since enabling HAProxy over VXLAN [1]. [1] https://review.opendev.org/670690 Change-Id: I239a7c60d6ae0c80640ff10209a80c7a9ca74cd6 Signed-off-by: Radosław Piliszek --- tests/templates/globals-default.j2 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 1a435795e3..1eb62f6922 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -56,12 +56,6 @@ ceph_pool_pgp_num: 8 # This is experimental feature, disable if gate fail. # In multinode jobs without ceph rolling upgrade fails. glance_enable_rolling_upgrade: "yes" -{% else %} -# NOTE(yoctozepto): in case ceph is *not* used, we have to use the ansible node (primary) -# to avoid random errors due to inventory randomness in Zuul (YAML format) -# because we use primary as the API endpoint and there is currently no HAProxy in CI -# and the default behavior is to pick the "first" node (issue affects only multinode) -glance_api_hosts: ["{{ inventory_hostname }}"] {% endif %} {% if scenario == "cinder-lvm" %}