openstack
/
openstack-ansible
Code Issues Proposed changes

Updated master for new dev work - 15 Aug 2015 

This patch updates all git SHA's to the current head of
the appropriate branches.

This patch includes the upstream fix for CVE-2015-5163:
 - https://review.openstack.org/212567

This patch removes the configuration for the cryptography
repository as they have now released tag 1.0 which contains
the SHA we required for fernet tokens to work.

Change-Id: Iaab3a9d1007ccae6d51942fe045e274b7a518e9f
Closes-Bug: #1484766
This commit is contained in:
Nolan Brubaker 2015-08-13 22:44:10 -04:00 committed by Jesse Pretorius
parent 91ac17211a
commit 317566857e
3 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
playbooks/defaults/repo_packages/openstack_clients.yml
View File

@ -26,53 +26,53 @@
## Ceilometer client
ceilometerclient_git_repo: https://git.openstack.org/openstack/python-ceilometerclient
ceilometerclient_git_install_branch: 803c59fbc7682dbfbd8f32c191c3e5e45d9fb8ca # HEAD of "master" as of 06.08.2015
ceilometerclient_git_install_branch: 1fc68877ff8c6f31867a39dbb647688db6b069c3 # HEAD of "master" as of 15.08.2015
ceilometerclient_git_dest: "/opt/ceilometerclient_{{ ceilometerclient_git_install_branch | replace('/', '_') }}"
## Cinder client
cinderclient_git_repo: https://git.openstack.org/openstack/python-cinderclient
cinderclient_git_install_branch: 03542ee65a5e818a5d908a85a6a9eba21ef63b53 # HEAD of "master" as of 06.08.2015
cinderclient_git_install_branch: c26930f811ace7630c566470fea7fd66ba6b722f # HEAD of "master" as of 15.08.2015
cinderclient_git_dest: "/opt/cinderclient_{{ cinderclient_git_install_branch | replace('/', '_') }}"
## Glance client
glanceclient_git_repo: https://git.openstack.org/openstack/python-glanceclient
glanceclient_git_install_branch: 8af084d5a3c8e48fbbae4015c10141b90b491b00 # HEAD of "master" as of 06.08.2015
glanceclient_git_install_branch: 8d118ccedc7e0544ec21e1fbb7f1b8b3a4f03715 # HEAD of "master" as of 15.08.2015
glanceclient_git_dest: "/opt/glanceclient_{{ glanceclient_git_install_branch | replace('/', '_') }}"
## Heat client
heatclient_git_repo: https://git.openstack.org/openstack/python-heatclient
heatclient_git_install_branch: 142d0996ec9ef086b90fee7356c092d8665c679d # HEAD of "master" as of 06.08.2015
heatclient_git_install_branch: 1751fdeef10a51c617c6000be51e291361b5eafe # HEAD of "master" as of 15.08.2015
heatclient_git_dest: "/opt/heatclient_{{ heatclient_git_install_branch | replace('/', '_') }}"
# Keystone client
keystoneclient_git_repo: https://git.openstack.org/openstack/python-keystoneclient
keystoneclient_git_install_branch: eae8e83f5a7a170b98ef2d74a4ffd9eac7cc47ba # HEAD of "master" as of 06.08.2015
keystoneclient_git_install_branch: cba0a6805d424a9f151ab91de1fe19fbd35c2ac9 # HEAD of "master" as of 15.08.2015
keystoneclient_git_dest: "/opt/keystoneclient_{{ keystoneclient_git_install_branch | replace('/', '_') }}"
## Neutron client
neutronclient_git_repo: https://git.openstack.org/openstack/python-neutronclient
neutronclient_git_install_branch: 6281aba974de947b46e05dd926009a53c14d53df # HEAD of "master" as of 06.08.2015
neutronclient_git_install_branch: 16e02dd83adabd58029e57a95f8ce844d972a469 # HEAD of "master" as of 15.08.2015
neutronclient_git_dest: "/opt/neutronclient_{{ neutronclient_git_install_branch | replace('/', '_') }}"
## Nova client
novaclient_git_repo: https://git.openstack.org/openstack/python-novaclient
novaclient_git_install_branch: 7c18da6e644634181d0d6c33d9453fcba28c41ee # HEAD of "master" as of 06.08.2015
novaclient_git_install_branch: 1552d3e4d329c2e9bb695db3d48bb7a7b4f91ec4 # HEAD of "master" as of 15.08.2015
novaclient_git_dest: "/opt/novaclient_{{ novaclient_git_install_branch | replace('/', '_') }}"
## OpenStack client
openstackclient_git_repo: https://git.openstack.org/openstack/python-openstackclient
openstackclient_git_install_branch: d87403a7bf868d96c6c3185a59ac9bac4ba264fa # HEAD of "master" as of 06.08.2015
openstackclient_git_install_branch: ac5e289476911d8db13fce8411a062814a069d4b # HEAD of "master" as of 15.08.2015
openstackclient_git_dest: "/opt/openstackclient_{{ openstackclient_git_install_branch | replace('/', '_') }}"
## Swift client
swiftclient_git_repo: https://git.openstack.org/openstack/python-swiftclient
swiftclient_git_install_branch: a056f1b3742812a2c861a0d01678dfed3b0087e4 # HEAD of "master" as of 06.08.2015
swiftclient_git_install_branch: 3c6565235464fa724929b5abe8f2c32c001996bf # HEAD of "master" as of 15.08.2015
swiftclient_git_dest: "/opt/swiftclient_{{ swiftclient_git_install_branch | replace('/', '_') }}"

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

