diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 49dc8d0dfd..5bbc3ed630 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -1,188 +1,188 @@
 - name: apt_package_pinning
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: master
+  version: 4181e62d539f33c90e3276c0c6ebf6ce6f71c8c8
 - name: pip_install
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: master
+  version: 786b5b637e49fefe36fb5d317bc644afad89a165
 - name: galera_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: master
+  version: b2f4deb2ed0e9dd79d615cf49a5c3e09cdf44c9f
 - name: galera_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: master
+  version: 30c73621fa33cf9cb59d6dc5b572b999cd35d556
 - name: ceph_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: master
+  version: 722a84eb7adaada62cb8c0a6cfae42a499b0f665
 - name: haproxy_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: master
+  version: 8ae4e7b6b962c4d31e9edd995753db0a283d117b
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
-  version: master
+  version: 2.4.0
 - name: lxc_container_create
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: master
+  version: d9970fdeba081a2de97db994fca1e1ef86207ee3
 - name: lxc_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: master
+  version: 746989b07109cb880d4f3ef51e8ee47a394da4ee
 - name: memcached_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: master
+  version: 5f0defd39bb723f3b6124c9f4fa15387e6f474e1
 - name: openstack-ansible-security
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-security
-  version: master
+  version: 91a5c64c8e6330176ab1d86cf4e167a112d77222
 - name: openstack_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: master
+  version: 86c83d08d0658c17f13d3e1af0b3ac8ec1336066
 - name: os_keystone
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: master
+  version: 041445954672d4a4a433950f08f7e33d5a3df521
 - name: openstack_openrc
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: master
+  version: a19a049381370d935d58dea2d8a6eaf500437268
 - name: os_aodh
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: master
+  version: 6972fe39dc2f38e3e6406b96010dffa302cf5dcc
 - name: os_barbican
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: master
+  version: a347dcb333080de7d96931be633ce65be2d30336
 - name: os_ceilometer
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: master
+  version: 7e5d4c84cb36b9c0fa096b0f4c1065d10daac82b
 - name: os_cinder
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: master
+  version: 492e2394d4d23e77d80b7dd5d96ec8f28d56746d
 - name: os_glance
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: master
+  version: 35a848c0dabe41bdb712fb30a6a50fe34c4ab103
 - name: os_gnocchi
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: master
+  version: 219889c69d781ab12ebc307d0083d1cf576197bf
 - name: os_heat
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: master
+  version: 43b276613f16b946386055caef1289a9652d7d37
 - name: os_horizon
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: master
+  version: 3b65d22667a0d46e3504342550f178ff0e4cdb47
 - name: os_ironic
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: master
+  version: 00acb09367dabc6b18f5c68040a967eaf21e1223
 - name: os_magnum
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: master
+  version: 5f574a6107e4f0e7e080de99647e9b5594374c7f
 - name: os_trove
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: master
+  version: 17ce2cd1fe6da6ba163b3637e6a949d77caabcf4
 - name: os_neutron
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: master
+  version: db71e71c9762f811b22d85e4aee4cd764f030310
 - name: os_nova
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: master
+  version: 966ea269c9acb88052aca8982c37e0ba8a94a207
 - name: os_rally
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: master
+  version: dc9dd4f7720c7750e130bf795133bc1c7326b39a
 - name: os_sahara
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: master
+  version: 68ddfa4d80f2f1d0d1e412923e4c123370ee0382
 - name: os_swift
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: master
+  version: 195621208a9a63106ff52b50ebfefbb2caa1bba1
 - name: os_tempest
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: master
+  version: d57237c8aeb7c4af833f4d27e3af9a5537a085c2
 - name: plugins
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: master
+  version: 83df10025aa75b1580527fef650ba7639085b59d
 - name: rabbitmq_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: master
+  version: 9c09b4a0658d3d25593eaa65f30db8fd3395e5f8
 - name: repo_build
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: master
+  version: 1d0493b58ae06bf0167d1bf4dc90f274a796c80a
 - name: repo_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: master
+  version: 9c8a51c8d0ee6ecafaa6471ce2d4acf41023fb9d
 - name: rsyslog_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: master
+  version: 0dbf44a894792a3db5bcca9e0c5fb1207a4bfbc4
 - name: rsyslog_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: master
+  version: 3ca2f1e7b0d6b4935f2565586b9674247dcdaa0b
 - name: sshd
   scm: git
   src: https://github.com/willshersystems/ansible-sshd
-  version: master
+  version: 0.4.5
 - name: bird
   scm: git
   src: https://github.com/logan2211/ansible-bird
-  version: master
+  version: '1.2'
 - name: etcd
   scm: git
   src: https://github.com/logan2211/ansible-etcd
-  version: master
+  version: '1.2'
 - name: unbound
   scm: git
   src: https://github.com/logan2211/ansible-unbound
