Fix role SHA's for Ocata-2 release

This patch includes a SHA update, which has been tested as working in patch https://review.openstack.org/#/c/410433/ which was not yet merged. NB: We are still leaving the Ceilometer upstream SHA at HEAD as of 8.11.2016 due to https://bugs.launchpad.net/ceilometer/+bug/1643821 Change-Id: I6b60adca4e66550c3f52a32359bfc5e247cda661
2016-12-14 09:54:41 +00:00 · 2016-12-14 09:54:41 +00:00 · a2e3d22a07
commit a2e3d22a07
parent a3c8f8f7b5
31 changed files with 227 additions and 87 deletions
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@ -1,172 +1,172 @@
 - name: apt_package_pinning
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: master
+  version: 645a103433095f55185f2ee68f543b14b5ae2eed
 - name: pip_install
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: master
+  version: 379048a8f470d5320a704fb014b0d1b7e2373599
 - name: galera_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: master
+  version: 5d1b029aec191f3293230e2d122b6fb671668943
 - name: galera_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: master
+  version: 3a8ea7d81a29ef6099367622e00f5bd3fe839622
 - name: ceph_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: master
+  version: 4a096dfab5f9f2a6099d081543f672b8d0760060
 - name: haproxy_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: master
+  version: 76640281b63c1150a51c471e1d784e5788b1e637
 - name: keepalived
  scm: git
  src: https://github.com/evrardjp/ansible-keepalived
-  version: master
+  version: 2.3.0
 - name: lxc_container_create
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: master
+  version: b37b1e8fde1d88b45145ef3a8c961a44deb77989
 - name: lxc_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: master
+  version: 1eb088d49a74db2405c931eb4399e039a1593dec
 - name: memcached_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: master
+  version: a15eb19c23668627a5ce12eeedc59ccd76f755a1
 - name: openstack-ansible-security
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-security
-  version: master
+  version: 1cf9fba0d3d1caaafc00727c5b374fd5bf028bd3
 - name: openstack_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: master
+  version: c0493b50784f24e063ee49eb05d981cd0d4c19ea
 - name: os_keystone
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: master
+  version: d180506a583ac624ca192460c5a373ed3c2c3c47
 - name: openstack_openrc
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: master
+  version: 0e0401b8b5f4c1ed6509e4457322f08ddd8e4e98
 - name: os_aodh
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: master
+  version: 9dc5cfa004a8658b9e822ea91e16d96deece4cb2
 - name: os_barbican
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: master
+  version: 010c9c2b827ea9d53be4f09d857ad81e285222eb
 - name: os_ceilometer
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: master
+  version: ae5fdb83db53b44282b278a2f4b6197261de7524
 - name: os_cinder
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: master
+  version: 6b4ec4f02e81fb0a2dbb1e62bffdcb7fc6feadcf
 - name: os_glance
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: master
+  version: 786102c8be8244dfd7dbac5f5bede7f247b5741f
 - name: os_gnocchi
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: master
+  version: 259cf1e63482c11fddfd3f89bc23b04a1a03686d
 - name: os_heat
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: master
+  version: bcf5e2c4da286e73ad9d6895e30bdada09b925d4
 - name: os_horizon
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: master
+  version: fe519cb41d957c26fbb2649a5a275dbabf6825a8
 - name: os_ironic
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: master
+  version: 80a027f1acc863ddbd8892e77d188b0fba71aeaf
 - name: os_magnum
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: master
+  version: 75d3b6ed44f80dababbd3de1f7392cf9e8074424
 - name: os_trove
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: master
+  version: 8b8cfcea7884a8c65876833bc1eb55c46209959d
 - name: os_neutron
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: master
+  version: 2888b365d73801c6c03c4394aac355a763d8dad7
 - name: os_nova
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: master
+  version: 3916b54297880e26716ea4e5e3f85a9546a11ec0
 - name: os_rally
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: master
+  version: d0371fe1825fed57b3155b3499f060afe3ec23cc
 - name: os_sahara
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: master
+  version: afbed4793ca0232fea2246291f1e50140ced08ca
 - name: os_swift
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: master
+  version: 06471b9977924123f7d282a0c469f2945a1090a6
 - name: os_tempest
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: master
+  version: ba17048290eb8aa25c24139ff7781e0968d91be2
 - name: plugins
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: master
+  version: 3d5f848a0704aa9c94a0c23974f8513c45989a1b
 - name: rabbitmq_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: master
