openstack/openstack-ansible
Code Issues Proposed changes

Update all SHAs for Newton 2016-09-12

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.

Depends-On: I8a3fdd7f7cf64f12de306150740dd1da104d72e3
Change-Id: Ic9382007d6c34eea5340e865c720139921d37907
This commit is contained in:
Jesse Pretorius 2016-09-08 18:15:53 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 67a2422cc8
commit eb55da0081
7 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
global-requirement-pins.txt
View File

@ -5,10 +5,15 @@
#
# Use this file with caution!
#
# TODO(odyssey4me) Remove once https://review.openstack.org/368001
# merges and we bump the requirements SHA
oslo.db==4.13.3
###
### These are pinned to ensure exactly the same behaviour forever! ###
### These pins are updated through the sources-branch-updater script ###
###
pip==8.1.2
setuptools==26.0.0
setuptools==27.1.2
wheel==0.29.0

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

@ -27,19 +27,19 @@
## Tempest service
tempest_git_repo: https://git.openstack.org/openstack/tempest
tempest_git_install_branch: c68b1493c2e935db917f05523b2b7e1a6574cd4e # HEAD of "master" as of 25.08.2016
tempest_git_install_branch: 479bfaccf5b1db53afb9f0663de7544b25c4bca7 # HEAD of "master" as of 12.09.2016
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
tempest_git_project_group: utility_all
## NOVNC from source
novncproxy_git_repo: https://github.com/kanaka/novnc
novncproxy_git_install_branch: da17d0369de93d9f879840978b6852295a456787 # HEAD of "master" as of 25.08.2016
novncproxy_git_install_branch: 7a16304e52b3fbd466337601f05a7def2493c563 # HEAD of "master" as of 12.09.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 25.08.2016
spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 12.09.2016
spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
spicehtml5_git_project_group: nova_console

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