-  version: master
+  version: '1.1'
 - name: resolvconf
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
-  version: master
+  version: '1.2'
 - name: os_designate
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_designate
-  version: master
+  version: 5ba88401eb586fb0aab1c7634da7a88ce98551ff
 - name: ceph.ceph-common
   scm: git
   src: https://github.com/ceph/ansible-ceph-common
-  version: master
+  version: v2.1.6
 - name: ceph.ceph-docker-common
   scm: git
   src: https://github.com/ceph/ansible-ceph-docker-common
-  version: master
+  version: ca86fd0ef6d24aa2c750a625acdcb8012c374aa0
 - name: ceph-mon
   scm: git
   src: https://github.com/ceph/ansible-ceph-mon
-  version: master
+  version: v2.1.6
 - name: ceph-osd
   scm: git
   src: https://github.com/ceph/ansible-ceph-osd
-  version: master
+  version: v2.1.6
diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt
index decd5efdd6..a7b9a0aa1d 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==9.0.1
-setuptools==34.0.1
+setuptools==34.1.0
 wheel==0.29.0
diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml
index be7c411996..d8a175f95a 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: 908ca555f6a14547082e38e4f114926ec384a1bd # HEAD of "master" as of 24.01.2017
+gnocchi_git_install_branch: b3b49c87e866475c149343fd77408bef259c5534 # HEAD of "master" as of 02.02.2017
 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 08d402b09f..c6182bdf4b 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: 394ad22be91f7769e47b741b035f0fd51017e10d # HEAD of "master" as of 24.01.2017
+novncproxy_git_install_branch: 93c4b5caaa1445c49efaccbad5b761ab1c88dc9d # HEAD of "master" as of 02.02.2017
 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 24.01.2017
+spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 02.02.2017
 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 5084a391f5..06f5e87049 100644
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@@ -31,187 +31,187 @@
 
 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 9a3150d8908e7a1def7981a26be35c9b78a59ea6 # HEAD of "master" as of 24.01.2017
+requirements_git_install_branch: 811eb231b69a6a5a3636e5766e3e05d2028656bf # HEAD of "master" as of 02.02.2017
 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: 014319d662e4ed084aa4212f449c44bb91fdd60b # HEAD of "master" as of 24.01.2017
+aodh_git_install_branch: 2ad5fb78647f8017e9716292495609408e91b10c # HEAD of "master" as of 02.02.2017
 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: 8e1846fafff2adb991237352faa5871085ed9b5d # HEAD of "master" as of 24.01.2017
+barbican_git_install_branch: 50db78270884758664235ac20778ca953a7a810f # HEAD of "master" as of 02.02.2017
 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: c7c51b6e0db7d8164a8587b58ec995b4aa5f0706 # HEAD of "master" as of 08.11.2016 delayed due to kafka-python update
-#ceilometer_git_install_branch: fd569a98a76e990c72d584c18ee207d3a57df6e5 # HEAD of "master" as of 24.01.2017
+ceilometer_git_install_branch: 2db686275f9bbc861c7c47ae89706d11360a0c78 # HEAD of "master" as of 02.02.2017
+#ceilometer_git_install_branch: 2db686275f9bbc861c7c47ae89706d11360a0c78 # HEAD of "master" as of 02.02.2017
 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: e0bf4ce7af2e163c82f62fff6dfe400fbd5c6d42 # HEAD of "master" as of 24.01.2017
+cinder_git_install_branch: fb97be7f1009eed0b275852ef2c6ab18dadb4496 # HEAD of "master" as of 02.02.2017
 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: 8966e7166b1a5e3dc0df5504de0ba002e2ddf8e5 # HEAD of "master" as of 24.01.2017
+designate_git_install_branch: b029ac9934720fde7610b4c955c002fc70f5ae42 # HEAD of "master" as of 02.02.2017
 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: 875f6583d87fe206522f6c4f5bf53bb2828e7fc6 # HEAD of "master" as of 24.01.2017
+designate_dashboard_git_install_branch: a5bae8cc95d83701fdb99c9f2ada943038e81e0e # HEAD of "master" as of 02.02.2017
 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: d64fe8bd1bbd4be73201d4f652e16e9d47ff39d1 # HEAD of "master" as of 24.01.2017
+glance_git_install_branch: 3f7b2b68e8ee220c8918d6db3d822b6d3b839d4c # HEAD of "master" as of 02.02.2017
 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: fad23185895f65477461088e559bd13cbde38c21 # HEAD of "master" as of 24.01.2017
+heat_git_install_branch: 067fcea0c383e208c88b0d0e18a3bb8d5a7f7412 # HEAD of "master" as of 02.02.2017
 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: ab0efc05ab918d62a07be4cd47424c8e57161b87 # HEAD of "master" as of 24.01.2017