+  version: 2ba0a74678ee36f17f99b97ab3d05df41f7d26be
 - name: repo_build
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: master
+  version: da7b0e120eec66903833aa6331522b536044620e
 - name: repo_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: master
+  version: bd2a838326311bd9967ff73b18a646f81c86aafc
 - name: rsyslog_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: master
+  version: f57486e1a907a37d63d77484db53544748854da9
 - name: rsyslog_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: master
+  version: 0a4e4bc0069277ebbad50566c8502f6b5e676f40
 - 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: 69e8649fdce8a2238c77ab3141e49099e6381498
--- 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==30.3.0
+setuptools==31.0.0
 wheel==0.29.0
--- 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: 4bd209d8f5447a399c41c6d7336aeb294a85f571 # HEAD of "master" as of 10.12.2016
+gnocchi_git_install_branch: fb312488dd45b12d78efc2894546129c40e184ea # HEAD of "master" as of 14.12.2016
 gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
 gnocchi_git_project_group: gnocchi_all
--- 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: e663da8c326442bad15b2b4463a4f56becbdad6e # HEAD of "master" as of 10.12.2016
+novncproxy_git_install_branch: c01b2f0259b101cd9b7fdac610ddb68a1e6d828a # HEAD of "master" as of 14.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 10.12.2016
+spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 14.12.2016
 spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
 spicehtml5_git_project_group: nova_console

--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@ -31,20 +31,20 @@

 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: d6fed3c7306548e972c0370b41a2da175f7528a7 # HEAD of "master" as of 10.12.2016
