From 0af3666dca666e4c43e97fd7b1c61688aff4b753 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 9 Oct 2015 09:42:00 +0100 Subject: [PATCH] Update nova & tempest SHA's and remove django-openstack-auth SHA This patch updates the nova and tempest SHA's to address more issues found in Liberty testing. It also removes the git-based pin for django-openstack-auth and instead implements a lower cap for the package which includes the appropriate fix. Change-Id: Ib30e02dbc681d4a6005c864f0b4ccfbb604de812 Closes-Bug: #1497679 --- playbooks/defaults/repo_packages/openstack_other.yml | 2 +- playbooks/defaults/repo_packages/openstack_services.yml | 8 +------- playbooks/roles/os_horizon/defaults/main.yml | 4 ++++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml index 847a34fe71..a33af379a8 100644 --- a/playbooks/defaults/repo_packages/openstack_other.yml +++ b/playbooks/defaults/repo_packages/openstack_other.yml @@ -27,7 +27,7 @@ ## Tempest service tempest_git_repo: https://git.openstack.org/openstack/tempest -tempest_git_install_branch: fc6ee55fb78e4b1f77a19cfacddf807120abe038 # HEAD of "master" as of 08.10.2015 +tempest_git_install_branch: e146bfdc21abb36db3f27f262faf6a70627cfd17 # HEAD of "master" as of 09.10.2015 tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 6dcd5318c9..d7d60d1987 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -64,12 +64,6 @@ horizon_git_repo: https://git.openstack.org/openstack/horizon horizon_git_install_branch: 593f0b78eea8efbb6d833d66acc7ab4dc852159b # HEAD of "stable/liberty" as of 08.10.2015 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" -# Temporary pin to address django openstack auth issues found here: -# https://bugs.launchpad.net/openstack-ansible/+bug/1497679 -djangoopenstackauth_git_repo: https://git.openstack.org/openstack/django_openstack_auth -djangoopenstackauth_git_install_branch: 88fb89b5b787824d06b4c58337b7c960ccd0263b # HEAD of "stable/liberty" as of 08.10.2015 -djangoopenstackauth_git_dest: "/opt/djangoopenstackauth_{{ djangoopenstackauth_git_install_branch | replace('/', '_') }}" - ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone @@ -97,7 +91,7 @@ neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: ef655379445693443146f8a3ed31cabb011d9937 # HEAD of "stable/liberty" as of 08.10.2015 +nova_git_install_branch: ba6fccc794269b9d9c0e367c269cd488ec9df6fd # HEAD of "stable/liberty" as of 09.10.2015 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/roles/os_horizon/defaults/main.yml b/playbooks/roles/os_horizon/defaults/main.yml index 8f30af0267..5b4ead935c 100644 --- a/playbooks/roles/os_horizon/defaults/main.yml +++ b/playbooks/roles/os_horizon/defaults/main.yml @@ -126,3 +126,7 @@ horizon_pip_packages: - pycrypto - python-memcached - python-keystoneclient + # This lower cap is to address django openstack auth issues found here: + # https://bugs.launchpad.net/openstack-ansible/+bug/1497679 + # If the Horizon requirements change to a later version, this may be removed. + - "django-openstack-auth>=2.0.1"