openstack
/
openstack-ansible
Code Issues Proposed changes

Update all SHAs for Ocata 2016-12-23 

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.

Change-Id: If353201e1ebbffe014db960fd17fc275d6e1b576
This commit is contained in:
Andy McCrae 2016-12-23 09:51:15 +00:00
parent c6c06c5c9b
commit cfda6b6a1e
7 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
global-requirement-pins.txt
View File

@ -10,5 +10,5 @@
### These pins are updated through the sources-branch-updater script ###
###
pip==9.0.1
setuptools==31.0.0
setuptools==32.2.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: fb312488dd45b12d78efc2894546129c40e184ea # HEAD of "master" as of 14.12.2016
gnocchi_git_install_branch: 253b592561da228b59324c3960d6285edc57995f # HEAD of "master" as of 23.12.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: c01b2f0259b101cd9b7fdac610ddb68a1e6d828a # HEAD of "master" as of 14.12.2016
novncproxy_git_install_branch: 558544364cf0d1f91d18b3a5768db8c8292f7ff6 # HEAD of "master" as of 23.12.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 14.12.2016
spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 23.12.2016
spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
spicehtml5_git_project_group: nova_console

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

@ -31,20 +31,20 @@
## Global Requirements
requirements_git_repo: https://git.openstack.org/openstack/requirements
requirements_git_install_branch: ec96adb55b5fa6937cc6ea018337e69f6a042ebf # HEAD of "master" as of 14.12.2016
requirements_git_install_branch: 27476e1858c96768e6f3e830de3ab93e222ac7b8 # HEAD of "master" as of 23.12.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: b2e1cc089be47e5d9d8250184058d1bd8fdca450 # HEAD of "master" as of 14.12.2016
aodh_git_install_branch: 76ea34d92e392b05fe7fa80300ffbd06e4c9327c # HEAD of "master" as of 23.12.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: ea725053c0cc1875a066b67f3d758bcde698afe0 # HEAD of "master" as of 14.12.2016
barbican_git_install_branch: a27d201c0527c02b98bdeadfd47c627acefd89ef # HEAD of "master" as of 23.12.2016
barbican_git_dest: "/opt/barbican_{{ barbican_git_install_branch | replace('/', '_') }}"
barbican_git_project_group: barbican_all
@ -58,159 +58,159 @@ ceilometer_git_project_group: ceilometer_all
## Cinder service
cinder_git_repo: https://git.openstack.org/openstack/cinder
cinder_git_install_branch: 12eccd10f4227582885a25cbbae169a5cb4bd2ab # HEAD of "master" as of 14.12.2016
cinder_git_install_branch: 44ebdd22526e9a4ae0646d9f9ae2b391e70bed57 # HEAD of "master" as of 23.12.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: 45b384ee9f3dea7d7d2894cf1867bc7b0ba8f512 # HEAD of "master" as of 14.12.2016
designate_git_install_branch: 45b384ee9f3dea7d7d2894cf1867bc7b0ba8f512 # HEAD of "master" as of 23.12.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: 017d9f7b2720b3fb88ec0fa21f3c926cfecbab8b # HEAD of "master" as of 14.12.2016
designate_dashboard_git_install_branch: f0c39c1f2af563907ae0508d599c2719b7d54676 # HEAD of "master" as of 23.12.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: 472fd5206b2341f538967e04ec09e83010b084a3 # HEAD of "master" as of 14.12.2016
glance_git_install_branch: ebd6f07f1b12edddcd8503076b0418dc9f81279a # HEAD of "master" as of 23.12.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: f72607dde6bffc09f3770c59588ce9a6aea1b6a3 # HEAD of "master" as of 14.12.2016
heat_git_install_branch: b978dc6e4cd4d5d5414d473009b1c5aad7044678 # HEAD of "master" as of 23.12.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: f565b2c7819c9041b31e66c738701a514fec212a # HEAD of "master" as of 14.12.2016
horizon_git_install_branch: e5dac64cb0aac2176d5a608b155976f5375d6a7e # HEAD of "master" as of 23.12.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: 6517bf419c35eb7f84a95d3d118cb5821d2913bc # HEAD of "master" as of 14.12.2016
ironic_dashboard_git_install_branch: 150f06d1d3bcb25aa3d99d13008e9456b4601fac # HEAD of "master" as of 23.12.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: 538e0104ac9ec43f6e28b2009cf707c931110039 # HEAD of "master" as of 14.12.2016
magnum_dashboard_git_install_branch: 5059c9b6d5213573bde7472f9f3c119ca50c18f6 # HEAD of "master" as of 23.12.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: 89a2c1b27c3eafc6a1c92b9be92cdd452a11555c # HEAD of "master" as of 14.12.2016
neutron_lbaas_dashboard_git_install_branch: 89a2c1b27c3eafc6a1c92b9be92cdd452a11555c # HEAD of "master" as of 23.12.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: 694a85c71c315ccdb3e2f2946f86ce95936ee684 # HEAD of "master" as of 14.12.2016
sahara_dashboard_git_install_branch: 694a85c71c315ccdb3e2f2946f86ce95936ee684 # HEAD of "master" as of 23.12.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: c30b539bda5acf80d22f98f0712e688022b4b20b # HEAD of "master" as of 14.12.2016
keystone_git_install_branch: 1dbbec037e129e46793dd605c06efdb2e51fc5c1 # HEAD of "master" as of 23.12.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: 920ddeaf58d65687dee246967bea41826cd712e3 # HEAD of "master" as of 14.12.2016
neutron_git_install_branch: d52554d5d3aa9eefb3e969f87f0c2863537b5f31 # HEAD of "master" as of 23.12.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: bc8bbc6d4c8c04b9d4fb824a15c5cbcd0b007c5b # HEAD of "master" as of 14.12.2016
neutron_lbaas_git_install_branch: c025712a9bdca117245a133df96dce3b818ab354 # HEAD of "master" as of 23.12.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: 2ef3c0d44905d7465732630c68308b18f21c0b82 # HEAD of "master" as of 14.12.2016
neutron_vpnaas_git_install_branch: 2ef3c0d44905d7465732630c68308b18f21c0b82 # HEAD of "master" as of 23.12.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: f06888598b345de299cbf148448c13f2f59180c1 # HEAD of "master" as of 14.12.2016
neutron_fwaas_git_install_branch: 5f980e83aabedec75a6f7481e083c7b0da28e7d5 # HEAD of "master" as of 23.12.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: 0980985b2f3590f60b4726a5419680a1d70f9ead # HEAD of "master" as of 14.12.2016
neutron_dynamic_routing_git_install_branch: c170337c866a3877b47aeb0b18618fa35e4c9c04 # HEAD of "master" as of 23.12.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: 199d3d81ee44b7fa79eb443468cbfc7b118c2266 # HEAD of "master" as of 14.12.2016
nova_git_install_branch: bd194cad55de027f01fed1bccf5a4e180d5c2567 # HEAD of "master" as of 23.12.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: 48d84d9ec11d77386e255f0a3cf1f74cb34f6d7f # HEAD of "master" as of 14.12.2016
nova_powervm_git_install_branch: 0d0f2c014044920f48eb89f9928bc706a0bba094 # HEAD of "master" as of 23.12.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: 3609b4f1129760ad6141de5f5bbc91424f3270ab # HEAD of "master" as of 14.12.2016
nova_lxd_git_install_branch: 9b899e71c0fe4ae2cc8a34fe78b9bf344ad402b8 # HEAD of "master" as of 23.12.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: 6a0ba541575fc3121c2000ea29fa3ebd1d378384 # HEAD of "master" as of 14.12.2016
sahara_git_install_branch: 6c91ca80a5b9e24f1cc863543de6cd8622ab947c # HEAD of "master" as of 23.12.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: c0640f87107d84d262c20bdc1250b805ae8f9482 # HEAD of "master" as of 14.12.2016
swift_git_install_branch: 517083e99953f67d799cbf6ff6460e4a97a98783 # HEAD of "master" as of 23.12.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: 51c6d7a6edbd413d6e4fa2e71c323cc136a613ce # HEAD of "master" as of 14.12.2016
ironic_git_install_branch: 12feff85d6826d198a424a1c25efcc3d3c591299 # HEAD of "master" as of 23.12.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: da04fe8b1c28c139ca85219edd4b78bcc6d9d11e # HEAD of "master" as of 14.12.2016
magnum_git_install_branch: c8f07a1fb09ffb0a576766aeaf7106ad83570caf # HEAD of "master" as of 23.12.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: 8adfb7e4f27fb9daf87dda018094cc6c58089b88 # HEAD of "master" as of 14.12.2016
trove_git_install_branch: 653406a85aadc08685253eb3dd71a0970058f7a7 # HEAD of "master" as of 23.12.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: 61eb610cc45cbd2e2bbb1273fd146785732cadc3 # HEAD of "master" as of 14.12.2016
trove_dashboard_git_install_branch: 61eb610cc45cbd2e2bbb1273fd146785732cadc3 # HEAD of "master" as of 23.12.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: 3f2f0ea8c73042d5e4e0b94ccc5ed99d14167162 # HEAD of "master" as of 14.12.2016
tempest_git_install_branch: 529740f487689a2003799916b162b06f48216c1e # HEAD of "master" as of 23.12.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: e37e94243ecc463456608f364f5779f2b2b9dbeb # HEAD of "master" as of 14.12.2016
rally_git_install_branch: b6c0c41874a6394656aebab6a95c50a5f86669b3 # HEAD of "master" as of 23.12.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"

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

@ -39,7 +39,7 @@ rsyslog_client_package_state: "{{ package_state }}"
# These pins are updated through the sources-branch-updater script
pip_packages:
- pip==9.0.1
- setuptools==31.0.0
- setuptools==32.2.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.1 setuptools==31.0.0 wheel==0.29.0 '}
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==32.2.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