+requirements_git_install_branch: ec96adb55b5fa6937cc6ea018337e69f6a042ebf # HEAD of "master" as of 14.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: 78c62e928aaf019711bb6c97dbdb673ae8715a4b # HEAD of "master" as of 10.12.2016
+aodh_git_install_branch: b2e1cc089be47e5d9d8250184058d1bd8fdca450 # HEAD of "master" as of 14.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 10.12.2016
+barbican_git_install_branch: ea725053c0cc1875a066b67f3d758bcde698afe0 # HEAD of "master" as of 14.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: f568d09543b8e44b712e0565ca62845f1cc6f911 # HEAD of "master" as of 10.12.2016
+cinder_git_install_branch: 12eccd10f4227582885a25cbbae169a5cb4bd2ab # HEAD of "master" as of 14.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: f5a9fbe617adc50a61d6892e0feb21fe3f2f25ce # HEAD of "master" as of 10.12.2016
+designate_git_install_branch: 45b384ee9f3dea7d7d2894cf1867bc7b0ba8f512 # HEAD of "master" as of 14.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: 0d27081372c67904a70a6a0f912dcfe71ebe2d5e # HEAD of "master" as of 10.12.2016
+designate_dashboard_git_install_branch: 017d9f7b2720b3fb88ec0fa21f3c926cfecbab8b # HEAD of "master" as of 14.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: 62ea036a4a65b627ef1ce124b5275da4886e3ddd # HEAD of "master" as of 10.12.2016
+glance_git_install_branch: 472fd5206b2341f538967e04ec09e83010b084a3 # HEAD of "master" as of 14.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: 16f8bfcba7a49968113786055da8b51caafcdaed # HEAD of "master" as of 10.12.2016
+heat_git_install_branch: f72607dde6bffc09f3770c59588ce9a6aea1b6a3 # HEAD of "master" as of 14.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: b332735a0ce929691e4b575fc1716d936eceeaec # HEAD of "master" as of 10.12.2016
+horizon_git_install_branch: f565b2c7819c9041b31e66c738701a514fec212a # HEAD of "master" as of 14.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: 39eff39501ef029f07c4269a7bf3a413f3b73c6e # HEAD of "master" as of 10.12.2016
+ironic_dashboard_git_install_branch: 6517bf419c35eb7f84a95d3d118cb5821d2913bc # HEAD of "master" as of 14.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: a1c0bdfd8df9902938a822b5816e6b5a21af92d6 # HEAD of "master" as of 10.12.2016
+magnum_dashboard_git_install_branch: 538e0104ac9ec43f6e28b2009cf707c931110039 # HEAD of "master" as of 14.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 10.12.2016
+neutron_lbaas_dashboard_git_install_branch: 89a2c1b27c3eafc6a1c92b9be92cdd452a11555c # HEAD of "master" as of 14.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 10.12.2016
+sahara_dashboard_git_install_branch: 694a85c71c315ccdb3e2f2946f86ce95936ee684 # HEAD of "master" as of 14.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: 48841fdeaa53113bdc6029e504befd6ce32e74c1 # HEAD of "master" as of 10.12.2016
+keystone_git_install_branch: c30b539bda5acf80d22f98f0712e688022b4b20b # HEAD of "master" as of 14.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: c130caec752f9ca12bf7f13cd06d6fdc9dfcc6de # HEAD of "master" as of 10.12.2016
+neutron_git_install_branch: 920ddeaf58d65687dee246967bea41826cd712e3 # HEAD of "master" as of 14.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: 1a38cc929705f1bdd887718f97999c4890696d02 # HEAD of "master" as of 10.12.2016
+neutron_lbaas_git_install_branch: bc8bbc6d4c8c04b9d4fb824a15c5cbcd0b007c5b # HEAD of "master" as of 14.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 10.12.2016
+neutron_vpnaas_git_install_branch: 2ef3c0d44905d7465732630c68308b18f21c0b82 # HEAD of "master" as of 14.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: c3d3d6cd1f3e18c85ea3da37ffa0e3f7c6e055c2 # HEAD of "master" as of 10.12.2016
+neutron_fwaas_git_install_branch: f06888598b345de299cbf148448c13f2f59180c1 # HEAD of "master" as of 14.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 10.12.2016
+neutron_dynamic_routing_git_install_branch: 0980985b2f3590f60b4726a5419680a1d70f9ead # HEAD of "master" as of 14.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: 99b1a4a7b78ea50ff2a259980c7e4370729eeafc # HEAD of "master" as of 10.12.2016
+nova_git_install_branch: 199d3d81ee44b7fa79eb443468cbfc7b118c2266 # HEAD of "master" as of 14.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 10.12.2016
+nova_powervm_git_install_branch: 48d84d9ec11d77386e255f0a3cf1f74cb34f6d7f # HEAD of "master" as of 14.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: 757163cfc7f5abdc6f5464cd1441795ec140bf65 # HEAD of "master" as of 10.12.2016
+nova_lxd_git_install_branch: 3609b4f1129760ad6141de5f5bbc91424f3270ab # HEAD of "master" as of 14.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: e9c2c19f66a3e9cb48a0460e2ba3ccf46ad3de7e # HEAD of "master" as of 10.12.2016
+sahara_git_install_branch: 6a0ba541575fc3121c2000ea29fa3ebd1d378384 # HEAD of "master" as of 14.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: e67a57fb17d576239f8865910c9d56361263e0a9 # HEAD of "master" as of 10.12.2016
+swift_git_install_branch: c0640f87107d84d262c20bdc1250b805ae8f9482 # HEAD of "master" as of 14.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: f31c8c720be8b21bbcfe72666138c8018650b977 # HEAD of "master" as of 10.12.2016
+ironic_git_install_branch: 51c6d7a6edbd413d6e4fa2e71c323cc136a613ce # HEAD of "master" as of 14.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: 004f78b6ba9299d87f624e6528d82a0f2ec461c3 # HEAD of "master" as of 10.12.2016
+magnum_git_install_branch: da04fe8b1c28c139ca85219edd4b78bcc6d9d11e # HEAD of "master" as of 14.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: 1d38d9ab9d93a5d5b790191a6ed9588538f79f49 # HEAD of "master" as of 10.12.2016
+trove_git_install_branch: 8adfb7e4f27fb9daf87dda018094cc6c58089b88 # HEAD of "master" as of 14.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: 230a112ee6f5d11f31d4cf89cc7ffa9e3fd0594a # HEAD of "master" as of 10.12.2016
+trove_dashboard_git_install_branch: 61eb610cc45cbd2e2bbb1273fd146785732cadc3 # HEAD of "master" as of 14.12.2016
 trove_dashboard_git_dest: "/opt/trove_dashboard_{{ trove_dashboard_git_install_branch | replace('/', '_') }}"
 trove_dashboard_git_project_group: horizon_all
--- 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: 63746daa93694dc6a11666d7b0539fe9c3422981 # HEAD of "master" as of 10.12.2016
+tempest_git_install_branch: 3f2f0ea8c73042d5e4e0b94ccc5ed99d14167162 # HEAD of "master" as of 14.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: e8388e24f78671ffc4bd2452fc4d206718ce1237 # HEAD of "master" as of 10.12.2016
+rally_git_install_branch: e37e94243ecc463456608f364f5779f2b2b9dbeb # HEAD of "master" as of 14.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"
--- 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==30.3.0
+  - setuptools==31.0.0
  - wheel==0.29.0

 pip_links:
--- a/releasenotes/notes/compiler-packages-e110cafb5a69471e.yaml
+++ b/releasenotes/notes/compiler-packages-e110cafb5a69471e.yaml
@ -0,0 +1,6 @@
+---
+features:
+  - A new switch ``pip_install_build_packages`` is introduced to allow toggling
+    compiler and development library installation. The legacy behavior of
+    installing the compiler and development libraries is maintained as the
+    switch is enabled by default.
--- a/releasenotes/notes/galera-client-mariadb-10-1-a90e0d2a89d6e76b.yaml
+++ b/releasenotes/notes/galera-client-mariadb-10-1-a90e0d2a89d6e76b.yaml
@ -0,0 +1,5 @@
+---
+upgrade:
+  - The galera_client role now installs MariaDB client version 10.1.
+  - For systems using the APT package manager, the sources file for
+    the MariaDB repo now has a consistent name, 'MariaDB.list'.
--- a/releasenotes/notes/galera-client-package-install-fd34423e293f5d8b.yaml
+++ b/releasenotes/notes/galera-client-package-install-fd34423e293f5d8b.yaml
@ -0,0 +1,9 @@
+---
+features:
+  - The ``galera_client_package_install`` option can now
+    be specified to handle whether packages are installed
+    as a result of the ``openstack-ansible-galera_client``
+    role running. This will default to ``true``, but can be
+    set to ``false`` to prevent package installs. This is
+    useful when deploying the ``my.cnf`` client configuration
+    file on hosts that already have Galera installed.
--- a/releasenotes/notes/galera-server-mariadb-10-1-8620e7eadafb6e8f.yaml
+++ b/releasenotes/notes/galera-server-mariadb-10-1-8620e7eadafb6e8f.yaml
@ -0,0 +1,10 @@
+---
+upgrade:
+  - The galera_server role now installs MariaDB server version 10.1.
+  - For systems using the APT package manager, the sources files for
+    the MariaDB and Percona repos now have consistent names,
+    'MariaDB.list' and 'Percona.list'.
+  - The ``galera_mariadb_apt_server_package`` and ``galera_mariadb_yum_server_package``
+    variables have been renamed to ``galera_mariadb_server_package``.
+  - The ``galera_apt_repo_url`` and ``galera_yum_repo_url`` variables have been renamed
+    to ``galera_repo_url``.
--- a/releasenotes/notes/glance-swift-store-auth-insecure-1b69e1e3e9ba0b30.yaml
+++ b/releasenotes/notes/glance-swift-store-auth-insecure-1b69e1e3e9ba0b30.yaml
@ -0,0 +1,7 @@
+---
+features:
+  - Set the ``glance_swift_store_auth_insecure`` variable
+    to override the ``swift_store_auth_inscure`` value in
+    ``/etc/glance/glance-api.conf``. Set this value when
+    using an external Swift store that does not have the
+    same ``insecure`` setting as the local Keystone.
--- a/releasenotes/notes/ironic-neutron-network-support-669c382ea8bd3b98.yaml
+++ b/releasenotes/notes/ironic-neutron-network-support-669c382ea8bd3b98.yaml
@ -0,0 +1,17 @@
+features:
+  - Add support for ``neutron`` as an
+    ``enabled_network_interface``.
+  - The ``ironic_neutron_provisioning_network_name`` and
+    ``ironic_neutron_cleaning_network_name`` variable can
+    be set to the name of the neutron network to use for
+    provisioning and cleaning. The ansible tasks will
+    determine the appropriate UUID for that network.
+    Alternatively,
+    ``ironic_neutron_provisioning_network_uuid`` or
+    ``ironic_neutron_cleaning_network`` can be used to
+    directly specify the UUID of the networks. If both
+    ``ironic_neutron_provisioning_network_name`` and
+    ``ironic_neutron_provisioning_network_uuid`` are
+    specified, the specified UUID will be used.
+    If only the provisioning network is specified, the
+    cleaning network will default to the same network.
--- a/releasenotes/notes/lxc_cache_environment-f14701a7f8f4b8ca.yaml
+++ b/releasenotes/notes/lxc_cache_environment-f14701a7f8f4b8ca.yaml
@ -0,0 +1,5 @@
+---
+features:
+  - The variable ``lxc_cache_environment`` has been added. This dictionary
+    can be overridden by deployers to set HTTP proxy environment variables that
+    will be applied to all lxc container download tasks.
--- a/releasenotes/notes/openstack-release-file-changes-ef4b28d46378fd7a.yaml
+++ b/releasenotes/notes/openstack-release-file-changes-ef4b28d46378fd7a.yaml
@ -0,0 +1,19 @@
+---
+features:
+  - The copy of the ``/etc/openstack-release`` file is now optional.
+    To disable the copy of the file, set ``openstack_distrib_file``
+    to ``no``.
+  - The location of the ``/etc/openstack-release`` file placement
+    can now be changed. Set the variable ``openstack_distrib_file_path``
+    to place it in a different path.
+upgrade:
+  - |
+    The variables used to produce the ``/etc/openstack-release`` file
+    have been changed in order to improve consistency in the name
+    spacing according to their purpose.
+
+    ``openstack_code_name`` --> ``openstack_distrib_code_name``
+    ``openstack_release`` --> ``openstack_distrib_release``
+
+    Note that the value for ``openstack_distrib_release`` will
+    be taken from the variable ``openstack_release`` if it is set.
--- a/releasenotes/notes/os-keystone-zero-downtime-upgrade-5f19ab84183490b9.yaml
+++ b/releasenotes/notes/os-keystone-zero-downtime-upgrade-5f19ab84183490b9.yaml
@ -0,0 +1,5 @@
+---
+features:
+  - The os_keystone role now performs a rolling upgrade
+    without downtime during installation. This process
+    is documented `here <http://docs.openstack.org/developer/keystone/upgrading.html#upgrading-without-downtime>`__.
--- a/releasenotes/notes/os_aodh-centos-support-6817cfd617e83bec.yaml
+++ b/releasenotes/notes/os_aodh-centos-support-6817cfd617e83bec.yaml
@ -0,0 +1,3 @@
+---
+features:
+  - CentOS7/RHEL support has been added to the os_aodh role.
--- a/releasenotes/notes/os_gnocchi-centos-support-d86d5e8269789a77.yaml
+++ b/releasenotes/notes/os_gnocchi-centos-support-d86d5e8269789a77.yaml
@ -0,0 +1,3 @@
+---
+features:
+  - CentOS7/RHEL support has been added to the os_gnocchi role.
--- a/releasenotes/notes/os_heat-centos-support-1987176097125805.yaml
+++ b/releasenotes/notes/os_heat-centos-support-1987176097125805.yaml
@ -0,0 +1,3 @@
+---
+features:
+  - CentOS7/RHEL support has been added to the os_heat role.
--- a/releasenotes/notes/os_horizon-centos-support-8070b736874602ee.yaml
+++ b/releasenotes/notes/os_horizon-centos-support-8070b736874602ee.yaml
@ -0,0 +1,3 @@
+---
+features:
+  - CentOS7/RHEL support has been added to the os_horizon role.
--- a/releasenotes/notes/proxy-apt-cacher-ng-1bedb761e2db04b8.yaml
+++ b/releasenotes/notes/proxy-apt-cacher-ng-1bedb761e2db04b8.yaml
@ -0,0 +1,9 @@
+---
+upgrade:
+  - The variable ``proxy_env_url`` is now used by the apt-cacher-ng jinja2
+    template to set up an HTTP/HTTPS proxy if needed.
+fixes:
+  - The apt-cacher-ng daemon does not use the proxy server specified in
+    environment variables. The proxy server specified in the
+    ``proxy_env_url`` variable is now set inside the apt-cacher-ng
+    configuration file.
--- a/releasenotes/notes/support-powervm-rmc-dedce9da5fdd1bea.yaml
+++ b/releasenotes/notes/support-powervm-rmc-dedce9da5fdd1bea.yaml
@ -0,0 +1,7 @@
+---
+fixes:
+  - Setup for the PowerVM driver was not properly configuring the system
+    to support RMC configuration for client instances. This fix introduces
+    an interface template for PowerVM that properly supports mixed IPV4/IPV6
+    deploys and adds documentation for PowerVM RMC. For more information see
+    bug 1643988.
--- a/releasenotes/notes/swift-pypy-gc-options-663fecdf1e013a23.yaml
+++ b/releasenotes/notes/swift-pypy-gc-options-663fecdf1e013a23.yaml
@ -0,0 +1,10 @@
+---
+features:
+  - When using the pypy python interpreter you can configure the garbage
+    collection (gc) settings for pypy. Set the minimum GC value using the
+    ``swift_pypy_gc_min`` variable. GC will only happen when the memory
+    size is above this value. Set the maximum GC value using the
+    ``swift_pypy_gc_max`` variable. This is the maximum memory heap size
+    for pypy.
+    Both variables are not defined by default, and will only be used if
+    the values are defined and ``swift_pypy_enabled`` is set to ``True``.
--- a/releasenotes/notes/swift-pypy-support-9706519c4b88a571.yaml
+++ b/releasenotes/notes/swift-pypy-support-9706519c4b88a571.yaml
@ -5,7 +5,7 @@ features:
    performance without the core code modifications. These changes have
    been implemented using the documentation provided by Intel and
    Swiftstack. Notes about the performance increase can be seen
