From f97d545118b787366f73d5adeb41ff37524e7e46 Mon Sep 17 00:00:00 2001 From: Asma Syed Hameed Date: Fri, 11 Feb 2022 16:50:36 +0530 Subject: [PATCH] Fix the playbook browbeat.yml to support OSP17 Change-Id: I556bded23938b90691d8ba14356766fc03424bbc --- ansible/install/roles/rally/tasks/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/install/roles/rally/tasks/main.yml b/ansible/install/roles/rally/tasks/main.yml index 400832d71..caec05db0 100644 --- a/ansible/install/roles/rally/tasks/main.yml +++ b/ansible/install/roles/rally/tasks/main.yml @@ -84,19 +84,21 @@ - name: Get the OS_AUTH_URL value in stackrc shell: cat {{home_dir}}/undercloudrc | grep OS_AUTH_URL= register: os_auth_url + when: rhosp_version is version('15.0', '>=') and (rhosp_version is version('17.0', '<')) - name: Add v3 to OS_AUTH_URL in stackrc replace: path: "{{home_dir}}/undercloudrc" regexp: "{{ os_auth_url.stdout }}" replace: '{{ os_auth_url.stdout }}/v3' + when: rhosp_version is version('15.0', '>=') and (rhosp_version is version('17.0', '<')) - name: Add OS_CACERT to undercloudrc lineinfile: path: "{{home_dir}}/undercloudrc" insertafter: "export OS_USER" line: "export OS_CACERT=/etc/pki/ca-trust/source/anchors/undercloud-cacert.pem" - when: rhosp_version is version('15.0', '>=') + when: rhosp_version is version('15.0', '>=') and (rhosp_version is version('17.0', '<')) - name: Setup rally deployment for undercloud shell: . {{ rally_venv }}/bin/activate; . "{{home_dir}}/undercloudrc"; rally deployment create --fromenv --name undercloud