From ed3815b4f9078efbea2d44db7476070fb49ec2d2 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Sun, 6 Dec 2020 13:04:24 +0000 Subject: [PATCH] Remove OS_AUTH_URL workaround After [1] is merged we no longer need OS_AUTH_URL workaround which causes that OS_AUTH_URL is set to use http instead of the https protocol. [1] https://review.opendev.org/c/osf/python-tempestconf/+/762923 Change-Id: Iaabebd2ff9316942c4b6c60ed78de584f1e879df --- playbooks/python-tempestconf-tempest-devstack.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/playbooks/python-tempestconf-tempest-devstack.yaml b/playbooks/python-tempestconf-tempest-devstack.yaml index 9e1e8b80..59cee4ab 100644 --- a/playbooks/python-tempestconf-tempest-devstack.yaml +++ b/playbooks/python-tempestconf-tempest-devstack.yaml @@ -5,13 +5,6 @@ - hosts: tempest vars: - # It's important that OS_AUTH_URL is in this format: - # :///identity/v3 - # In some cases it can be only: ://:5000 - # https://github.com/openstack/devstack/blob/2c9343e5db44fa7a41ca6924737331dd9088ef8f/openrc#L87-L89 - # (mkopec) That would end up with an HTTP MaxRetryError to :5000, - # therefor OS_AUTH_URL is defined manually - set_auth_url: "OS_AUTH_URL=$SERVICE_PROTOCOL://$SERVICE_HOST/identity/v3" devstack_base_dir: "/opt/stack" test_demo_user: "{{ test_demo is defined }}" tasks: @@ -48,7 +41,7 @@ name: generate-tempestconf-file vars: create_accounts_file: True - source_credentials_commands: "export HOST_IP={{ ansible_default_ipv4.address }}; source {{ devstack_base_dir }}/devstack/openrc {{ user }} {{ user }}; {{ set_auth_url }}" + source_credentials_commands: "export HOST_IP={{ ansible_default_ipv4.address }}; source {{ devstack_base_dir }}/devstack/openrc {{ user }} {{ user }}" - name: Generate tempest configuration file based on cloud credentials include_role: