openstack/openstack-ansible
Code Issues Proposed changes

Merge "Update nova & tempest SHA's and remove django-openstack-auth SHA"

Browse Source
This commit is contained in:
Jenkins 2015-10-09 15:37:04 +00:00 committed by Gerrit Code Review
commit 290b4b0dea
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/defaults/repo_packages/openstack_other.yml
View File

@ -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('/', '_') }}"

8
playbooks/defaults/repo_packages/openstack_services.yml
View File

@ -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('/', '_') }}"

4
playbooks/roles/os_horizon/defaults/main.yml
View File

@ -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"