diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index 8e9676d845..4e4a9b9d53 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -10,5 +10,5 @@ ### These pins are updated through the sources-branch-updater script ### ### pip==8.1.2 -setuptools==25.2.0 +setuptools==26.0.0 wheel==0.29.0 diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml index f52bb1cf57..9ef09655fc 100644 --- a/playbooks/defaults/repo_packages/openstack_other.yml +++ b/playbooks/defaults/repo_packages/openstack_other.yml @@ -27,19 +27,19 @@ ## Tempest service tempest_git_repo: https://git.openstack.org/openstack/tempest -tempest_git_install_branch: 95854ce727846110f3fc2946f3ed48f0ad189a2f # HEAD of "master" as of 15.08.2016 +tempest_git_install_branch: c68b1493c2e935db917f05523b2b7e1a6574cd4e # HEAD of "master" as of 25.08.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: da82b3426c27bf1a79f671c5825d68ab8c0c5d9f # HEAD of "master" as of 15.08.2016 +novncproxy_git_install_branch: da17d0369de93d9f879840978b6852295a456787 # HEAD of "master" as of 25.08.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 15.08.2016 +spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 25.08.2016 spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}" spicehtml5_git_project_group: nova_console diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index a2550e37fb..95e895eef2 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,153 +31,153 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: 69c3d465aa05f346185f4e22334a2bead771c66d # HEAD of "master" as of 15.08.2016 +requirements_git_install_branch: 7cc14e8d50c86210ee08929b55ef164ad4274b3b # HEAD of "master" as of 25.08.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: 66158ac1c9261db1af3c2056aac709de3831eed1 # HEAD of "master" as of 15.08.2016 +aodh_git_install_branch: 65b6542dba9e180ed1f2759f2c39db366f0404b2 # HEAD of "master" as of 25.08.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: e37ea551e96c86a9bbd71f1d030e09e8e3cc45bf # HEAD of "master" as of 15.08.2016 +ceilometer_git_install_branch: ef9da325fc355f2b048ffd826aff69e009c175ab # HEAD of "master" as of 25.08.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: 3114010d03008c358377d130e31ebb586f6a8a24 # HEAD of "master" as of 15.08.2016 +cinder_git_install_branch: 9b9ea77c659e48a261e9e966015d40996b11b8ee # HEAD of "master" as of 25.08.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: 7df813bba423f79bc163cd7fc7dd194791f31d21 # HEAD of "master" as of 15.08.2016 +glance_git_install_branch: a1f2001f992888a2040007bbd0fca3a61f399cdd # HEAD of "master" as of 25.08.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: ccfe751f274066b4c11d15901b375dc1177e1887 # HEAD of "master" as of 15.08.2016 +gnocchi_git_install_branch: d16ee417283312335e1115b948c6ca52627b8303 # HEAD of "master" as of 25.08.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: d072f6e7f195d6488d70b5246e67fdba1a5f5286 # HEAD of "master" as of 15.08.2016 +heat_git_install_branch: 90bc7ccbdac38cf22711c12e57eafa4abbf85ca8 # HEAD of "master" as of 25.08.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: 450baeed4fe74736d0f0825256f758fc4ab099c6 # HEAD of "master" as of 15.08.2016 +horizon_git_install_branch: e7b4bdfe5d576766b34bf00cea3dcbcb42436420 # HEAD of "master" as of 25.08.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: 263c3f6902f274874360d2cb702359934179308e # HEAD of "master" as of 15.08.2016 +ironic_dashboard_git_install_branch: 060f2f08b3e983b64b68211f5922b925b3d88101 # HEAD of "master" as of 25.08.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: bbdd887f9172b520ff26c4df97e6ad6fbedc8864 # HEAD of "master" as of 4.08.2016 +magnum_dashboard_git_install_branch: df2d57124bb3c7854931b811ccc12c54ee60b61e # HEAD of "master" as of 25.08.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 15.08.2016 +neutron_lbaas_dashboard_git_install_branch: aba14a4ccde177141b6314b9fafafb0868b84400 # HEAD of "master" as of 25.08.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 ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: 45369b608aea665e38ad203deb6936c1004e082d # HEAD of "master" as of 15.08.2016 +keystone_git_install_branch: 5caf5212d8843ef66e6242b51c13e63698293c1d # HEAD of "master" as of 25.08.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: e47da4edf5cee95fceea91ebc98e3acbd4fe8a66 # HEAD of "master" as of 15.08.2016 +neutron_git_install_branch: 53555192ba4adba948042ee4718eae68646ad168 # HEAD of "master" as of 25.08.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: ed3a508e2bf7cde524febc9dbdf1785885305104 # HEAD of "master" as of 15.08.2016 +neutron_lbaas_git_install_branch: f5e8ff5ae52253944dad7d8744875861ad490e0e # HEAD of "master" as of 25.08.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: 4142d812b416c3231fc2c6ab3b6e078b54495ff0 # HEAD of "master" as of 15.08.2016 +neutron_vpnaas_git_install_branch: 5fbe18b0e92985898355cacf752bde278ab6be37 # HEAD of "master" as of 25.08.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: 83f2064d1d8a9fc03819ea3d8e56835f46983a8a # HEAD of "master" as of 09.08.2016 +neutron_fwaas_git_install_branch: 151946dcb13150555eafb151dc6cc2297a6bcb8e # HEAD of "master" as of 25.08.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: c20333d37b6b4160f8a84c8d985b40eba5e5088d # HEAD of "master" as of 15.08.2016 +neutron_dynamic_routing_git_install_branch: d23f8f7db45cc2ee5c8cdbb24d70f3fdb36988ff # HEAD of "master" as of 25.08.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: 15e536518ae1a366c8a8b15d9183072050e4b6f2 # HEAD of "master" as of 15.08.2016 +nova_git_install_branch: 77f80e8150a4baa6ee3e73c8e993026e62cc52a2 # HEAD of "master" as of 25.08.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: 236fdfaa7fb8db15b109645bf89c379317e31dd8 # HEAD of "master" as of 15.08.2016 +nova_powervm_git_install_branch: 0e8fdcdf63c9fc8687a9c468a7b380f8aceead7e # HEAD of "master" as of 25.08.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: e5c3a4d28738986eea9193fae82653126a388b27 # HEAD of "master" as of 15.08.2016 +nova_lxd_git_install_branch: 9f128502c17a79889c05d02c156cf169e9e34690 # HEAD of "master" as of 25.08.2016 nova_lxd_git_dest: "/opt/nova_lxd_{{ nova_lxd_git_install_branch | replace('/', '_') }}" nova_lxd_git_project_group: nova_compute ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: 9c859ccfeeb0a3e11ba01d770d704a5c9ccda612 # HEAD of "master" as of 15.08.2016 +swift_git_install_branch: e7242af29afc504a8e5a6972c99753b0389f3e89 # HEAD of "master" as of 25.08.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: f55de1bf817fd73aa86fae6f0f8848027e2a1f01 # HEAD of "master" as of 15.08.2016 +ironic_git_install_branch: 4ce008e8ffe7d56b23738e6699b591ee6734a828 # HEAD of "master" as of 25.08.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: 4dbe7716e721ad33603bd48b6e871d0a55e4448e # HEAD of "master" as of 15.08.2016 +magnum_git_install_branch: abafc6ef1cb8b5168f8b70366f6731f461f2778d # HEAD of "master" as of 25.08.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: 6c7975cd9ac997c5efe5932f301f0fb56f00818b # HEAD of "master" as of 18.08.2016 +rally_git_install_branch: 16393c0e4a2d1a4c3363b280382e12d8ad95f258 # HEAD of "master" as of 25.08.2016 rally_git_dest: "/opt/rally_{{ rally_git_install_branch | replace('/', '_') }}" rally_git_project_group: utility_all diff --git a/playbooks/defaults/repo_packages/projectcalico.yml b/playbooks/defaults/repo_packages/projectcalico.yml index c67c6ac14f..f9c19a1d82 100644 --- a/playbooks/defaults/repo_packages/projectcalico.yml +++ b/playbooks/defaults/repo_packages/projectcalico.yml @@ -14,9 +14,9 @@ # limitations under the License. calico_git_repo: https://github.com/projectcalico/calico -calico_git_install_branch: master +calico_git_install_branch: 209097045483dfc3371457b7691fabc0d780787f # HEAD of "master" as of 25.08.2016 calico_git_project_group: neutron_all networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico -networking_calico_git_install_branch: master -networking_calico_git_project_group: neutron_all \ No newline at end of file +networking_calico_git_install_branch: 63c1b15774029e068fedb109dea50dcf6a9efa37 # HEAD of "master" as of 25.08.2016 +networking_calico_git_project_group: neutron_all diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 2a406307dd..6110fc972b 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -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==25.2.0 + - setuptools==26.0.0 - wheel==0.29.0 pip_links: diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index aa0fd22b6a..3512c292e4 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -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==25.2.0 wheel==0.29.0 '} +PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==26.0.0 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