From c5d030ead13963d1917bdfdcef4d6e78a384ae28 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 12 Sep 2019 14:22:39 +0300 Subject: [PATCH] Allow horizon to be tested on metal As horizon now can be configured to bind on specific IP and we don't have haproxy on metal for now it's safe to run metal jobs for it. Change-Id: I980c3ea822bf7e9e4599e244b8fc5f3940390fc1 Needed-By: https://review.opendev.org/681718 --- tests/roles/bootstrap-host/tasks/check-requirements.yml | 2 -- zuul.d/playbooks/pre-gate-scenario.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index 977d82870c..cd0707c753 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -43,8 +43,6 @@ msg: "The scenario key words 'metal' and 'nspawn' are mutually exclusive." - conditional: "{{ (bootstrap_host_scenario is search('metal')) and (bootstrap_host_scenario is search('haproxy')) }}" msg: "The scenario key words 'metal' and 'haproxy' are mutually exclusive." - - conditional: "{{ (bootstrap_host_scenario is search('metal')) and (bootstrap_host_scenario is search('horizon')) }}" - msg: "The scenario key words 'metal' and 'horizon' are mutually exclusive." - name: Identify the space available in / # NOTE(hwoarang): df does not work reliably on btrfs filesystems diff --git a/zuul.d/playbooks/pre-gate-scenario.yml b/zuul.d/playbooks/pre-gate-scenario.yml index 5580e54ce7..c220cdec42 100644 --- a/zuul.d/playbooks/pre-gate-scenario.yml +++ b/zuul.d/playbooks/pre-gate-scenario.yml @@ -20,7 +20,6 @@ aodh: telemetry ceilometer: telemetry gnocchi: telemetry - horizon: lxc install_methods: - distro - source