From b068c49acabd969b78355d773390edc0094d8235 Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Thu, 14 Sep 2017 09:59:23 -0600 Subject: [PATCH] Unwedge the openstack-ansible-tests gate This is a combined patch that does two things: 1. Set the LXC download mirror properly The LXC reverse proxy from nodepool was not being used by the lxc_hosts role and this patch fixes it. Closes-Bug: 1716958 2. Pin the keystone role SHA Keystone has removed various v2 APIs but tempest still wants to test them. This buys us some time to get tempest fixed and we can remove the pin. Related-Bug: 1717011 Change-Id: Idf55daa853ff73602bfe6d2862080bfd874e17f4 --- common-tasks/test-set-nodepool-vars.yml | 4 ++-- test-vars.yml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common-tasks/test-set-nodepool-vars.yml b/common-tasks/test-set-nodepool-vars.yml index aef668f5..3a0e163b 100644 --- a/common-tasks/test-set-nodepool-vars.yml +++ b/common-tasks/test-set-nodepool-vars.yml @@ -22,7 +22,7 @@ - name: Discover the lxc_image_cache_server value when in nodepool shell: | source /etc/ci/mirror_info.sh - echo "${NODEPOOL_MIRROR_HOST}:8080/images.linuxcontainers" + echo "http://${NODEPOOL_MIRROR_HOST}:8080/images.linuxcontainers/" args: executable: /bin/bash register: lxc_reverse_proxy @@ -34,7 +34,7 @@ - name: Set a fact to override lxc_image_cache_server value when in nodepool set_fact: - lxc_image_cache_server: "{{ lxc_reverse_proxy.stdout }}" + lxc_image_cache_server_mirrors: "{{ [lxc_reverse_proxy.stdout] }}" when: - nodepool.stat.exists | bool diff --git a/test-vars.yml b/test-vars.yml index f015adb2..c047e37d 100644 --- a/test-vars.yml +++ b/test-vars.yml @@ -120,7 +120,10 @@ keystone_galera_address: "{{ test_galera_host }}" keystone_container_mysql_password: "SuperSecrete" keystone_venv_tag: "testing" keystone_developer_mode: true -keystone_git_install_branch: "{{ test_branch }}" +# NOTE(mhayden): Pin keystone to a commit prior to the removal of v2 +# API endpoints. This can be removed when bug 1717011 is fixed and +# v2 tempest tests are excluded. +keystone_git_install_branch: 02dce056784cbf4b54d9d66e6d8451868e939a0a keystone_service_region: RegionOne # Glance specific settings