diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml index be79de14d6..847a34fe71 100644 --- a/playbooks/defaults/repo_packages/openstack_other.yml +++ b/playbooks/defaults/repo_packages/openstack_other.yml @@ -27,27 +27,17 @@ ## Tempest service tempest_git_repo: https://git.openstack.org/openstack/tempest -tempest_git_install_branch: aac06c929a9d3bf52a4310b91dc886079c9ca9d7 # HEAD of "master" as of 04.09.2015 +tempest_git_install_branch: fc6ee55fb78e4b1f77a19cfacddf807120abe038 # HEAD of "master" as of 08.10.2015 tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" -# Temporary pin to address openstackclient requirements issue in tag 1.6.0 "python-neutronclient<3,>=2.6.0" -# This pin should be removed when 1.6.1 is released -openstackclient_git_repo: https://github.com/openstack/python-openstackclient -openstackclient_git_install_branch: b288fbfb35a00fac7e2646592a7cabeff09026b3 -openstackclient_git_dest: "/opt/openstackclient_{{ openstackclient_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://github.com/openstack/django_openstack_auth -djangoopenstackauth_git_install_branch: 829cbee14e200fd127ec4f0e0f4d743102d8e9d1 -djangoopenstackauth_git_dest: "/opt/djangoopenstackauth_{{ djangoopenstackauth_git_install_branch | replace('/', '_') }}" - -# NOVNC from source +## NOVNC from source novncproxy_git_repo: https://github.com/kanaka/novnc -novncproxy_git_install_branch: a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a +novncproxy_git_install_branch: a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a # HEAD of "master" as of 08.10.2015 novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}" -# spice-html5 from source + +## spice-html5 from source spicehtml5_git_repo: https://github.com/SPICE/spice-html5 -spicehtml5_git_install_branch: c1e736b083ff47639ecb73ea9be4d14b5002f93f +spicehtml5_git_install_branch: c1e736b083ff47639ecb73ea9be4d14b5002f93f # HEAD of "master" as of 08.10.2015 spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index f690cf3b14..6dcd5318c9 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,71 +31,77 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: 9c6d8c7459719f7accd3444dbc713b573b7359d0 # HEAD of "master" as of 04.09.2015 +requirements_git_install_branch: f82ab92ed8ff1a278391a196a39382fbb4211583 # HEAD of "stable/liberty" as of 08.10.2015 requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}" ## Ceilometer service ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer -ceilometer_git_install_branch: 5.0.0.0b3 # liberty-3 +ceilometer_git_install_branch: 026a5d475e1958bf761e41c2bb426b09e0f3d270 # HEAD of "stable/liberty" as of 08.10.2015 ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}" ## Cinder service cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: 7.0.0.0b3 # liberty-3 +cinder_git_install_branch: 5268a8d61beee1b18d14fd3738e763a0a61b00f1 # HEAD of "stable/liberty" as of 08.10.2015 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" ## Glance service glance_git_repo: https://git.openstack.org/openstack/glance -glance_git_install_branch: 11.0.0.0b3 # liberty-3 +glance_git_install_branch: bbad01fde19ae982564a018c402d75218ea1379c # HEAD of "stable/liberty" as of 08.10.2015 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" ## Heat service heat_git_repo: https://git.openstack.org/openstack/heat -heat_git_install_branch: 5.0.0.0b3 # liberty-3 +heat_git_install_branch: 4348b7ababd1048e17ec354ca38c903c908cd74e # HEAD of "stable/liberty" as of 08.10.2015 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" ## Horizon service horizon_git_repo: https://git.openstack.org/openstack/horizon -horizon_git_install_branch: 8.0.0.0b3 # liberty-3 +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 -keystone_git_install_branch: 8.0.0.0b3 # liberty-3 +keystone_git_install_branch: 8dcd82fb9c76d43f26338bee293b32f4af473ad9 # HEAD of "stable/liberty" as of 08.10.2015 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" ## Neutron service neutron_git_repo: https://git.openstack.org/openstack/neutron -neutron_git_install_branch: 7.0.0.0b3 # liberty-3 +neutron_git_install_branch: 0b07910f33ed26fbdd13530eafbdefd74104424d # HEAD of "stable/liberty" as of 08.10.2015 neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}" neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: 7.0.0.0b3 # liberty-3 +neutron_lbaas_git_install_branch: ac80967b4bfbf885dc5a27de9ff69d1a61034f28 # HEAD of "stable/liberty" as of 08.10.2015 neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}" neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 7.0.0.0b3 # liberty-3 +neutron_vpnaas_git_install_branch: cc8703abe4d24d403d1eec6269ecb1c74a8c747c # HEAD of "stable/liberty" as of 08.10.2015 neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}" neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: 7.0.0.0b3 # liberty-3 +neutron_fwaas_git_install_branch: 14c839564fe7fdfb2c953a89e25159aa51c65757 # HEAD of "stable/liberty" as of 08.10.2015 neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}" ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: 12.0.0.0b3 # liberty-3 +nova_git_install_branch: ef655379445693443146f8a3ed31cabb011d9937 # HEAD of "stable/liberty" as of 08.10.2015 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: 2.4.0 # liberty-3 +swift_git_install_branch: 47eb6a37f86f29c355297b556c2ff898c98da9b2 # HEAD of "stable/liberty" as of 08.10.2015 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/defaults/repo_packages/python2_lxc.yml b/playbooks/defaults/repo_packages/python2_lxc.yml index 2b5c16f273..5bef077d24 100644 --- a/playbooks/defaults/repo_packages/python2_lxc.yml +++ b/playbooks/defaults/repo_packages/python2_lxc.yml @@ -14,6 +14,6 @@ # limitations under the License. ## Git Source for python2-lxc library -git_repo: "https://github.com/lxc/python2-lxc" +git_repo: https://github.com/lxc/python2-lxc git_install_branch: master git_dest: "/opt/lxc_python2_{{ git_install_branch|replace('/', '_') }}"