From 87f680772ac1e95fcb57f7e5d9d4d39e4f71bcd4 Mon Sep 17 00:00:00 2001 From: Pablo Rodriguez Nava Date: Mon, 21 Oct 2024 16:12:06 +0200 Subject: [PATCH] [ci_nmstate] Conditionally call ci_nmstate --- playbooks/02-infra.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/playbooks/02-infra.yml b/playbooks/02-infra.yml index 7c8d637be7..735c23d181 100644 --- a/playbooks/02-infra.yml +++ b/playbooks/02-infra.yml @@ -32,6 +32,13 @@ ansible.builtin.include_vars: dir: "{{ cifmw_basedir }}/artifacts/parameters" + - name: Load Networking Environment Definition + vars: + cifmw_networking_mapper_assert_env_load: false + ansible.builtin.import_role: + name: networking_mapper + tasks_from: load_env_definition.yml + - name: Deploy OCP using Hive when: - cifmw_use_hive is defined @@ -86,6 +93,13 @@ ansible.builtin.include_role: name: cert_manager + - name: Configure hosts networking using nmstate + when: + - cifmw_config_nmstate is defined + - cifmw_config_nmstate | bool + ansible.builtin.include_role: + name: ci_nmstate + - name: Deploy Sushy Emulator and configure controller as hypervisor when: - cifmw_enable_virtual_baremetal_support | default(false) | bool @@ -102,13 +116,6 @@ ansible.builtin.include_role: name: libvirt_manager - - name: Configure hosts networking using nmstate - when: - - cifmw_config_nmstate is defined - - cifmw_config_nmstate | bool - ansible.builtin.include_role: - name: ci_nmstate - - name: Prepare container package builder when: - cifmw_pkg_build_list is defined