@ -27,20 +27,11 @@
## Glance store library
glancestore_git_repo: https://git.openstack.org/openstack/glance_store
glancestore_git_install_branch: 29a84f7ced03ece1eb5b2128593dc84f8f95bec1 # HEAD of "master" as of 29.07.2015
glancestore_git_install_branch: 425360035676d4bb88b8b5eea3d7ccabb65e850a # HEAD of "master" as of 15.08.2015
glancestore_git_dest: "/opt/glancestore_{{ glancestore_git_repo | replace('/', '_') }}"
## Global Requirements
requirements_git_repo: https://git.openstack.org/openstack/requirements
requirements_git_install_branch: bdd44d169d0c1928f84167fee37dd6753784cdf4 # HEAD of "master" as of 29.07.2015
requirements_git_install_branch: 2a6b64eeee05933f3719ab50e8b6d2b8e0b13e99 # HEAD of "master" as of 15.08.2015
requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"
## Cryptography
# NOTE(sigmavirus24): Fix this when cryptography 1.0 is released and
# global-requirements.txt allows for it. See also:
# https://github.com/pyca/cryptography/issues/1868
cryptography_git_repo: https://github.com/pyca/cryptography
cryptography_git_install_branch: 172d6846d78e34c005d2c679cf53dd79a3e54d8e # HEAD of "master" as of 27.07.2015
cryptography_git_dest: "/opt/cryptography_{{ cryptography_git_install_branch | replace('/', '_') }}"

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

@ -30,71 +30,71 @@
## Ceilometer service
ceilometer_git_repo: https://github.com/openstack/ceilometer
ceilometer_git_install_branch: 5.0.0.0b2 # liberty-2
ceilometer_git_install_branch: 3c10d3876eac0b27e39c7d93e7d772a5614518ee # HEAD of "master" as of 15.08.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.0b2 # liberty-2
cinder_git_install_branch: 24025cfd3dddf46035571fdc2e173762a95e1685 # HEAD of "master" as of 15.08.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.0b2 # liberty-2
glance_git_install_branch: 667331b666ff29e38ac74c86bcd87640288d4c12 # HEAD of "master" as of 15.08.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.0b2 # liberty-2
heat_git_install_branch: a21614438c9ac4b0db05268c7f580f40bfaac264 # HEAD of "master" as of 15.08.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.0b2 # liberty-2
horizon_git_install_branch: b7ad8c978a9199ba48cd07fd9a3ce0402feadfcd # HEAD of "master" as of 15.08.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: 8.0.0.0b2 # liberty-2
keystone_git_install_branch: a6a39608766d933614ba6e5c9c05956abd574fa0 # HEAD of "master" as of 15.08.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.0b2 # liberty-2
neutron_git_install_branch: 5c477abcb97fda88aa00d6d5cf17fc1a6ac9796a # HEAD of "master" as of 15.08.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.0b2 # liberty-2
neutron_lbaas_git_install_branch: e9edf5f8ab5df389ec836a386ae1c2b28999136e # HEAD of "master" as of 15.08.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.0b2 # liberty-2
neutron_vpnaas_git_install_branch: 86f6f88970f77088601004f330893dc1d090b2ed # HEAD of "master" as of 15.08.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.0b2 # liberty-2
neutron_fwaas_git_install_branch: e04ba8a68ba931729053e4f8ada251464057fe6f # HEAD of "master" as of 15.08.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.0b2 # liberty-2
nova_git_install_branch: 003a2f6fcb3295d15d61825bfe6fa7e07033693a # HEAD of "master" as of 15.08.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.3.0 # liberty-2
swift_git_install_branch: a2c0e6f68728f7837266f489098adf2cff78a500 # HEAD of "master" as of 15.08.2015
swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
## Tempest service
tempest_git_repo: https://git.openstack.org/openstack/tempest
tempest_git_install_branch: 3101ebddd7bfb214d8de277e365499f04667f492 # HEAD of "master" as of 29.07.2015
tempest_git_install_branch: eb87b44c5af64784a3c5e343f6867b717f670dbd # HEAD of "master" as of 15.08.2015
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"