+horizon_git_install_branch: ce7dc70c7f31ce5b8de2dcf3a3fe644eb5884d58 # HEAD of "master" as of 02.02.2017
 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: a8fc5ac0c2967f44f3e559b3ef731d5bcfb7dd57 # HEAD of "master" as of 24.01.2017
+ironic_dashboard_git_install_branch: 6bc5cf3f95387cde8cb55b35ae0c415fbd8f06f2 # HEAD of "master" as of 02.02.2017
 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: 3d8b033a01dcbaf4e27550cb5e656bc3a96c1ca6 # HEAD of "master" as of 24.01.2017
+magnum_dashboard_git_install_branch: c4e9fa95b320ab497eac70c56e76ced66d4ebb3b # HEAD of "master" as of 02.02.2017
 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: debd83146fcfa84a60e39bef191d8ab8fff696a3 # HEAD of "master" as of 24.01.2017
+neutron_lbaas_dashboard_git_install_branch: d83842cf809d5e156b86071d8b288e1b7b1610c3 # HEAD of "master" as of 02.02.2017
 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: 7026575b93239f4b54c0681cb543d7aebc6e9451 # HEAD of "master" as of 24.01.2017
+sahara_dashboard_git_install_branch: dccee666aa7e48ca2d14aee6512dda998b659574 # HEAD of "master" as of 02.02.2017
 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: f7bc5bad7d63424e4494222c2988762b8e4cb4ad # HEAD of "master" as of 24.01.2017
+keystone_git_install_branch: 4c83fb0f13d0a09db7a4ca66c3b0dc2745c34c5f # HEAD of "master" as of 02.02.2017
 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: a0d05fd8cf334bd2bebe18f912ec01ac4e45d902 # HEAD of "master" as of 24.01.2017
+neutron_git_install_branch: 0e712489557b9ebe0b6d90abf54260a53987891d # HEAD of "master" as of 02.02.2017
 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: f39610dda7eb2fe1801209303995240d946e2ecf # HEAD of "master" as of 24.01.2017
+neutron_lbaas_git_install_branch: 4876dcccbf8571dda461edaca442f2ccc412cd3b # HEAD of "master" as of 02.02.2017
 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: c9e4835e0684df93b114d53a1e6541ec595afa9d # HEAD of "master" as of 24.01.2017
+neutron_vpnaas_git_install_branch: d6db1238a4950df03dfb28acabcf4df14ebfa3ac # HEAD of "master" as of 02.02.2017
 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: 8e0e639137df5b2596aff71234768ecfc294fb54 # HEAD of "master" as of 24.01.2017
+neutron_fwaas_git_install_branch: 8cfa2de66becce06f3e11bbab7562b11649e54c9 # HEAD of "master" as of 02.02.2017
 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: f74bc509bd804ebbc5249e775481ad2475788c9f # HEAD of "master" as of 24.01.2017
+neutron_dynamic_routing_git_install_branch: 24b5d7a2d7b292e2348f6d0a5b41666d0cd569c6 # HEAD of "master" as of 02.02.2017
 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: 1cbb083fe529698bc6313c7ee119a4311d835e13 # HEAD of "master" as of 24.01.2017
+nova_git_install_branch: d92e56a99decfb645a8763c844542e26f1de83a8 # HEAD of "master" as of 02.02.2017
 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: 672bf31a068eb797b836b54e0f7e05eba56f8bfd # HEAD of "master" as of 24.01.2017
+nova_powervm_git_install_branch: a79ee81010cdd87d091c8102abb0575acd366dd4 # HEAD of "master" as of 02.02.2017
 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: 9b899e71c0fe4ae2cc8a34fe78b9bf344ad402b8 # HEAD of "master" as of 24.01.2017
+nova_lxd_git_install_branch: 9b899e71c0fe4ae2cc8a34fe78b9bf344ad402b8 # HEAD of "master" as of 02.02.2017
 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: 7732780f978d9ff0d26d9ab4d4408aa2541d2aef # HEAD of "master" as of 24.01.2017
+sahara_git_install_branch: c465fa80b9b769e886ad0fb5750ed4fff17f0eaa # HEAD of "master" as of 02.02.2017
 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: 31383e57bd39143299953bdabe5dc87047a89074 # HEAD of "master" as of 24.01.2017
+swift_git_install_branch: 38cebabbebcd4a79c01830f7fc8ad2bca88dc734 # HEAD of "master" as of 02.02.2017
 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: e3a1e7bcfcb2244eb98c1abf37bbb53e5074809e # HEAD of "master" as of 24.01.2017
+ironic_git_install_branch: 217ad9d2c108ba942bbac1428cc6dd33f26ba19d # HEAD of "master" as of 02.02.2017
 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: 06b97cc7d70d199e52efec78c7ff2cdf54ae99cb # HEAD of "master" as of 24.01.2017