-    `here <https://software.intel.com/en-us/blogs/2016/05/06/doubling-the-performance-of-openstack-swift-with-no-code-changes>`_.
+    `here <https://software.intel.com/en-us/blogs/2016/05/06/doubling-the-performance-of-openstack-swift-with-no-code-changes>`__.
 upgrade:
  - A new option `swift_pypy_enabled` has been added to enable or
    disable the pypy interpreter for swift. The default is "false".
--- a/releasenotes/notes/swift-tempauth-configuration-7f710a5e2a1af67f.yaml
+++ b/releasenotes/notes/swift-tempauth-configuration-7f710a5e2a1af67f.yaml
@ -0,0 +1,8 @@
+---
+features:
+  - Swift tempauth users now be specified. The
+    ``swift_tempauth_users`` variable can be defined as a list
+    of tempauth users, and their permissions. You will still
+    need to specify the appropriate Swift middleware using the
+    ``swift_middleware_list`` variable, in order to utilise
+    tempauth.
--- a/releasenotes/notes/swift-versioned-writes-middleware-0b529e3cf2fb493d.yaml
+++ b/releasenotes/notes/swift-versioned-writes-middleware-0b529e3cf2fb493d.yaml
@ -0,0 +1,8 @@
+---
+features:
+  - Swift ``versioned_writes`` middleware is added to the
+    pipeline by default. Additionally the
+    ``allow_versioned_writes`` settings in the middleware
+    configuration is set to ``True``. This follows the
+    Swift defaults, and enables the use of the
+    ``X-History-Location`` metadata Header.
--- a/releasenotes/notes/var-rename-required-pip-packages-632851ef8137a4a1.yaml
+++ b/releasenotes/notes/var-rename-required-pip-packages-632851ef8137a4a1.yaml
@ -0,0 +1,5 @@
+---
+upgrade:
+  - The variable ``gnocchi_required_pip_packages`` was incorrectly named
+    and has been renamed to ``gnocchi_requires_pip_packages`` to match
+    the standard across all roles.
--- a/releasenotes/notes/volume_clear_shred_removed-aa0b0e96d70a0221.yaml
+++ b/releasenotes/notes/volume_clear_shred_removed-aa0b0e96d70a0221.yaml
@ -0,0 +1,5 @@
+---
+upgrade:
+  - The ``cinder`` project removed the ``shred`` value for the
+    ``volume_clear`` option. The default for the ``os_cinder``
+    OpenStack-Ansible role has changed to ``zero``.
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@ -5,7 +5,6 @@
 .. toctree::
   :maxdepth: 1

-   liberty
   mitaka
   newton
   unreleased
--- a/releasenotes/source/liberty.rst
+++ b/releasenotes/source/liberty.rst
@ -1,6 +0,0 @@
-============================
-Liberty Series Release Notes
-============================
-
-.. release-notes::
-   :branch: origin/liberty
--- 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==30.3.0 wheel==0.29.0 '}
+PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==31.0.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