From ec125a3db0f42207767392cc565ea36f17f94847 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 6 Oct 2016 14:44:43 +0100 Subject: [PATCH] Update all SHAs for Ocata 2016-10-12 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. The repo_server role SHA is not set to 'master' due to bug 1632847. Related-Bug: #1632847 Change-Id: I3015b76905ab14c9929a55a31ac552ac41cad7c6 --- ansible-role-requirements.yml | 82 +++++++++---------- global-requirement-pins.txt | 2 +- playbooks/defaults/repo_packages/gnocchi.yml | 2 +- .../defaults/repo_packages/nova_consoles.yml | 4 +- .../repo_packages/openstack_services.yml | 50 +++++------ .../repo_packages/openstack_testing.yml | 4 +- .../defaults/repo_packages/projectcalico.yml | 4 +- playbooks/inventory/group_vars/all.yml | 4 +- scripts/scripts-library.sh | 2 +- scripts/sources-branch-updater.sh | 2 +- .../templates/user_variables.aio.yml.j2 | 9 ++ 11 files changed, 87 insertions(+), 78 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index dcf7af3c93..f5410abc0b 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -1,164 +1,164 @@ - name: apt_package_pinning scm: git src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning - version: b158dadd1338bfa09620df3ab3c2985a12f7969e + version: master - name: pip_install scm: git src: https://git.openstack.org/openstack/openstack-ansible-pip_install - version: 03a71eecc8a6cb1b1026b17bdf500a980014c836 + version: master - name: galera_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-galera_client - version: 13a8fce22a00b79c39d9628313dbea889eacf925 + version: master - name: galera_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-galera_server - version: 74ac0dc33e244c5448342ad944059be3567bc499 + version: master - name: ceph_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-ceph_client - version: 2c70bace36da641ad582bdc0c4a86796c5fc0b5a + version: master - name: haproxy_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server - version: 6bf9f725022412e3bc1e8677343c460a4e2a2ddc + version: master - name: keepalived scm: git src: https://github.com/evrardjp/ansible-keepalived - version: 2.1.1 + version: master - name: lxc_container_create scm: git src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create - version: edb14fb1dc52f3f9728944990a81702857fec728 + version: master - name: lxc_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts - version: d1d87b8f12669a7f96e1ff60da561ac28b6b2630 + version: master - name: memcached_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-memcached_server - version: e16ddfd17ad9771230de41aa58e72ef46123443a + version: master - name: openstack-ansible-security scm: git src: https://git.openstack.org/openstack/openstack-ansible-security - version: f460a976513281a96c20745419ae915ff5062533 + version: master - name: openstack_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts - version: e6240591f366ab16d0a01bb6e578ebf00c974de6 + version: master - name: os_keystone scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_keystone - version: 0bbacf63ba98e56616c351e218f6b59e55c849ac + version: master - name: openstack_openrc scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc - version: f73263b6ffbaab128c674b24b5c0114a162b216f + version: master - name: os_aodh scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_aodh - version: 5845161e1544f1ea4cb070abd195c821d2d520bd + version: master - name: os_ceilometer scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer - version: 8818c7ac9ea3ac0de7c5bb1d783e2dcc4bdf77c2 + version: master - name: os_cinder scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_cinder - version: ac5913b888f0430355622852406ad70edaea49b1 + version: master - name: os_glance scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_glance - version: 8d00fe10692830299057b0c83f45343c85f23ace + version: master - name: os_gnocchi scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi - version: 387a289b290f9a3f241c7622fc322fda373ae674 + version: master - name: os_heat scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_heat - version: f71a7a83cd1f61e15a820f38c707f51489a18da3 + version: master - name: os_horizon scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_horizon - version: 19b8c679e42ab54b7b72e3f80b239a43f5e20a89 + version: master - name: os_ironic scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ironic - version: b0fa2aa408e52879b6e7697f19e14d9b773995e7 + version: master - name: os_magnum scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_magnum - version: 3475d51c5b5f73d1cf6bc66bdfd1e8f6f7e7e5ff + version: master - name: os_trove scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_trove - version: 252822cfc2950c54059103eeccfab1daacdda64d + version: master - name: os_neutron scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_neutron - version: d2adbdded42ed7dd41e61935ef193972c534591a + version: master - name: os_nova scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_nova - version: 43485eede895d3fd6758ce710b41c065d88c8aa4 + version: master - name: os_rally scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_rally - version: b652896a76fbf64be8807eca8fab141f1addee5d + version: master - name: os_sahara scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_sahara - version: 1ac57433a2234b4f945e82a8d2a51948e51b984f + version: master - name: os_swift scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_swift - version: 9525418413dacc9e86fa8454b479017b0cef6aad + version: master - name: os_tempest scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_tempest - version: 882112cd75ed90e4cad129c7c71e61949b17547e + version: master - name: plugins scm: git src: https://git.openstack.org/openstack/openstack-ansible-plugins - version: 544adfe6863b4291c04b955c5e4b8e6aa5351b88 + version: master - name: rabbitmq_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server - version: 811173b87d38a981ddf926765e43b3a72eff5351 + version: master - name: repo_build scm: git src: https://git.openstack.org/openstack/openstack-ansible-repo_build - version: 6c53adadd62bb49d44e724d89d8212dffd94918b + version: master - name: repo_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-repo_server - version: 452f08fa8e78d3f1b3b4f8d3315000491198b460 + version: 9aafde635d1c9973e52925b235dbf0500622f0f1 - name: rsyslog_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client - version: a1cb34b9b6a6a1589781f04f7cf8220075d1f782 + version: master - name: rsyslog_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server - version: 2d196fb8b3b9a01c8a4d495e2f8ccdf121b809be + version: master - name: sshd scm: git src: https://github.com/willshersystems/ansible-sshd - version: 0.4.5 + version: master - name: bird scm: git src: https://github.com/logan2211/ansible-bird - version: f041285321e3fb65fc652a9d82d43d2a5ccb8937 + version: master - name: etcd scm: git src: https://github.com/logan2211/ansible-etcd - version: '1.0' + version: master - name: unbound scm: git src: https://github.com/logan2211/ansible-unbound - version: '1.0' + version: master - name: resolvconf scm: git src: https://github.com/logan2211/ansible-resolvconf - version: '1.1' + version: master diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index b1aa0b5961..14b5b0045f 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==27.3.0 +setuptools==28.3.0 wheel==0.29.0 diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml index 038ce7e8fa..6bbdd538e0 100644 --- a/playbooks/defaults/repo_packages/gnocchi.yml +++ b/playbooks/defaults/repo_packages/gnocchi.yml @@ -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: c6b2c5185c67038545759aef067198207756bad0 # HEAD of "stable/3.0" as of 27.09.2016 +gnocchi_git_install_branch: 20176761cfe7816204bf397ca319a2559b26d2c9 # HEAD of "master" as of 12.10.2016 gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}" gnocchi_git_project_group: gnocchi_all diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/playbooks/defaults/repo_packages/nova_consoles.yml index bac1e69f71..405cc5cfa2 100644 --- a/playbooks/defaults/repo_packages/nova_consoles.yml +++ b/playbooks/defaults/repo_packages/nova_consoles.yml @@ -27,13 +27,13 @@ ## NOVNC from source novncproxy_git_repo: https://github.com/kanaka/novnc -novncproxy_git_install_branch: 33e1462999d78bafff55be9723a90c6498d2d9e8 # HEAD of "master" as of 20.09.2016 +novncproxy_git_install_branch: 00df30999b88803f65f1c83cf278ede4b5195e1e # HEAD of "master" as of 12.10.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 20.09.2016 +spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 12.10.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 28e68704ad..e59df3fcff 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,159 +31,159 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: d8a038d8241ea64ee87eb3387e52f5d42473133e # HEAD of "stable/newton" as of 27.09.2016 +requirements_git_install_branch: a3ffa5b499f91fd301d9de4e73caea55a1950d93 # HEAD of "master" as of 12.10.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: bb5103e567de04fae62dd10380739455712a7b3c # HEAD of "stable/newton" as of 27.09.2016 +aodh_git_install_branch: e8eafdbba72b9a1f35c765d85ab4d4fa90daf662 # HEAD of "master" as of 12.10.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: a3931b08f633908eb65cb2705afa465bed3fbbb5 # HEAD of "stable/newton" as of 27.09.2016 +ceilometer_git_install_branch: a3f4a777336c413a214364af80a3880f27ea5e04 # HEAD of "master" as of 12.10.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: 17fb94499d0e2ff6a751212aece7479b7cc26abc # HEAD of "stable/newton" as of 27.09.2016 +cinder_git_install_branch: 14899a9a8e828c1765e3aa95a3f4286ef8094709 # HEAD of "master" as of 12.10.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: e32be7e0b3dd430529d6423266f518b8c7f5d80a # HEAD of "stable/newton" as of 27.09.2016 +glance_git_install_branch: 7a89cf7d26c478f7400a3d8ab27ad6429a299deb # HEAD of "master" as of 12.10.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: dd707bc997715365dc76a3decea7b4f8d658375f # HEAD of "stable/newton" as of 27.09.2016 +heat_git_install_branch: f2182e12fa0ae3510cf2a4569f3f2a9e495f2350 # HEAD of "master" as of 12.10.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: d9c214eb57adb445eb4b19d0b4355188200377a2 # HEAD of "stable/newton" as of 27.09.2016 +horizon_git_install_branch: 5f090f8aaef27e8717add733fcec7b155aa5d909 # HEAD of "master" as of 12.10.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: 94b0d6cf31393e563c622d93f82b79a3984085d1 # HEAD of "master" as of 27.09.2016 +ironic_dashboard_git_install_branch: 83bd7d2fda378287451c653cf6b5fa30cc0d022e # HEAD of "master" as of 12.10.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: 0d705f942e9767b1992ac09d7e5d06638bf24dc3 # HEAD of "stable/newton" as of 27.09.2016 +magnum_dashboard_git_install_branch: c8acaa3dbe471f3c7ed0402ee7bba1293797f38a # HEAD of "master" as of 12.10.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: c2ee6fc9e8624a79ebbe7963b6353b6f19ef28c4 # HEAD of "master" as of 27.09.2016 +neutron_lbaas_dashboard_git_install_branch: a4f7818d58ff223dbee10be64829b9209648040d # HEAD of "master" as of 12.10.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: fdd3a7518be1d4d11475355b7deab77c054ed246 # HEAD of "stable/newton" as of 27.09.2016 +sahara_dashboard_git_install_branch: 38f5ccccbbe13470a47909aedfddbdcd31dc674b # HEAD of "master" as of 12.10.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: b3fae7724db797c911bedec1e9ab1ded982691c5 # HEAD of "stable/newton" as of 27.09.2016 +keystone_git_install_branch: 8a32c44657f1f4cc1e1e424f6162be3394030ea9 # HEAD of "master" as of 12.10.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: 20bb7be8289647ec4649a79a85753ec83a99e0c6 # HEAD of "stable/newton" as of 27.09.2016 +neutron_git_install_branch: a33d1eacfcd87b59bb0f51150ac27e18a78b219a # HEAD of "master" as of 12.10.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: 65287382f2f5d9f55d0f12e51a689f5229863c6b # HEAD of "stable/newton" as of 27.09.2016 +neutron_lbaas_git_install_branch: 75cecafff3b6cf41fd74caea5cd2f7fe52af63e7 # HEAD of "master" as of 12.10.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: 89dac51538b711d8e966d4a4a50f9cdfafa92fc5 # HEAD of "stable/newton" as of 27.09.2016 +neutron_vpnaas_git_install_branch: ed5b17add9268f2f31657906ded31710885125c7 # HEAD of "master" as of 12.10.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: 7345510f36d26863c25ba5737b0057b78060d2ad # HEAD of "stable/newton" as of 27.09.2016 +neutron_fwaas_git_install_branch: 9cd48703bb4b89bb92f9e44ae28ae0e839c0428a # HEAD of "master" as of 12.10.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: 2b27679fb6d690e6f65a98dfa2828bc367aa30ad # HEAD of "stable/newton" as of 27.09.2016 +neutron_dynamic_routing_git_install_branch: 0e5dda2a28ad2d4d0385a06b2499ce68852252b3 # HEAD of "master" as of 12.10.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: 7c52bd624654c8c4329fb6007a2f30ac6c18e1db # HEAD of "stable/newton" as of 27.09.2016 +nova_git_install_branch: ddbbf5782759c5b437c8a7bbb9291d038bcf915b # HEAD of "master" as of 12.10.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: 1373fad17a05232c887f7c15f3abb288a75e1f21 # HEAD of "stable/newton" as of 27.09.2016 +nova_powervm_git_install_branch: 6c6c355705d06e540d5bcb9d0368849fc3baea64 # HEAD of "master" as of 12.10.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: 1153d1f129d020bf14e15e5a89176ae974f13ca1 # HEAD of "master" as of 27.09.2016 +nova_lxd_git_install_branch: c3ed3574a5c0aa59c9e68e6ac4ab2bff1fce3ca0 # HEAD of "master" as of 12.10.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: cbd51fa579274dd4621708286ac8a2289aabfc41 # HEAD of "stable/newton" as of 27.09.2016 +sahara_git_install_branch: b900c5bf550f99bfe63f3aa58aa6296c6c006c80 # HEAD of "master" as of 12.10.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: 2f880f04486ea1b1e15e8794707a7b61ae57d965 # HEAD of "master" as of 27.09.2016 +swift_git_install_branch: b859b85eb0ff63e91ab64505115a3ce2e0deb056 # HEAD of "master" as of 12.10.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: 0f85f0b7a3b06204153289a230fa8ace8b946635 # HEAD of "stable/newton" as of 27.09.2016 +ironic_git_install_branch: fd089b0a01bf9986e244584d32f38f054bf3ac41 # HEAD of "master" as of 12.10.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: de227ba88ccc2936bcab09905345f23b42f57964 # HEAD of "stable/newton" as of 27.09.2016 +magnum_git_install_branch: ba11900215e779eb8042dbdf8f942a772e5a4adc # HEAD of "master" as of 12.10.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: 41f3dd6920eb60d438e1542e9994319c08e44461 # HEAD of "master" as of 02.10.2016 +trove_git_install_branch: d6fabc850493bd13d647fbf1084fd092836f74ee # HEAD of "master" as of 12.10.2016 trove_git_dest: "/opt/trove_{{ trove_git_install_branch | replace('/', '_') }}" trove_git_project_group: trove_all diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml index d333188bf6..9fa9889ed3 100644 --- a/playbooks/defaults/repo_packages/openstack_testing.yml +++ b/playbooks/defaults/repo_packages/openstack_testing.yml @@ -27,13 +27,13 @@ ## Tempest service tempest_git_repo: https://git.openstack.org/openstack/tempest -tempest_git_install_branch: 304802830b56354a83bad86925851107411d45ec # HEAD of "master" as of 21.09.2016 +tempest_git_install_branch: d9deee8cf2754f7677a41d785d6fc7e57fdc994d # HEAD of "master" as of 12.10.2016 tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" tempest_git_project_group: utility_all ## Rally service rally_git_repo: https://git.openstack.org/openstack/rally -rally_git_install_branch: f1a9abd5c9922b3d67d1e69a80cf96eda2bdac59 # HEAD of "master" as of 21.09.2016 +rally_git_install_branch: edb093d9be82f1bd1cd853712c911ff20b2a02bf # HEAD of "master" as of 12.10.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 c51f8f1422..dabf47a72a 100644 --- a/playbooks/defaults/repo_packages/projectcalico.yml +++ b/playbooks/defaults/repo_packages/projectcalico.yml @@ -15,9 +15,9 @@ calico_git_repo: https://github.com/projectcalico/felix calico_git_package_name: calico -calico_git_install_branch: 1.4.0 # current tag as of 22.07.2016 +calico_git_install_branch: 33ed01220f09a49462b707d8b2f58cf206f9af34 # HEAD of "master" as of 12.10.2016 calico_git_project_group: neutron_all networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico -networking_calico_git_install_branch: 1.2.0 # current tag as of 01.08.2016 +networking_calico_git_install_branch: 2afdf3e427555cbdf0dd0c583f1d70d92bf39748 # HEAD of "master" as of 12.10.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 92fcb8a0b0..92e697327f 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -14,7 +14,7 @@ # limitations under the License. ## OpenStack Source Code Release -openstack_release: 14.0.0 +openstack_release: master ## Verbosity Options debug: False @@ -39,7 +39,7 @@ rsyslog_client_package_state: "{{ package_state }}" # These pins are updated through the sources-branch-updater script pip_packages: - pip==8.1.2 - - setuptools==27.3.0 + - setuptools==28.3.0 - wheel==0.29.0 pip_links: diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index 85fa9f0a40..4d835b547a 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -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==8.1.2 setuptools==27.3.0 wheel==0.29.0 '} +PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==28.3.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 diff --git a/scripts/sources-branch-updater.sh b/scripts/sources-branch-updater.sh index 13f81b7c6e..26bf5d5793 100755 --- a/scripts/sources-branch-updater.sh +++ b/scripts/sources-branch-updater.sh @@ -270,7 +270,7 @@ fi if [[ "${OSA_BRANCH}" != "master" ]]; then echo "Updating the release version..." - currentversion=$(awk '/openstack_release/ {print $2}' playbooks/inventory/group_vars/all.yml) + currentversion=$(awk '/openstack_release:/ {print $2}' playbooks/inventory/group_vars/all.yml) # Extract the required version info major_version=$( echo ${currentversion} | cut -d. -f1 ) diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index d426292dbe..bf3497337c 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -94,3 +94,12 @@ neutron_plugin_base: - router - metering - neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2 + +# TODO(odyssey4me): +# This is in place to resolve build issues with Rally due to +# incompatibilities between its requirements and OpenStack +# upper constraints. This may be removed when +# https://review.openstack.org/385360 merges and the SHA's +# are updated to include it. +repo_build_upper_constraints_overrides: + - pycparser<2.14