+magnum_git_install_branch: 25aa5b06ff7c315c4585bde43b329ba92dfe5707 # HEAD of "master" as of 02.02.2017
 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: 96f109e09a0bf0d8932d914acadaf45f084a5927 # HEAD of "master" as of 24.01.2017
+trove_git_install_branch: 61ccfc5befdff286813b4ca06a573696a7d95e83 # HEAD of "master" as of 02.02.2017
 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: 134ccf0b447adb31d18c699ccb596fc45b113fe0 # HEAD of "master" as of 24.01.2017
+trove_dashboard_git_install_branch: 9db7430f56a286fa5ebfe59dfec72c4d122b2ddb # HEAD of "master" as of 02.02.2017
 trove_dashboard_git_dest: "/opt/trove_dashboard_{{ trove_dashboard_git_install_branch | replace('/', '_') }}"
 trove_dashboard_git_project_group: horizon_all
diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml
index a392ff8c19..333da6a064 100644
--- a/playbooks/defaults/repo_packages/openstack_testing.yml
+++ b/playbooks/defaults/repo_packages/openstack_testing.yml
@@ -27,7 +27,7 @@
 
 ## Tempest service
 tempest_git_repo: https://git.openstack.org/openstack/tempest
-tempest_git_install_branch: 1b21b6662f74206b467e3a0529a48b4ad034e90b # HEAD of "master" as of 24.01.2017
+tempest_git_install_branch: f496885acbaae04ab7b13dae2f83a55edbc69d6f # HEAD of "master" as of 02.02.2017
 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: d79e4accad998717750d9eba46fe9c097844e23b # HEAD of "master" as of 24.01.2017
+rally_git_install_branch: 84ef9713e776bca156bf8da63b0ddd30afd86a9e # HEAD of "master" as of 02.02.2017
 rally_git_dest: "/opt/rally_{{ rally_git_install_branch | replace('/', '_') }}"
 rally_git_project_group: utility_all
 rally_git_install_fragments: "venvwithindex=True&ignorerequirements=True"
diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml
index ed6ea51809..0e1f9d4a8b 100644
--- a/playbooks/inventory/group_vars/all.yml
+++ b/playbooks/inventory/group_vars/all.yml
@@ -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==34.0.1
+  - setuptools==34.1.0
   - wheel==0.29.0
 
 pip_links:
diff --git a/releasenotes/notes/configurable-conntrack-max-44e3d1af4921bdf0.yaml b/releasenotes/notes/configurable-conntrack-max-44e3d1af4921bdf0.yaml
new file mode 100644
index 0000000000..b8c93a1247
--- /dev/null
+++ b/releasenotes/notes/configurable-conntrack-max-44e3d1af4921bdf0.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Deployers can set ``openstack_host_nf_conntrack_max`` to control the
+    maximum size of the netfilter connection tracking table. The default of
+    ``262144`` should be increased if virtual machines will be handling large
+    amounts of concurrent connections.
diff --git a/releasenotes/notes/ironic-oneview-drivers-support-6d9c6c5a7e7bfc36.yaml b/releasenotes/notes/ironic-oneview-drivers-support-6d9c6c5a7e7bfc36.yaml
new file mode 100644
index 0000000000..bc76662f48
--- /dev/null
+++ b/releasenotes/notes/ironic-oneview-drivers-support-6d9c6c5a7e7bfc36.yaml
@@ -0,0 +1,4 @@
+features:
+  - Added support for ironic-OneView drivers.
+    Check the documentation on how to enable
+    them.
diff --git a/releasenotes/notes/neutron-sriov-50c0099554574d01.yaml b/releasenotes/notes/neutron-sriov-50c0099554574d01.yaml
new file mode 100644
index 0000000000..d5945e909e
--- /dev/null
+++ b/releasenotes/notes/neutron-sriov-50c0099554574d01.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - Neutron SR-IOV can now be optionally deployed and configured.
+    For details about the what the service is and what it provides, see the
+    `SR-IOV Installation Guide
+    <http://docs.openstack.org/developer/openstack-ansible-os_neutron/configure-network-services.html#sr--iov-support-optional>`_
+    for more information.
diff --git a/releasenotes/notes/os_designate-centos-support-501276f049c2baff.yaml b/releasenotes/notes/os_designate-centos-support-501276f049c2baff.yaml
new file mode 100644
index 0000000000..764ae2f062
--- /dev/null
+++ b/releasenotes/notes/os_designate-centos-support-501276f049c2baff.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - CentOS7/RHEL support has been added to the os_designate role.
+
diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh
index 3036b646ee..8f9d2ff196 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==9.0.1 setuptools==34.0.1 wheel==0.29.0 '}
+PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==34.1.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