openstack/openstack-ansible
Code Issues Proposed changes

Update all SHAs for Ocata 2016-11-18

Browse Source 
This patch updates all the roles to the latest available SHA's,
updates all the OpenStack Service SHA's and also updates the
appropriate python requirements pins.

NB Ceilometer has not been updated to it's latest SHA due to the
requirements bump for kafka-python which doesn't match the
global-requirements version.

Change-Id: I646c55d1a90c2b207ab230e1f50f219d2efbac64
This commit is contained in:
Andy McCrae 2016-11-18 09:24:34 +00:00
parent 08cb96f4f3
commit d36a613047
7 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
global-requirement-pins.txt
View File

@ -9,6 +9,6 @@
### These are pinned to ensure exactly the same behaviour forever! ###
### These pins are updated through the sources-branch-updater script ###
###
pip==9.0.0
setuptools==28.7.1
pip==9.0.1
setuptools==28.8.0
wheel==0.29.0

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

@ -33,6 +33,6 @@
## This service has a different stable branch strategy to the rest of OpenStack.
## The SHA is recorded here to make the SHA updating easier.
gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi
gnocchi_git_install_branch: 021a041b43af6b916f4381a3b8bcf770d4da3339 # HEAD of "master" as of 04.11.2016
gnocchi_git_install_branch: 1d3167865c8cbf73971d1c0100b476c29ed72cc4 # HEAD of "master" as of 18.11.2016
gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
gnocchi_git_project_group: gnocchi_all

4
playbooks/defaults/repo_packages/nova_consoles.yml
View File

@ -27,13 +27,13 @@
## NOVNC from source
novncproxy_git_repo: https://github.com/kanaka/novnc
novncproxy_git_install_branch: ef887cdb123df21b61043ff025e6208631e9eb7b # HEAD of "master" as of 04.11.2016
novncproxy_git_install_branch: e1f853e5ae429bd10e47912d379725e5bcf67579 # HEAD of "master" as of 18.11.2016
novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}"
novncproxy_git_project_group: nova_console
## spice-html5 from source
spicehtml5_git_repo: https://github.com/SPICE/spice-html5
spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 04.11.2016
spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 18.11.2016
spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
spicehtml5_git_project_group: nova_console

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

