diff --git a/roles/adoption_osp_deploy/molecule/default/converge.yml b/roles/adoption_osp_deploy/molecule/default/converge.yml index 7e33851b40..9e88ebe7d3 100644 --- a/roles/adoption_osp_deploy/molecule/default/converge.yml +++ b/roles/adoption_osp_deploy/molecule/default/converge.yml @@ -12,7 +12,6 @@ cifmw_adoption_osp_deploy_repos: [] cifmw_adoption_source_scenario_path: "." cifmw_basedir: "{{ playbook_dir }}" - ansible_user_dir: "{{ lookup('env', 'HOME') }}" tasks: - name: Gather stack nodes and facts diff --git a/roles/compliance/molecule/default/converge.yml b/roles/compliance/molecule/default/converge.yml index 31b95ac11b..b4e0253585 100644 --- a/roles/compliance/molecule/default/converge.yml +++ b/roles/compliance/molecule/default/converge.yml @@ -18,7 +18,6 @@ - name: Converge test of controller tasks hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_compliance_dry_run: true roles: - role: "compliance" @@ -26,7 +25,6 @@ - name: Converge test of compute tasks hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_compliance_dry_run: true roles: - role: "compliance" diff --git a/roles/nat64_appliance/molecule/default/cleanup.yml b/roles/nat64_appliance/molecule/default/cleanup.yml index 395b8b1fda..28d4a5a528 100644 --- a/roles/nat64_appliance/molecule/default/cleanup.yml +++ b/roles/nat64_appliance/molecule/default/cleanup.yml @@ -1,7 +1,5 @@ - name: Cleanup hosts: instance - vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" tasks: - name: "Destroy the test-node" community.libvirt.virt: diff --git a/roles/nat64_appliance/molecule/default/converge.yml b/roles/nat64_appliance/molecule/default/converge.yml index c321d6d1c2..8421a4c576 100644 --- a/roles/nat64_appliance/molecule/default/converge.yml +++ b/roles/nat64_appliance/molecule/default/converge.yml @@ -17,7 +17,6 @@ - name: Converge hosts: instance vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data" tasks: - name: Crate SSH keypair diff --git a/roles/nat64_appliance/molecule/default/prepare.yml b/roles/nat64_appliance/molecule/default/prepare.yml index 99ae481dd7..83d82c7989 100644 --- a/roles/nat64_appliance/molecule/default/prepare.yml +++ b/roles/nat64_appliance/molecule/default/prepare.yml @@ -17,7 +17,6 @@ - name: Prepare hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data" pre_tasks: - name: Create custom basedir diff --git a/roles/shiftstack/molecule/default/cleanup.yml b/roles/shiftstack/molecule/default/cleanup.yml index e53697447f..27d3f74744 100644 --- a/roles/shiftstack/molecule/default/cleanup.yml +++ b/roles/shiftstack/molecule/default/cleanup.yml @@ -17,7 +17,6 @@ - name: Cleanup hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}" cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" openstack_namespace_name: openstack diff --git a/roles/shiftstack/molecule/default/converge.yml b/roles/shiftstack/molecule/default/converge.yml index fb30de5414..aaaac4a037 100644 --- a/roles/shiftstack/molecule/default/converge.yml +++ b/roles/shiftstack/molecule/default/converge.yml @@ -18,7 +18,6 @@ - name: Converge hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}" cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" cifmw_shiftstack_run_playbook: cifmw-gate.yaml diff --git a/roles/shiftstack/molecule/default/prepare.yml b/roles/shiftstack/molecule/default/prepare.yml index 531e0efe44..889aa9f6f5 100644 --- a/roles/shiftstack/molecule/default/prepare.yml +++ b/roles/shiftstack/molecule/default/prepare.yml @@ -18,7 +18,6 @@ - name: Prepare hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}" cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" openstack_namespace_name: openstack diff --git a/roles/tempest/molecule/default/converge.yml b/roles/tempest/molecule/default/converge.yml index d14ceb88eb..338a069ad9 100644 --- a/roles/tempest/molecule/default/converge.yml +++ b/roles/tempest/molecule/default/converge.yml @@ -18,7 +18,6 @@ - name: Converge hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_tempest_dry_run: true roles: - role: "tempest" diff --git a/roles/tempest/molecule/default/prepare.yml b/roles/tempest/molecule/default/prepare.yml index 810486ac1a..0c6d526931 100644 --- a/roles/tempest/molecule/default/prepare.yml +++ b/roles/tempest/molecule/default/prepare.yml @@ -18,7 +18,6 @@ - name: Prepare hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data" cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks" cifmw_install_yamls_defaults: diff --git a/roles/test_operator/molecule/default/converge.yml b/roles/test_operator/molecule/default/converge.yml index a90f6c812d..85508e5a92 100644 --- a/roles/test_operator/molecule/default/converge.yml +++ b/roles/test_operator/molecule/default/converge.yml @@ -18,7 +18,6 @@ - name: Converge hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_test_operator_dry_run: true roles: - role: "test_operator" diff --git a/roles/test_operator/molecule/default/prepare.yml b/roles/test_operator/molecule/default/prepare.yml index a90f6c812d..85508e5a92 100644 --- a/roles/test_operator/molecule/default/prepare.yml +++ b/roles/test_operator/molecule/default/prepare.yml @@ -18,7 +18,6 @@ - name: Converge hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_test_operator_dry_run: true roles: - role: "test_operator" diff --git a/roles/tofu/molecule/default/prepare.yml b/roles/tofu/molecule/default/prepare.yml index d6287b5be6..822af8b1e9 100644 --- a/roles/tofu/molecule/default/prepare.yml +++ b/roles/tofu/molecule/default/prepare.yml @@ -18,7 +18,6 @@ - name: Prepare hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data" cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks" cifmw_install_yamls_defaults: diff --git a/roles/update/molecule/default/converge.yml b/roles/update/molecule/default/converge.yml index d5482b8bb8..fb4aae26d1 100644 --- a/roles/update/molecule/default/converge.yml +++ b/roles/update/molecule/default/converge.yml @@ -18,9 +18,8 @@ - name: Converge hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_update_run_dryrun: true - cifmw_openshift_kubeconfig: "{{ lookup('env', 'HOME') }}/.crc/machines/crc/kubeconfig" + cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" cifmw_nolog: false tasks: - name: Initialize monitoring diff --git a/roles/update/molecule/default/prepare.yml b/roles/update/molecule/default/prepare.yml index 15e5eefb1b..5a145c1b3d 100644 --- a/roles/update/molecule/default/prepare.yml +++ b/roles/update/molecule/default/prepare.yml @@ -18,7 +18,6 @@ - name: Prepare hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks" cifmw_install_yamls_defaults: NAMESPACE: openstack