@ -31,166 +31,166 @@
## Global Requirements
requirements_git_repo: https://git.openstack.org/openstack/requirements
requirements_git_install_branch: 7cc14e8d50c86210ee08929b55ef164ad4274b3b # HEAD of "master" as of 25.08.2016
requirements_git_install_branch: 4f211a5002af4b19a2f050e543b34e2212250fbf # HEAD of "master" as of 12.09.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: 65b6542dba9e180ed1f2759f2c39db366f0404b2 # HEAD of "master" as of 25.08.2016
aodh_git_install_branch: 3e1ed2ef6619713b71801d95e837451e6893f591 # HEAD of "master" as of 12.09.2016
aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}"
aodh_git_project_group: aodh_all
## Ceilometer service
ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
ceilometer_git_install_branch: ef9da325fc355f2b048ffd826aff69e009c175ab # HEAD of "master" as of 25.08.2016
ceilometer_git_install_branch: f78849c9660b8e73aa2a65b12775804eced2ecdb # HEAD of "master" as of 12.09.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: 9b9ea77c659e48a261e9e966015d40996b11b8ee # HEAD of "master" as of 25.08.2016
cinder_git_install_branch: 781475f1148d4c730c257a224c8f528ec312c9f7 # HEAD of "master" as of 12.09.2016
cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}"
cinder_git_project_group: cinder_all
## Glance service
glance_git_repo: https://git.openstack.org/openstack/glance
glance_git_install_branch: a1f2001f992888a2040007bbd0fca3a61f399cdd # HEAD of "master" as of 25.08.2016
glance_git_install_branch: 5c198ce45660f879b7c9afaae591e584ee551c3c # HEAD of "master" as of 12.09.2016
glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}"
glance_git_project_group: glance_all
## Gnocchi service
gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi
gnocchi_git_install_branch: d16ee417283312335e1115b948c6ca52627b8303 # HEAD of "master" as of 25.08.2016
gnocchi_git_install_branch: a4b12efa21b5ba533e2da5081bd2382169c28414 # HEAD of "master" as of 12.09.2016
gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
gnocchi_git_project_group: gnocchi_all
## Heat service
heat_git_repo: https://git.openstack.org/openstack/heat
heat_git_install_branch: 90bc7ccbdac38cf22711c12e57eafa4abbf85ca8 # HEAD of "master" as of 25.08.2016
heat_git_install_branch: 0f48b1d66c2427be2116d8bc60abc62795b05250 # HEAD of "master" as of 12.09.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: e7b4bdfe5d576766b34bf00cea3dcbcb42436420 # HEAD of "master" as of 25.08.2016
horizon_git_install_branch: bff48543ba4709323b287b80c3bba15f043600d5 # HEAD of "master" as of 12.09.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: 060f2f08b3e983b64b68211f5922b925b3d88101 # HEAD of "master" as of 25.08.2016
ironic_dashboard_git_install_branch: 7e8189b9ac1c5e818b695f0555994ff15d1465b7 # HEAD of "master" as of 12.09.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: df2d57124bb3c7854931b811ccc12c54ee60b61e # HEAD of "master" as of 25.08.2016
magnum_dashboard_git_install_branch: f07baab8e012ccd14492a4ab2c764e1cff3b557f # HEAD of "master" as of 12.09.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: aba14a4ccde177141b6314b9fafafb0868b84400 # HEAD of "master" as of 25.08.2016
neutron_lbaas_dashboard_git_install_branch: aba14a4ccde177141b6314b9fafafb0868b84400 # HEAD of "master" as of 12.09.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: 1a19b8851c7d7d2daa2e22db4894ecd47eb9498d # HEAD of "master" as of 15.08.2016
sahara_dashboard_git_install_branch: 2bb9843690e583bc7944a86fdb27058d3cb2e887 # HEAD of "master" as of 12.09.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: 179c5605f97419a9b573cebaa0844ec276519df3 # HEAD of "master" as of 09.09.2016
keystone_git_install_branch: bf5711ef029e230fb8d9daae34f0528c8b68a9ae # HEAD of "master" as of 12.09.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: 53555192ba4adba948042ee4718eae68646ad168 # HEAD of "master" as of 25.08.2016
neutron_git_install_branch: daac2701138169d20a41356cb26ff5e28d684c06 # HEAD of "master" as of 12.09.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: f5e8ff5ae52253944dad7d8744875861ad490e0e # HEAD of "master" as of 25.08.2016
neutron_lbaas_git_install_branch: 547f668c238b4458ff23576a9bdd2cbe0921370b # HEAD of "master" as of 12.09.2016
neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}"
neutron_lbaas_git_project_group: neutron_agent
neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: 5fbe18b0e92985898355cacf752bde278ab6be37 # HEAD of "master" as of 25.08.2016
neutron_vpnaas_git_install_branch: 892599a1b4f01ccfc8029769260008970247f4a5 # HEAD of "master" as of 12.09.2016
neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}"
neutron_vpnaas_git_project_group: neutron_agent
neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
neutron_fwaas_git_install_branch: 151946dcb13150555eafb151dc6cc2297a6bcb8e # HEAD of "master" as of 25.08.2016
neutron_fwaas_git_install_branch: b512cffb4275d24e1b8cefe4144e515bee8044fb # HEAD of "master" as of 12.09.2016
neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}"
neutron_fwaas_git_project_group: neutron_agent
neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing
neutron_dynamic_routing_git_install_branch: d23f8f7db45cc2ee5c8cdbb24d70f3fdb36988ff # HEAD of "master" as of 25.08.2016
neutron_dynamic_routing_git_install_branch: 9872cecbb83b1333ed5e8d48d5cfe44c00488b90 # HEAD of "master" as of 12.09.2016
neutron_dynamic_routing_git_dest: "/opt/neutron_dynamic_routing_{{ neutron_dynamic_routing_git_install_branch | replace('/', '_') }}"
neutron_dynamic_routing_git_project_group: neutron_agent
## Nova service
nova_git_repo: https://git.openstack.org/openstack/nova
nova_git_install_branch: 77f80e8150a4baa6ee3e73c8e993026e62cc52a2 # HEAD of "master" as of 25.08.2016
nova_git_install_branch: 110c12b4145a5a978e3dd9e99e65be1d4a86ee06 # HEAD of "master" as of 12.09.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: 0e8fdcdf63c9fc8687a9c468a7b380f8aceead7e # HEAD of "master" as of 25.08.2016
nova_powervm_git_install_branch: 80e413814424c679215585c7a8e5d33281a1dea0 # HEAD of "master" as of 12.09.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: 9f128502c17a79889c05d02c156cf169e9e34690 # HEAD of "master" as of 25.08.2016
nova_lxd_git_install_branch: f81277ab66bed71a9c37dc8df99eface79e6156f # HEAD of "master" as of 12.09.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: 8f8f817d779b4eee22a2ecda3dc8d7344facd7c6 # HEAD of "master" as of 15.08.2016
sahara_git_install_branch: 5eeeab432b95f59b2a1c2db85f1f1a297bd22668 # HEAD of "master" as of 12.09.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: e7242af29afc504a8e5a6972c99753b0389f3e89 # HEAD of "master" as of 25.08.2016
swift_git_install_branch: d5e484e692c05c5f04069b181a5e4037239bc57c # HEAD of "master" as of 12.09.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: 4ce008e8ffe7d56b23738e6699b591ee6734a828 # HEAD of "master" as of 25.08.2016
ironic_git_install_branch: 0e15d37fcffc1e8ee2488089f2ca414eaebd4ed2 # HEAD of "master" as of 12.09.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: abafc6ef1cb8b5168f8b70366f6731f461f2778d # HEAD of "master" as of 25.08.2016
magnum_git_install_branch: 318a7875eed6d7261d5089d8ba035073c510136a # HEAD of "master" as of 12.09.2016
magnum_git_dest: "/opt/magnum_{{ magnum_git_install_branch | replace('/', '_') }}"
magnum_git_project_group: magnum_all
## Rally service
rally_git_repo: https://git.openstack.org/openstack/rally
rally_git_install_branch: 16393c0e4a2d1a4c3363b280382e12d8ad95f258 # HEAD of "master" as of 25.08.2016
rally_git_install_branch: e6f4dafc9a3a788c3388abad32269a38f4809123 # HEAD of "master" as of 12.09.2016
rally_git_dest: "/opt/rally_{{ rally_git_install_branch | replace('/', '_') }}"
rally_git_project_group: utility_all

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