@ -31,186 +31,186 @@
## Global Requirements
requirements_git_repo: https://git.openstack.org/openstack/requirements
requirements_git_install_branch: 898a3f146b3475662d8d155cd9193d115f7cee45 # HEAD of "master" as of 04.11.2016
requirements_git_install_branch: 4819858f7538ca8f937e7cd611b03c3c8ee72cf4 # HEAD of "master" as of 18.11.2016
requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"
## Aodh service
aodh_git_repo: https://git.openstack.org/openstack/aodh
aodh_git_install_branch: 8bf672ede71c3ba7382ee9202b339aeeb60ac869 # HEAD of "master" as of 04.11.2016
aodh_git_install_branch: f8d3068bd24db87c50165e37bcf288df33852f77 # HEAD of "master" as of 18.11.2016
aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}"
aodh_git_project_group: aodh_all
## Barbican service
barbican_git_repo: https://git.openstack.org/openstack/barbican
barbican_git_install_branch: 6134ec02f5cc4f5d6bf999a1494fedca02d6707a # HEAD of "master" as of 04.11.2016
barbican_git_install_branch: 76413b24a61c9efacba81e243d81b00edd94e43f # HEAD of "master" as of 18.11.2016
barbican_git_dest: "/opt/barbican_{{ barbican_git_install_branch | replace('/', '_') }}"
barbican_git_project_group: barbican_all
## Ceilometer service
ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
ceilometer_git_install_branch: 24e71595a44c2eaf64bb0fa38ab8968e60535114 # HEAD of "master" as of 04.11.2016
ceilometer_git_install_branch: c7c51b6e0db7d8164a8587b58ec995b4aa5f0706 # HEAD of "master" as of 08.11.2016
ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}"
ceilometer_git_project_group: ceilometer_all
## Cinder service
cinder_git_repo: https://git.openstack.org/openstack/cinder
cinder_git_install_branch: 6aceda61b7a061aabfbf570ad6d7bca4880345c5 # HEAD of "master" as of 04.11.2016
cinder_git_install_branch: bfd6c4813593216d2d3e257d556bb200c9edddbe # HEAD of "master" as of 18.11.2016
cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}"
cinder_git_project_group: cinder_all
## Designate service
designate_git_repo: https://git.openstack.org/openstack/designate
designate_git_install_branch: 7dd477815ebea4f7cdf230dec7f2a3e19605a3bb # HEAD of "master" as of 12.10.2016
designate_git_install_branch: 04b28100eafdae00d72af784bf7f6e67efa487af # HEAD of "master" as of 18.11.2016
designate_git_dest: "/opt/designate_{{ designate_git_install_branch | replace('/', '_') }}"
designate_git_project_group: designate_all
## Horizon Designate dashboard plugin
designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard
designate_dashboard_git_install_branch: a0dc4f3eee859a4d5e836607ee952a743643b3d4 # HEAD of "master" as of 10.11.2016
designate_dashboard_git_install_branch: 427c9eb6be9ae5f18d87a599575b5c232c0e059e # HEAD of "master" as of 18.11.2016
designate_dashboard_git_dest: "/opt/designate_dashboard_{{ designate_dashboard_git_install_branch | replace('/', '_') }}"
designate_dashboard_git_project_group: horizon_all
## Glance service
glance_git_repo: https://git.openstack.org/openstack/glance
glance_git_install_branch: d1939eb86ff4b04dab7eb6a84af93a90c5002518 # HEAD of "master" as of 04.11.2016
glance_git_install_branch: 51447d07d3fcee66b9824460102ed5e51138c2fb # HEAD of "master" as of 18.11.2016
glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}"
glance_git_project_group: glance_all
## Heat service
heat_git_repo: https://git.openstack.org/openstack/heat
heat_git_install_branch: c3c3635015401ee29878bd6d2b5e7e23216f8699 # HEAD of "master" as of 04.11.2016
heat_git_install_branch: 674c34bfd23d2312f06e480ef77258af8c8fd3f8 # HEAD of "master" as of 18.11.2016
heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}"
heat_git_project_group: heat_all
## Horizon service
horizon_git_repo: https://git.openstack.org/openstack/horizon
horizon_git_install_branch: 7ed28655025cfb16e4d1cca868ed971bd5c2f9fe # HEAD of "master" as of 04.11.2016
horizon_git_install_branch: 24179c740c03fd62f229e431ace1c2fb2cabd462 # HEAD of "master" as of 18.11.2016
horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"
horizon_git_project_group: horizon_all
## Horizon Ironic dashboard plugin
ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui
ironic_dashboard_git_install_branch: 143222d3bff043261a677217aea3c87ce9fd1e5b # HEAD of "master" as of 04.11.2016
ironic_dashboard_git_install_branch: 26574c7aa1193de666895398dd0fd9aa2e092dc6 # HEAD of "master" as of 18.11.2016
ironic_dashboard_git_dest: "/opt/ironic_dashboard_{{ ironic_dashboard_git_install_branch | replace('/', '_') }}"
ironic_dashboard_git_project_group: horizon_all
## Horizon Magnum dashboard plugin
magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui
magnum_dashboard_git_install_branch: 5daacca1582c43775a0be37b31873f81d3a643d9 # HEAD of "master" as of 04.11.2016
magnum_dashboard_git_install_branch: de34ac6e00c5338bf5d9086699316d5b593fe271 # HEAD of "master" as of 18.11.2016
magnum_dashboard_git_dest: "/opt/magnum_dashboard_{{ magnum_dashboard_git_install_branch | replace('/', '_') }}"
magnum_dashboard_git_project_group: horizon_all
## Horizon LBaaS dashboard plugin
neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard
neutron_lbaas_dashboard_git_install_branch: 8f1df3fcb8459a9cda178db846ade987404904c9 # HEAD of "master" as of 04.11.2016
neutron_lbaas_dashboard_git_install_branch: d990d5e3a6224db2ffbdf12da8fe1cc78b866903 # HEAD of "master" as of 18.11.2016
neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}"
neutron_lbaas_dashboard_git_project_group: horizon_all
## Horizon Sahara dashboard plugin
sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard
sahara_dashboard_git_install_branch: fd61b9817ff68d009d9e25993c8cebc220d3ebab # HEAD of "master" as of 04.11.2016
sahara_dashboard_git_install_branch: eef5697b5acff8a74c539776d7a4ba5a4d9970b9 # HEAD of "master" as of 18.11.2016
sahara_dashboard_git_dest: "/opt/sahara_dashboard_{{ sahara_dashboard_git_install_branch | replace('/', '_') }}"
sahara_dashboard_git_project_group: horizon_all
## Keystone service
keystone_git_repo: https://git.openstack.org/openstack/keystone
keystone_git_install_branch: c75f83699e2a980693ad58daa114f203eaf4c622 # HEAD of "master" as of 04.11.2016
keystone_git_install_branch: 34b0cf2a1b077eeebfc740330bc2a9640db395db # HEAD of "master" as of 18.11.2016
keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}"
keystone_git_project_group: keystone_all
## Neutron service
neutron_git_repo: https://git.openstack.org/openstack/neutron
neutron_git_install_branch: 02b0f87fde249ff2fbb6a32c1b265924c1e2185a # HEAD of "master" as of 04.11.2016
neutron_git_install_branch: 453fc170ac25fd8341138ecd2489668008ebbfcc # HEAD of "master" as of 18.11.2016
neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}"
neutron_git_project_group: neutron_all
neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
neutron_lbaas_git_install_branch: d8fd4536ff2a138df5e03b69ef1853b613c4ba4a # HEAD of "master" as of 04.11.2016
neutron_lbaas_git_install_branch: 9453e0725ccf515c6179ae915c2979e679100270 # HEAD of "master" as of 18.11.2016
neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}"
neutron_lbaas_git_project_group: neutron_all
neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: 53236e36f5873a2dc1fc0e8ee97c5ce46369209f # HEAD of "master" as of 04.11.2016
neutron_vpnaas_git_install_branch: b58cca834ed2c962cd8a951cc506c1f76c356c6b # HEAD of "master" as of 18.11.2016
neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}"
neutron_vpnaas_git_project_group: neutron_all
neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
neutron_fwaas_git_install_branch: 7be3a8ff9fb07985d2c671410f47a2bf1da27d85 # HEAD of "master" as of 04.11.2016
neutron_fwaas_git_install_branch: f7c7d6b6e74b97dc58bc997e3cea4aa1f4c93403 # HEAD of "master" as of 18.11.2016
neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}"
neutron_fwaas_git_project_group: neutron_all
neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing
neutron_dynamic_routing_git_install_branch: e383b7d63524b0196673e10fdb615771ba574c61 # HEAD of "master" as of 04.11.2016
neutron_dynamic_routing_git_install_branch: 968820bde876cddf2921755b94b910b3b536e80e # HEAD of "master" as of 18.11.2016
neutron_dynamic_routing_git_dest: "/opt/neutron_dynamic_routing_{{ neutron_dynamic_routing_git_install_branch | replace('/', '_') }}"
neutron_dynamic_routing_git_project_group: neutron_all
## Nova service
nova_git_repo: https://git.openstack.org/openstack/nova
nova_git_install_branch: 5a81b00e6b2adba2a380b90e402ff391d64ea6a5 # HEAD of "master" as of 04.11.2016
nova_git_install_branch: dbf0b2c8ae1334ee125f66aa6ed9ccb8303f42ca # HEAD of "master" as of 18.11.2016
nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"
nova_git_project_group: nova_all
## PowerVM Virt Driver
nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm
nova_powervm_git_install_branch: 140ebfda2538540ae693c9aa937cfc95d2f947d9 # HEAD of "master" as of 04.11.2016
nova_powervm_git_install_branch: c6d94844b850e6491b246407f9d1cd8bfed567cb # HEAD of "master" as of 18.11.2016
nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}"
nova_powervm_git_project_group: nova_compute
## LXD Virt Driver
nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
nova_lxd_git_install_branch: 2a85329ed9b875af65e06638614937dba85f756d # HEAD of "master" as of 04.11.2016
nova_lxd_git_install_branch: f434b721cd96989cc04f5b328c148d39484345c1 # HEAD of "master" as of 18.11.2016
nova_lxd_git_dest: "/opt/nova_lxd_{{ nova_lxd_git_install_branch | replace('/', '_') }}"
nova_lxd_git_project_group: nova_compute
## Sahara service
sahara_git_repo: https://git.openstack.org/openstack/sahara
sahara_git_install_branch: c566fbb752890d3929697ffa728310a5b960b533 # HEAD of "master" as of 04.11.2016
sahara_git_install_branch: a5c84c74c36fd8f92672baa7a74d0e9f0a72ab92 # HEAD of "master" as of 18.11.2016
sahara_git_dest: "/opt/sahara_{{ sahara_git_install_branch | replace('/', '_') }}"
sahara_git_project_group: sahara_all
## Swift service
swift_git_repo: https://git.openstack.org/openstack/swift
swift_git_install_branch: a4d77d918d99dfa8a1e7f1b0561769a17ba64932 # HEAD of "master" as of 04.11.2016
swift_git_install_branch: bf473ddc9d3fcb3a3fe516b5221a588c5b196a1d # HEAD of "master" as of 18.11.2016
swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
swift_git_project_group: swift_all
## Ironic service
ironic_git_repo: https://git.openstack.org/openstack/ironic
ironic_git_install_branch: 56b399fab744b99df816b43bae43e1b2929daa62 # HEAD of "master" as of 04.11.2016
ironic_git_install_branch: 0d3e2388a2fa7b9c51def5842b580ab8a7cb228e # HEAD of "master" as of 18.11.2016
ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}"
ironic_git_project_group: ironic_all
## Magnum service
magnum_git_repo: https://git.openstack.org/openstack/magnum
magnum_git_install_branch: 71ce4851e4d91605e8f0ccec745ca3aaf99577e7 # HEAD of "master" as of 04.11.2016
magnum_git_install_branch: 60b772460969f88457dd8238ad671534a94626b5 # HEAD of "master" as of 18.11.2016
magnum_git_dest: "/opt/magnum_{{ magnum_git_install_branch | replace('/', '_') }}"
magnum_git_project_group: magnum_all
## Trove service
trove_git_repo: https://git.openstack.org/openstack/trove
trove_git_install_branch: 1b2f42dc3d7290d92f8203587a0adcfbd146e00f # HEAD of "master" as of 04.11.2016
trove_git_install_branch: fef848fbb2ee1ceddbe0222f0031e1d0779ba86b # HEAD of "master" as of 18.11.2016
trove_git_dest: "/opt/trove_{{ trove_git_install_branch | replace('/', '_') }}"
trove_git_project_group: trove_all
## Horizon Trove dashboard plugin
trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard
trove_dashboard_git_install_branch: 4e0cf0a8297516a99e7116915591425ca5f66cf4 # HEAD of "master" as of 10.11.2016
trove_dashboard_git_install_branch: de0ecc11dc823bae8b05b31e8048332e2c15bf23 # HEAD of "master" as of 18.11.2016
trove_dashboard_git_dest: "/opt/trove_dashboard_{{ trove_dashboard_git_install_branch | replace('/', '_') }}"
trove_dashboard_git_project_group: horizon_all

4
playbooks/defaults/repo_packages/openstack_testing.yml
View File

@ -27,7 +27,7 @@
## Tempest service
tempest_git_repo: https://git.openstack.org/openstack/tempest
tempest_git_install_branch: 7d109103ae9c741b4751e0435d58191175fd1699 # HEAD of "master" as of 04.11.2016
tempest_git_install_branch: c37195a222ed6f4e192848b3dfb8cd420e3b421d # HEAD of "master" as of 18.11.2016
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
tempest_git_project_group: utility_all
tempest_git_install_fragments: "venvwithindex=True&ignorerequirements=True"
@ -35,7 +35,7 @@ tempest_git_install_fragments: "venvwithindex=True&ignorerequirements=True"
## Rally service
rally_git_repo: https://git.openstack.org/openstack/rally
rally_git_install_branch: 454ba1d4a277f7b61915f078ccd934ac3056406a # HEAD of "master" as of 04.11.2016
rally_git_install_branch: 8f83ee724a834f32494ff2c584ac79f5021d4507 # HEAD of "master" as of 18.11.2016
rally_git_dest: "/opt/rally_{{ rally_git_install_branch | replace('/', '_') }}"
rally_git_project_group: utility_all
rally_git_install_fragments: "venvwithindex=True&ignorerequirements=True"

4
playbooks/inventory/group_vars/all.yml
View File

@ -38,8 +38,8 @@ rsyslog_client_package_state: "{{ package_state }}"
# These are pinned to ensure exactly the same behaviour forever!
# These pins are updated through the sources-branch-updater script
pip_packages:
- pip==9.0.0
- setuptools==28.7.1
- pip==9.0.1
- setuptools==28.8.0
- wheel==0.29.0
pip_links:

2
scripts/scripts-library.sh
View File

@ -20,7 +20,7 @@ LINE='----------------------------------------------------------------------'
MAX_RETRIES=${MAX_RETRIES:-5}
ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:--e gather_facts=False}
STARTTIME="${STARTTIME:-$(date +%s)}"
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.0 setuptools==28.7.1 wheel==0.29.0 '}
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==28.8.0 wheel==0.29.0 '}
COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs"}
# The default SSHD configuration has MaxSessions = 10. If a deployer changes