From d03172602d0d07208319b00767a5be266991339f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Fri, 26 Jul 2019 19:30:36 +0200 Subject: [PATCH] CI: Fix multinode job glance issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This actually replaces two ad-hoc fixes with a more unified solution (with comment for posterity). Change-Id: I62f57cb489c900f68a0c7aeb3e20e4715c0e2661 Signed-off-by: Radosław Piliszek --- tests/templates/globals-default.j2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index fc40b8fa25..0512aee92d 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -51,12 +51,17 @@ 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" %} enable_cinder: "yes" enable_cinder_backend_lvm: "yes" -glance_api_hosts: ["{{ inventory_hostname }}"] {% endif %} {% if scenario == "zun" %} @@ -67,7 +72,6 @@ docker_custom_option: " -H unix:///var/run/docker.sock -H tcp://{{ api_interface {% endif %} {% if scenario == "scenario_nfv" %} -glance_api_hosts: ["{{ inventory_hostname }}"] enable_tacker: "yes" enable_neutron_sfc: "yes" enable_mistral: "yes"