@ -14,9 +14,9 @@
# limitations under the License.
calico_git_repo: https://github.com/projectcalico/calico
calico_git_install_branch: 209097045483dfc3371457b7691fabc0d780787f # HEAD of "master" as of 25.08.2016
calico_git_install_branch: a2daf3725e33a76bdb01c0311d5827f159969a29 # HEAD of "master" as of 12.09.2016
calico_git_project_group: neutron_all
networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
networking_calico_git_install_branch: 63c1b15774029e068fedb109dea50dcf6a9efa37 # HEAD of "master" as of 25.08.2016
networking_calico_git_install_branch: f162ecbb48685946934681f097b5a164b4fa6243 # HEAD of "master" as of 12.09.2016
networking_calico_git_project_group: neutron_all

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

@ -36,7 +36,7 @@ rsyslog_client_package_state: "{{ package_state }}"
# These pins are updated through the sources-branch-updater script
pip_packages:
- pip==8.1.2
- setuptools==26.0.0
- setuptools==27.1.2
- wheel==0.29.0
pip_links:

2
scripts/scripts-library.sh
View File

@ -21,7 +21,7 @@ MAX_RETRIES=${MAX_RETRIES:-5}
REPORT_DATA=${REPORT_DATA:-""}
ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-" -e 'gather_facts=False' "}
STARTTIME="${STARTTIME:-$(date +%s)}"
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==26.0.0 wheel==0.29.0 '}
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==27.1.2 wheel==0.29.0 '}
# The default SSHD configuration has MaxSessions = 10. If a deployer changes
# their SSHD config, then the ANSIBLE_FORKS may be set to a higher number. We

4
scripts/sources-branch-updater.sh
View File

@ -118,9 +118,9 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE}); do
find ${os_repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \
bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/templates/\$(basename \${name}).j2\"" \;
# Tweak the rootwrap conf filters_path
# Tweak the rootwrap conf filters_path (for os_neutron only)
find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \
sed -i.bak "s|filters_path=/etc/neutron|filters_path={{ ${repo_name}_conf_dir }}" {} \;
sed -i.bak "s|filters_path=/etc/neutron|filters_path={{ ${repo_name}_conf_dir }}|" {} \;
# Tweak the rootwrap conf exec_dirs
find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \