openstack
/
openstack-ansible
Code Issues Proposed changes

Update Master SHA's 

This patch updates the Master SHA's for new development work, and
removes the oslo.messaging 2.6.0 block as this is now done upstream.

Change-Id: I3a1c13b5a3e5a970a8c4380320133d6947c1938c
Closes-Bug: #1505295
This commit is contained in:
Jesse Pretorius 2015-10-24 15:03:01 +01:00
parent bc52ac71e9
commit 14a57702ca
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
global-requirement-pins.txt
View File

@ -1,7 +1,2 @@
# This file was created to collocate pins that are needed but should not be
# This file was created to set pins that are needed but should not be
# installed as base requirements
# Temporary pin:
# https://launchpad.net/bugs/1505295
oslo.messaging!=2.6.0

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

@ -27,23 +27,23 @@
## Tempest service
tempest_git_repo: https://git.openstack.org/openstack/tempest
tempest_git_install_branch: fda037385c0d5fe001cf097637a160242a25f797 # HEAD of "master" as of 14.10.2015
tempest_git_install_branch: d289567c278edeac6ddaf0829e4159aef17c1552 # HEAD of "master" as of 24.10.2015
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
## aodh service
aodh_git_repo: https://git.openstack.org/openstack/aodh
aodh_git_install_branch: 61028410a058224207e296aa18c91eecd0b20ab9 # HEAD of "master" as of Oct 7, 2015.
aodh_git_install_branch: 8c9d2c8804cfb37f7e064e1c0df4b43590f1a3ee # HEAD of "master" as of 24.10.2015
aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}"
## NOVNC from source
novncproxy_git_repo: https://github.com/kanaka/novnc
novncproxy_git_install_branch: a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a # HEAD of "master" as of 14.10.2015
novncproxy_git_install_branch: 6a90803feb124791960e3962e328aa3cfb729aeb # HEAD of "master" as of 24.10.2015
novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}"
## spice-html5 from source
spicehtml5_git_repo: https://github.com/SPICE/spice-html5
spicehtml5_git_install_branch: c1e736b083ff47639ecb73ea9be4d14b5002f93f # HEAD of "master" as of 14.10.2015
spicehtml5_git_install_branch: c1e736b083ff47639ecb73ea9be4d14b5002f93f # HEAD of "master" as of 24.10.2015
spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"

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

@ -31,71 +31,71 @@
## Global Requirements
requirements_git_repo: https://git.openstack.org/openstack/requirements
requirements_git_install_branch: eaf04e511c6d604ef84f47cc3f915ec9a4b95d9f # HEAD of "stable/liberty" as of 14.10.2015
requirements_git_install_branch: 2854532c8549e82b180e348fd11a43bc13f8af6a # HEAD of "master" as of 24.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: 026a5d475e1958bf761e41c2bb426b09e0f3d270 # HEAD of "stable/liberty" as of 14.10.2015
ceilometer_git_install_branch: b34865f80818165187552e7feca4ead2e61a30d3 # HEAD of "master" as of 24.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: 61026d4e4f2a58dd84ffb2e4e40ab99860b9316a # HEAD of "stable/liberty" as of 14.10.2015
cinder_git_install_branch: 774c8a9dc4cfe559a1d2f3afd2380ea8f9cdd6ee # HEAD of "master" as of 24.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: 69516fad5f651a085a047a337a05c58b39023c1b # HEAD of "stable/liberty" as of 14.10.2015
glance_git_install_branch: b7703a4aab4f4c6315a5f0a12620336f96532108 # HEAD of "master" as of 24.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: 4348b7ababd1048e17ec354ca38c903c908cd74e # HEAD of "stable/liberty" as of 14.10.2015
heat_git_install_branch: cd1a61e3d794bd37dd964ba7c37f1d0cb2bb2e81 # HEAD of "master" as of 24.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: 593f0b78eea8efbb6d833d66acc7ab4dc852159b # HEAD of "stable/liberty" as of 14.10.2015
horizon_git_install_branch: aa068eca807885182886b2a2f28591d6ac9e689e # HEAD of "master" as of 24.10.2015
horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"
## Keystone service
keystone_git_repo: https://git.openstack.org/openstack/keystone
keystone_git_install_branch: 8dcd82fb9c76d43f26338bee293b32f4af473ad9 # HEAD of "stable/liberty" as of 14.10.2015
keystone_git_install_branch: ebe82fcd21116f4bdae9dc97407e04f5184dc9b0 # HEAD of "master" as of 24.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: 6dcfe3a9362ae5fcf18e5cfb59663e43446cd59c # HEAD of "stable/liberty" as of 14.10.2015
neutron_git_install_branch: 554b5d96cdb8b0b8987f37b8ae0336e910c5675c # HEAD of "master" as of 24.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: ac80967b4bfbf885dc5a27de9ff69d1a61034f28 # HEAD of "stable/liberty" as of 14.10.2015
neutron_lbaas_git_install_branch: 8427934f76f1c213044a54da60c3b266930efef1 # HEAD of "master" as of 24.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: 1ab399faa6a907bb67e981b728dd06369f0a66d8 # HEAD of "stable/liberty" as of 14.10.2015
neutron_vpnaas_git_install_branch: d4e477d2c515d80a66cf7e5f60a452edc89219d9 # HEAD of "master" as of 24.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: 14c839564fe7fdfb2c953a89e25159aa51c65757 # HEAD of "stable/liberty" as of 14.10.2015
neutron_fwaas_git_install_branch: 64c0e6a56cec1021b8af5b76e5da0485e37d5efb # HEAD of "master" as of 24.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: 6df6ad3ff32f2b1fe2978df1032002548ad8eb66 # HEAD of "stable/liberty" as of 14.10.2015
nova_git_install_branch: 71d2ed17950edbeb97b479bf04958dbee8f23fc5 # HEAD of "master" as of 24.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: 47eb6a37f86f29c355297b556c2ff898c98da9b2 # HEAD of "stable/liberty" as of 14.10.2015
swift_git_install_branch: a094560f0cef9a51f03b9f72dd516d4df717bec6 # HEAD of "master" as of 24.10.2015
swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"