diff --git a/playbooks/refstack-client-devstack.yaml b/playbooks/refstack-client-devstack.yaml index 710cc96..7b1b274 100644 --- a/playbooks/refstack-client-devstack.yaml +++ b/playbooks/refstack-client-devstack.yaml @@ -23,11 +23,8 @@ - name: Run ansible-role-refstack-client include_tasks: ../tasks/main.yaml vars: - refstack_client_source: "{{ zuul.projects['opendev.org/osf/refstack-client'].src_dir }}" - # the task which installs refstack-client changes dir to the refstack-client's - # location, python-tempestconf is in the same org (osf) so it's cloned - # just one level up by the zuul - tempestconf_source: "../python-tempestconf" + refstack_client_source: "/home/zuul/{{ zuul.projects['opendev.org/osf/refstack-client'].src_dir }}" + tempestconf_source: "/home/zuul/{{ zuul.projects['opendev.org/osf/python-tempestconf']. src_dir }}" source_credentials: "{{ devstack_base_dir }}/devstack/openrc demo demo" source_admin_credentials: "{{ devstack_base_dir }}/devstack/openrc admin admin" additional_tempestconf_params: "auth.tempest_roles Member object-storage.operator_role Member" diff --git a/tasks/generate-accounts.yaml b/tasks/generate-accounts.yaml index deac8a6..c926663 100644 --- a/tasks/generate-accounts.yaml +++ b/tasks/generate-accounts.yaml @@ -65,4 +65,4 @@ - name: Set path to newly generated accounts.yaml set_fact: - path_to_accounts_file: "./etc/accounts.yaml" + path_to_accounts_file: "{{ refstack_client_source }}/etc/accounts.yaml" diff --git a/tasks/generate-tempestconf.yaml b/tasks/generate-tempestconf.yaml index b080608..dca3736 100644 --- a/tasks/generate-tempestconf.yaml +++ b/tasks/generate-tempestconf.yaml @@ -23,4 +23,4 @@ - name: Set path to newly generated tempest.conf set_fact: - path_to_tempest_config: "./etc/tempest.conf" + path_to_tempest_config: "{{ refstack_client_source }}/etc/tempest.conf" diff --git a/tasks/post-tasks.yaml b/tasks/post-tasks.yaml index 766fccb..78eb376 100644 --- a/tasks/post-tasks.yaml +++ b/tasks/post-tasks.yaml @@ -69,13 +69,9 @@ src: "{{ path_to_tempest_config }}" dest: "{{ dest_dir }}/tempest.conf" flat: true - args: - chdir: "{{ refstack_client_source }}" - name: Download accounts.yaml file fetch: src: "{{ path_to_accounts_file }}" dest: "{{ dest_dir }}/accounts.yaml" flat: true - args: - chdir: "{{ refstack_client_source }}"