From 818df7b1a836a5532483f4edb7dfbb92ad4f7302 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 10 Jul 2024 08:37:31 +0100 Subject: [PATCH] Update format of install_defaults In order to respect group_vars install_defaults role moved vars definition from inlcude_vars to the role defaults. With that now we need to provide correct path to the defaults during the role import. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/923390 Change-Id: I23ad7c955e2d0e267ea6c1aeb50f6be24c515b69 --- mcapi_vexxhost/playbooks/functional_test.yml | 4 +++- mcapi_vexxhost/playbooks/mcapi_proxy.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mcapi_vexxhost/playbooks/functional_test.yml b/mcapi_vexxhost/playbooks/functional_test.yml index 801a6851..5fd0afa6 100644 --- a/mcapi_vexxhost/playbooks/functional_test.yml +++ b/mcapi_vexxhost/playbooks/functional_test.yml @@ -96,8 +96,10 @@ tasks: - name: Setup installation variables - import_role: + include_role: name: openstack.osa.install_defaults + defaults_from: "{{ install_method }}" + public: true - name: Create public network and subnet include_role: diff --git a/mcapi_vexxhost/playbooks/mcapi_proxy.yml b/mcapi_vexxhost/playbooks/mcapi_proxy.yml index 5ff941f0..a160de5d 100644 --- a/mcapi_vexxhost/playbooks/mcapi_proxy.yml +++ b/mcapi_vexxhost/playbooks/mcapi_proxy.yml @@ -46,8 +46,10 @@ - always - name: Setup installation variables - import_role: + include_role: name: openstack.osa.install_defaults + defaults_from: "{{ install_method }}" + public: true - name: Install proxy service include_role: