Merge "Fix SHAs for Pike milestone-3"

2017-07-26 14:47:16 +00:00 · 2017-07-26 14:47:16 +00:00 · 9220d693e9
commit 9220d693e9
parent af5c873af4 009a37ee4b
42 changed files with 398 additions and 88 deletions
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@ -1,196 +1,196 @@
 - name: ansible-hardening
  scm: git
  src: https://git.openstack.org/openstack/ansible-hardening
-  version: master
+  version: 20b6d668e88dfb23a57c45330964ec2ac1ae00eb
 - name: apt_package_pinning
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: master
+  version: dc560a65f9bbd9e867bcdf7bb9c52a95e0cfa8d5
 - name: pip_install
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: master
+  version: dd087128104b41e2e65720b611eabd2eb5b4cf99
 - name: galera_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: master
+  version: f4a1ef10a9fe4ffab81adfc0e6872ec481ae1f79
 - name: galera_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: master
+  version: 2e47ac7cfbe858c0639a95efd7bccc1a34a688db
 - name: ceph_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: master
+  version: d3cf9ebd5218851753fa500f2b41b707b1fb8262
 - name: haproxy_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: master
+  version: 22a3161441858ad6c36cffece423cf592ccfc501
 - name: keepalived
  scm: git
  src: https://github.com/evrardjp/ansible-keepalived
-  version: master
+  version: 3.0.1
 - name: lxc_container_create
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: master
+  version: b5718994f4c58b568e782ee5e9329c8dae162c99
 - name: lxc_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: master
+  version: 1e6a6a7540429e7127b792ef8a57d3e7662e27c8
 - name: memcached_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: master
+  version: 3dce07315baac0a2c1ae4997a071942e807e928c
 - name: openstack_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: master
+  version: e76fac8448ccfc65222e02f78ea34dcd65479b87
 - name: os_keystone
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: master
+  version: a9658c263a6e9276227a0f5a9d8bcd349e15eaaf
 - name: openstack_openrc
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: master
+  version: 2d65f030663b7485640bc6a3611ce63626e9d3ee
 - name: os_aodh
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: master
+  version: 9b24c04dc6355f57e1e363d3ca62f6a36e28f7a8
 - name: os_barbican
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: master
+  version: f67746897e0c48e518b90a41dbe8d0daca16d0da
 - name: os_ceilometer
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: master
+  version: ae74a73f982d11c4979426acf30b36917e2fe236
 - name: os_cinder
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: master
+  version: 3602554d51c61a354e96dbe60b6f2fab4846ef16
 - name: os_glance
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: master
+  version: c2e384eabfa3897825eb9aa9f7475fb77526ba66
 - name: os_gnocchi
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: master
+  version: f4216d49b95f9472d70072913098825cb8597cd3
 - name: os_heat
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: master
+  version: bb0ec2154f601f73066272d04f91adfc32e434e5
 - name: os_horizon
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: master
+  version: fb66ce62a975d3eac85de7a38589585d9a3623dd
 - name: os_ironic
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: master
+  version: 11caf833579d77cd81792359cf03b0d7a0d2f614
 - name: os_magnum
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: master
+  version: 9dd4f72af123d494b2ee5ab8c1b45de0a893ef48
 - name: os_trove
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: master
+  version: 59a8ec80342fbf484fa5221cb0e2532db15a5338
 - name: os_neutron
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: master
+  version: b25a6fb29ebcbf17b5c2ad8593f5f546e11e57a2
 - name: os_nova
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: master
+  version: 6ce3958ed49afadbff00fd7e64f7e25f91d59bda
 - name: os_rally
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: master
+  version: df6ffda04bf2408e2c07d9dcae300d4430fa02f2
 - name: os_sahara
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: master
+  version: fad6a538e806431ce3582d44467bdc6144286a82
 - name: os_swift
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: master
+  version: 3d615b3b92bc9b6f96aeeaf47bdab5d0f0882516
 - name: os_tempest
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: master
+  version: 995ac2d68813163c9cb98ebcff0e68a58911806a
 - name: plugins
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: master
+  version: 2319b3cdc945accf0fc59a26d51e9d3232e106b3
 - name: rabbitmq_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: master
+  version: 6c8e460e3bae38e13dbc3129e7249295f4098967
 - name: repo_build
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: master
+  version: 69d22a0a36435d080e7cc1747d3282c2259d6b31
 - name: repo_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: master
+  version: f20c70fbba03f8ab7839b8282c96a59d9bd9db92
 - name: rsyslog_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: master
+  version: 313a6282bd66f03786c93f09e760d3e177202bb2
 - name: rsyslog_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: master
+  version: e309e763cde9b989861c3d7eb2bbfbb90a41935e
 - name: sshd
  scm: git
  src: https://github.com/willshersystems/ansible-sshd
-  version: master
+  version: 0.5.1
 - name: bird
  scm: git
  src: https://github.com/logan2211/ansible-bird
-  version: master
+  version: '1.3'
 - 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.5'
 - name: resolvconf
  scm: git
  src: https://github.com/logan2211/ansible-resolvconf
-  version: master
+  version: '1.3'
 - name: os_designate
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_designate
-  version: master
+  version: 47993432ab6fa8b8e51cb19f689df17c8da4c373
 - name: ceph.ceph-common
  scm: git
  src: https://github.com/ceph/ansible-ceph-common
-  version: master
+  version: v2.2.9
 - 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.2.9
 - name: ceph-osd
  scm: git
  src: https://github.com/ceph/ansible-ceph-osd
-  version: master
+  version: v2.2.9
 - name: os_octavia
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
-  version: master
+  version: 8c6599b21ffbcf76154eed4fd9f6a6bb3c561f0b
 - name: os_molteniron
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
-  version: master
+  version: 799bcc449d441e1a180f60d8b29cd7feaead4051
--- a/playbooks/defaults/repo_packages/gnocchi.yml
+++ b/playbooks/defaults/repo_packages/gnocchi.yml
@ -33,5 +33,5 @@
 ## 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://github.com/gnocchixyz/gnocchi
-gnocchi_git_install_branch: 8ace8523e32172e33b422acf031d03a565025215 # HEAD of "master" as of 30.06.2017
+gnocchi_git_install_branch: 47d7cdd765b39c7773ca5f5d987b4e38cd403fd9 # HEAD of "master" as of 24.07.2017
 gnocchi_git_project_group: gnocchi_all
--- a/playbooks/defaults/repo_packages/nova_consoles.yml
+++ b/playbooks/defaults/repo_packages/nova_consoles.yml
@ -27,11 +27,11 @@

 ## NOVNC from source
 novncproxy_git_repo: https://github.com/novnc/noVNC
-novncproxy_git_install_branch: e7c4d669f0f0267356c37b20b35ff50bbd204cb2 # HEAD of "master" as of 30.06.2017
+novncproxy_git_install_branch: edb7879927c18dd2aaf3b86c99df69ba4fbb0eab # HEAD of "master" as of 24.07.2017
 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 30.06.2017
+spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 24.07.2017
 spicehtml5_git_project_group: nova_console

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

 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 8a2ba1c08cb9f20fe373c242b85d9e7b4255bfb3 # HEAD of "master" as of 30.06.2017
+requirements_git_install_branch: 2b345fcc06f4f06af224aacb5b7e0f942bd07c41 # HEAD of "master" as of 24.07.2017


 ## Aodh service
 aodh_git_repo: https://git.openstack.org/openstack/aodh
-aodh_git_install_branch: ba461b4f03ee6da3981f38968da4d2d44a5c4f6c # HEAD of "master" as of 30.06.2017
+aodh_git_install_branch: ad00e3a52a3ba465f80fc39c7af2e604b4015b68 # HEAD of "master" as of 24.07.2017
 aodh_git_project_group: aodh_all


 ## Barbican service
 barbican_git_repo: https://git.openstack.org/openstack/barbican
-barbican_git_install_branch: 58838ce6c2a922ae38d5319720c049dc5ddb3091 # HEAD of "master" as of 30.06.2017
+barbican_git_install_branch: fdfa516a67fd845ccaf78af2e13c1653f860f842 # HEAD of "master" as of 24.07.2017
 barbican_git_project_group: barbican_all


 ## Ceilometer service
 ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
-ceilometer_git_install_branch: f53ab18125cc2efc9a9d492a9c1e4acbc2e28d90 # HEAD of "master" as of 30.06.2017
+ceilometer_git_install_branch: de8fc6ff1dfbc371ac3ff0b6f4ce61d9ee67a881 # HEAD of "master" as of 24.07.2017
 ceilometer_git_project_group: ceilometer_all


 ## Cinder service
 cinder_git_repo: https://git.openstack.org/openstack/cinder
-cinder_git_install_branch: 7617a60cc9ba15a6dbd18345b557447a2e9a9627 # HEAD of "master" as of 30.06.2017
+cinder_git_install_branch: 212b045a022ddd4cf4596e6175aee113792c4e3b # HEAD of "master" as of 24.07.2017
 cinder_git_project_group: cinder_all


 ## Designate service
 designate_git_repo: https://git.openstack.org/openstack/designate
-designate_git_install_branch: 3c323d5eab31920733fd55cc1a73076ddf08dcd5 # HEAD of "master" as of 30.06.2017
+designate_git_install_branch: accd70a656ef229a085850d358d8a4025cc3ccd2 # HEAD of "master" as of 24.07.2017
 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: a8d79c4286f3b53508c89b12a07a4d51d4775cc3 # HEAD of "master" as of 30.06.2017
+designate_dashboard_git_install_branch: 19b1f1c42177b067a3ec598947c0e8f263d11b88 # HEAD of "master" as of 24.07.2017
 designate_dashboard_git_project_group: horizon_all


 ## Dragonflow service
 dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
-dragonflow_git_install_branch: 52f43ecacb8df3700b393385e13b1f36354d346e # HEAD of "master" as of 30.06.2017
+dragonflow_git_install_branch: 7ed19f887b132ab095191531813186cfac794f1e # HEAD of "master" as of 24.07.2017
 dragonflow_git_project_group: neutron_all


 ## Glance service
 glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: adf7f5885bcb8a655756afd429301370495966d1 # HEAD of "master" as of 30.06.2017
+glance_git_install_branch: adb219cf4570dc5ff36b49b84988d4773ed71d6b # HEAD of "master" as of 24.07.2017
 glance_git_project_group: glance_all


 ## Heat service
 heat_git_repo: https://git.openstack.org/openstack/heat
-heat_git_install_branch: 53f53f83ebb5ef43ec8cd8eff4daa242064f08a3 # HEAD of "master" as of 30.06.2017
+heat_git_install_branch: aa5c44beeb95f6d228ab6d03a6e9386492d008d6 # HEAD of "master" as of 24.07.2017
 heat_git_project_group: heat_all


 ## Horizon service
 horizon_git_repo: https://git.openstack.org/openstack/horizon
-horizon_git_install_branch: 839d234bb55c59525f5077c08a2aecdaa55a071a # HEAD of "master" as of 30.06.2017
+horizon_git_install_branch: 9cca6d0a502290d101f547d9d768161f4b928b4d # HEAD of "master" as of 24.07.2017
 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: 6a1f2e2f1b63c5c7edb42a7427d8ac6f395b8897 # HEAD of "master" as of 30.06.2017
+ironic_dashboard_git_install_branch: 9c9a298aa84f7fdf66510b56822d61c68c76a185 # HEAD of "master" as of 24.07.2017
 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: 9e99e8c666e6ded8026de070b458e146cfdf5adb # HEAD of "master" as of 30.06.2017
+magnum_dashboard_git_install_branch: c4c266f07c737624f861b965cd56742fa1c49523 # HEAD of "master" as of 24.07.2017
 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: 789e7cea2d949960114754614a63c4a4ef2f0c11 # HEAD of "master" as of 30.06.2017
+neutron_lbaas_dashboard_git_install_branch: 34bc1ed1de2de56b0caf2de5801ba7b5accc3c9c # HEAD of "master" as of 25.07.2017
 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: 5f07d19d68fe61fbe3eb0360e98a60e8cef28853 # HEAD of "master" as of 30.06.2017
+sahara_dashboard_git_install_branch: 9a92bcd3b708cae3ffd1015e007371574ed8537f # HEAD of "master" as of 24.07.2017
 sahara_dashboard_git_project_group: horizon_all


 ## Keystone service
 keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: bebd7056ad33d294871013067cb7367bc6db1a13 # HEAD of "master" as of 30.06.2017
+keystone_git_install_branch: 7c3acf34fada67fd86442c1882954e903a335fd0 # HEAD of "master" as of 24.07.2017
 keystone_git_project_group: keystone_all


 ## Neutron service
 neutron_git_repo: https://git.openstack.org/openstack/neutron
-neutron_git_install_branch: b1dd13abfb121ca2a3e1cebc6bc2cef4a056f401 # HEAD of "master" as of 30.06.2017
+neutron_git_install_branch: 65720ff5aac263f09bc762d0cedd047571115e72 # HEAD of "master" as of 24.07.2017
 neutron_git_project_group: neutron_all

 neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
-neutron_lbaas_git_install_branch: 997a4556a07f1c830c4d1d84ae0c54570ceab169 # HEAD of "master" as of 30.06.2017
+neutron_lbaas_git_install_branch: f32a0ec5bd9c45685f498afbbd03fb554f96eb9e # HEAD of "master" as of 24.07.2017
 neutron_lbaas_git_project_group: neutron_all

 neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: dddb73ccb489fd2ef5a35818d4925072b00e0726 # HEAD of "master" as of 30.06.2017
+neutron_vpnaas_git_install_branch: 797c0466693108dd63415a065750e7a62a5f5ce8 # HEAD of "master" as of 24.07.2017
 neutron_vpnaas_git_project_group: neutron_all

 neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
-neutron_fwaas_git_install_branch: 8d7cc87711c279789af70af4034b5f4f45dc41b0 # HEAD of "master" as of 30.06.2017
+neutron_fwaas_git_install_branch: cdd283a3471e92dc47aeb251c08ce000a2a04aa2 # HEAD of "master" as of 24.07.2017
 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: accc24cc6c43d13d6a1322948bc5c040bd47bd94 # HEAD of "master" as of 30.06.2017
+neutron_dynamic_routing_git_install_branch: d8c2c9e56253e8f6a7995995e5fac50abf56a3c6 # HEAD of "master" as of 24.07.2017
 neutron_dynamic_routing_git_project_group: neutron_all

 networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
-networking_calico_git_install_branch: e794848060e7ab3edf320b1847151de4eb6af142 # HEAD of "master" as of 29.06.2017
+networking_calico_git_install_branch: e794848060e7ab3edf320b1847151de4eb6af142 # HEAD of "master" as of 24.07.2017
 networking_calico_git_project_group: neutron_all

 ## Nova service
 nova_git_repo: https://git.openstack.org/openstack/nova
-nova_git_install_branch: c140d7d708c22bd54e5020567ddd02ee392b00aa # HEAD of "master" as of 30.06.2017
+nova_git_install_branch: 321f426c30f8f4f6e3dcafbbc7e5d87560b58c82 # HEAD of "master" as of 24.07.2017
 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: 560953d1c8b732364c80994906dd2cafc42c0262 # HEAD of "master" as of 30.06.2017
+nova_powervm_git_install_branch: 4f2ef146a877e30e47cf72369e818c92fc0ce2f9 # HEAD of "master" as of 24.07.2017
 nova_powervm_git_project_group: nova_all


 ## LXD Virt Driver
 nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
-nova_lxd_git_install_branch: ca9073ca179058518b3ccd620694b7fa82b662f7 # HEAD of "master" as of 30.06.2017
+nova_lxd_git_install_branch: 78b6c14f2cf375493f3fc268d589f2ba23f4f346 # HEAD of "master" as of 24.07.2017
 nova_lxd_git_project_group: nova_all


 ## Sahara service
 sahara_git_repo: https://git.openstack.org/openstack/sahara
-sahara_git_install_branch: 506f85b7906517286be21a04f71ce608abc0860a # HEAD of "master" as of 30.06.2017
+sahara_git_install_branch: c83983f594eab5839834436f271f7fd6892c2ce3 # HEAD of "master" as of 24.07.2017
 sahara_git_project_group: sahara_all


 ## Swift service
 swift_git_repo: https://git.openstack.org/openstack/swift
-swift_git_install_branch: 3361cd083ea9b242baee7f44f1570793ff681d73 # HEAD of "master" as of 30.06.2017
+swift_git_install_branch: d40c9ed3a2c8706ef1394f99a789f036645bfaa3 # HEAD of "master" as of 24.07.2017
 swift_git_project_group: swift_all


 ## Swift3 middleware
 swift_swift3_git_repo: https://git.openstack.org/openstack/swift3
-swift_swift3_git_install_branch: a8bbdd66464b735a247159ee6c68e0d71bcf27d6 # HEAD of "master" as of 30.06.2017
+swift_swift3_git_install_branch: a8bbdd66464b735a247159ee6c68e0d71bcf27d6 # HEAD of "master" as of 24.07.2017
 swift_swift3_git_project_group: swift_all


 ## Ironic service
 ironic_git_repo: https://git.openstack.org/openstack/ironic
-ironic_git_install_branch: cbcb5d9fdbdb1bce2b8fb18f766b95cd556c7949 # HEAD of "master" as of 30.06.2017
+ironic_git_install_branch: 11e79b921457a9b239bf0d771716a089c0683b69 # HEAD of "master" as of 24.07.2017
 ironic_git_project_group: ironic_all

 ## Magnum service
 magnum_git_repo: https://git.openstack.org/openstack/magnum
-magnum_git_install_branch: 2e7e5a77967028c961337177ce577eb936c3845c # HEAD of "master" as of 30.06.2017
+magnum_git_install_branch: ffe2ea4baa6b91f169ff1a412531b9c4851efe2f # HEAD of "master" as of 24.07.2017
 magnum_git_project_group: magnum_all

 ## Trove service
 trove_git_repo: https://git.openstack.org/openstack/trove
-trove_git_install_branch: 7c258abb01047355813be6a1002b4c1c253ab41c # HEAD of "master" as of 30.06.2017
+trove_git_install_branch: fa171bd3e92d7d7b9032fc035f554dcb4621ce94 # HEAD of "master" as of 24.07.2017
 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: e1a1fa462191291f121059816df3908ddb791569 # HEAD of "master" as of 30.06.2017
+trove_dashboard_git_install_branch: e1a1fa462191291f121059816df3908ddb791569 # HEAD of "master" as of 24.07.2017
 trove_dashboard_git_project_group: horizon_all

 ## Octavia service
 octavia_git_repo: https://git.openstack.org/openstack/octavia
-octavia_git_install_branch: 7466016ae982af2a560a94327f9e63a7e7151cc5 # HEAD of "master" as of 30.06.2017
+octavia_git_install_branch: 73d4f356e48207b26e358489b02c40ebb2c7194f # HEAD of "master" as of 24.07.2017
 octavia_git_project_group: octavia_all

 ## Molteniron service
 molteniron_git_repo: https://git.openstack.org/openstack/molteniron
-molteniron_git_install_branch: 6eb00df34c25e156197b9b03f428cc5ef028b649 # HEAD of "master" as of 30.06.2017
+molteniron_git_install_branch: 6eb00df34c25e156197b9b03f428cc5ef028b649 # HEAD of "master" as of 24.07.2017
 molteniron_git_project_group: molteniron_all
--- 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: 0279907cc7a1b84fcea94d43a63226d9a5799e7b # HEAD of "master" as of 30.06.2017
+tempest_git_install_branch: 2a1271b924f2297cd0351542d3c4a0fc6a54ac4f # HEAD of "master" as of 24.07.2017
 tempest_git_project_group: utility_all
 tempest_git_install_fragments: "venvwithindex=True&ignorerequirements=True"


 ## Rally service
 rally_git_repo: https://git.openstack.org/openstack/rally
-rally_git_install_branch: 277a60226b90df2127d65d144885efd79b7ee3a2 # HEAD of "master" as of 30.06.2017
+rally_git_install_branch: 196d17737753eb6de7291140a9d5f249157b50ad # HEAD of "master" as of 24.07.2017
 rally_git_project_group: utility_all
 rally_git_install_fragments: "venvwithindex=True&ignorerequirements=True"
--- a/releasenotes/notes/add-swift3-support-a3f1a5d866fd8883.yaml
+++ b/releasenotes/notes/add-swift3-support-a3f1a5d866fd8883.yaml
@ -0,0 +1,5 @@
+---
+features:
+  - The os_swift role now supports the swift3 middleware, allowing access to
+    swift via the Amazon S3 API.  This feature can enabled by setting
+    ``swift_swift3_enabled`` to ``true``.
--- a/releasenotes/notes/add_image_upload_and_network_preparation-a414d45b624652a3.yaml
+++ b/releasenotes/notes/add_image_upload_and_network_preparation-a414d45b624652a3.yaml
@ -0,0 +1,11 @@
+---
+features:
+  - Adds a way for the system to automatically create the Octavia management
+    network if octavia_service_net_setup is enabled (DEFAULT). Additional
+    parameters can control the setup.
+  - Adds support for glance-image-id and automatic uploading of the image
+    if octavia_amp_image_upload_enabled is True (Default is False). This is
+    mostly tp work around the limitations of Ansible's OpenStack support
+    and should not be used in prodcution settings. Instead refer to the
+    documentation to upload images yourself.
+
--- a/releasenotes/notes/allow-custom-epel-release-packages-b409be1aa46ee9c3.yaml
+++ b/releasenotes/notes/allow-custom-epel-release-packages-b409be1aa46ee9c3.yaml
@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Deployers can now specify a custom package name or URL for an EPEL release
+    package. CentOS systems use ``epel-release`` by default, but some deployers
+    have a customized package that redirects servers to internal mirrors.
--- a/releasenotes/notes/centos-private-devices-issue-0088e6f8c70a601f.yaml
+++ b/releasenotes/notes/centos-private-devices-issue-0088e6f8c70a601f.yaml
@ -0,0 +1,21 @@
+---
+issues:
+  - |
+    MemcacheD sets `PrivateDevices=true` in its systemd unit file to
+    add extra security around mount namespaces. While this is useful
+    when running MemcacheD on a bare metal host with other services, it
+    is less useful when MemcacheD is already in a container with its own
+    namespaces. In addition, LXC 2.0.8 presents `/dev/ptmx` as a bind mount
+    within the container and systemd 219 (on CentOS 7) cannot make an
+    additional bind mount of `/dev/ptmx` when `PrivateDevices` is enabled.
+
+    Deployers can `memcached_disable_privatedevices` to `yes` to set
+    `PrivateDevices=false` in the systemd unit file for MariaDB on CentOS 7.
+    The default is `no`, which keeps the default systemd unit file settings
+    from the MemcacheD package.
+
+    For additional information, refer to the following bugs:
+
+    * https://bugs.launchpad.net/openstack-ansible/+bug/1697531
+    * https://github.com/lxc/lxc/issues/1623
+    * https://github.com/systemd/systemd/issues/6121
--- a/releasenotes/notes/centos-private-devices-issue-99aab9a30b1f8014.yaml
+++ b/releasenotes/notes/centos-private-devices-issue-99aab9a30b1f8014.yaml
@ -0,0 +1,21 @@
+---
+issues:
+  - |
+    MariaDB 10.1+ includes `PrivateDevices=true` in its systemd unit files to
+    add extra security around mount namespaces for MariaDB. While this is
+    useful when running MariaDB on a bare metal host with other services, it
+    is less useful when MariaDB is already in a container with its own
+    namespaces. In addition, LXC 2.0.8 presents `/dev/ptmx` as a bind mount
+    within the container and systemd 219 (on CentOS 7) cannot make an
+    additional bind mount of `/dev/ptmx` when `PrivateDevices` is enabled.
+
+    Deployers can `galera_disable_privatedevices` to `yes` to set
+    `PrivateDevices=false` in the systemd unit file for MariaDB on CentOS 7.
+    The default is `no`, which keeps the default systemd unit file settings
+    from the MariaDB package.
+
+    For additional information, refer to the following bugs:
+
+    * https://bugs.launchpad.net/openstack-ansible/+bug/1697531
+    * https://github.com/lxc/lxc/issues/1623
+    * https://github.com/systemd/systemd/issues/6121
--- a/releasenotes/notes/cinder-data-migrations-ce31707c078b335c.yaml
+++ b/releasenotes/notes/cinder-data-migrations-ce31707c078b335c.yaml
@ -0,0 +1,9 @@
+---
+features:
+  - The ``os_cinder`` role now provides for doing
+    online data migrations once the db sync has
+    been completed. The data migrations will not
+    be executed until the boolean variable
+    ``cinder_all_software_updated`` is true. This
+    variable will need to be set by the playbook
+    consuming the role.
--- a/releasenotes/notes/conditionally-install-epel-9e8e1b67e5943019.yaml
+++ b/releasenotes/notes/conditionally-install-epel-9e8e1b67e5943019.yaml
@ -0,0 +1,16 @@
+---
+upgrade:
+  - |
+    The EPEL repository is only installed and configured when the deployer sets
+    ``security_enable_virus_scanner`` to ``yes``. This allows the ClamAV
+    packages to be installed. If ``security_enable_virus_scanner`` is set to
+    ``no`` (the default), the EPEL repository will not be added.
+
+    See
+    `Bug 1702167 <https://bugs.launchpad.net/openstack-ansible/+bug/1702167>`_
+    for more details.
+  - |
+    Deployers now have the option to prevent the EPEL repository from being
+    installed by the role. Setting ``security_epel_install_repository`` to
+    ``no`` prevents EPEL from being installed. This setting may prevent certain
+    packages from installing, such as ClamAV.
--- a/releasenotes/notes/config-template-ignore-none-type-9387c236853f061b.yaml
+++ b/releasenotes/notes/config-template-ignore-none-type-9387c236853f061b.yaml
@ -0,0 +1,9 @@
+---
+features:
+  - |
+    The config_template template module now supports writing out valueless
+    INI options without suffixing them with '=' or ':'. This is done via the
+    'ignore_none_type' attribute. If ignore_none_type is set to true, these
+    key/value entries will be ignored, if it's set to false, then
+    ConfigTemplateParser will write out only the option name without the
+    '=' or ':' suffix. The default is true.
--- a/releasenotes/notes/esl-repo-6ff0c7f24ad2a043.yaml
+++ b/releasenotes/notes/esl-repo-6ff0c7f24ad2a043.yaml
@ -0,0 +1,25 @@
+---
+features:
+  - A new repository for installing modern erlang from ESL
+    (erlang solutions) has been added giving us the ability
+    to install and support modern stable erlang over numerous
+    operating systems.
+  - The ability to set the RabbitMQ repo URL for both erlang
+    and RabbitMQ itself has been added. This has been done to
+    allow deployers to define the location of a given repo without
+    having to fully redefine the entire set of definitions for a
+    specific repository. The default variables `rabbitmq_gpg_keys`,
+    `rabbitmq_repo_url`, and `rabbitmq_erlang_repo_url` have been
+    created to facilitate this capability.
+upgrade:
+  - Changing to the ESL repos has no upgrade impact. The version
+    of erlang provided by ESL is newer than that what is found in
+    the distro repos. Furthermore, a pin has been added to
+    ensure that APT always uses the ESL repos as it's preferred
+    source which has been done to simply ensure APT is always
+    pointed at ESL.
+fixes:
+  - Based on documentation from RabbitMQ
+    [ https://www.rabbitmq.com/which-erlang.html ] this change
+    ensures the version of erlang we're using across distros is
+    consistent and supported by RabbitMQ.
--- a/releasenotes/notes/fix-mysql-overrides-e5362ae15c657214.yaml
+++ b/releasenotes/notes/fix-mysql-overrides-e5362ae15c657214.yaml
@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Mysql cnf files can now be properly overridden. The config_template
+    module has been extended to support valueless options, such as those that
+    are found in the my.cnf file(i.e. `quick` under the `mysqldump` section).
+    To use valueless options, use the `ignore_none_type` attribute of the
+    config_template module.
--- a/releasenotes/notes/get_nested_filter-b89828586d7e2520.yaml
+++ b/releasenotes/notes/get_nested_filter-b89828586d7e2520.yaml
@ -0,0 +1,7 @@
+---
+features:
+  - The `get_nested` filter has been added, allowing for simplified
+    value lookups inside of nested dictionaries.
+
+    `ansible_local|get_nested('openstack_ansible.swift')`, for example,
+    will look 2 levels down and return the result.
--- a/releasenotes/notes/heatstack_password-25956b6143577735.yaml
+++ b/releasenotes/notes/heatstack_password-25956b6143577735.yaml
@ -0,0 +1,5 @@
+---
+features:
+  - It's now possible to disable heat stack password field in horizon.
+    ``horizon_enable_heatstack_user_pass`` variable has been added and
+    default to True.
--- a/releasenotes/notes/idempotent-wheel-build-4c527045bec09fd5.yaml
+++ b/releasenotes/notes/idempotent-wheel-build-4c527045bec09fd5.yaml
@ -0,0 +1,22 @@
+---
+upgrade:
+  - The entire repo build process is now idempotent. From now on when
+    the repo build is re-run, it will only fetch updated git
+    repositories and rebuild the wheels/venvs if the requirements
+    have changed, or a new release is being deployed.
+  - The git clone part of the repo build process now only happens when
+    the requirements change. A git reclone can be forced by using the
+    boolean variable ``repo_build_git_reclone``.
+  - The python wheel build process now only happens when requirements
+    change. A wheel rebuild may be forced by using the boolean variable
+    ``repo_build_wheel_rebuild``.
+  - The python venv build process now only happens when requirements
+    change. A venv rebuild may be forced by using the boolean variable
+    ``repo_build_venv_rebuild``.
+  - The repo build process now only has the following tags, providing
+    a clear path for each deliverable. The tag ``repo-build-install``
+    completes the installation of required packages. The tag
+    ``repo-build-wheels`` completes the wheel build process. The tag
+    ``repo-build-venvs`` completes the venv build process. Finally, the
+    tag ``repo-build-index`` completes the manifest preparation and
+    indexing of the os-releases and links folders.
--- a/releasenotes/notes/image-allow-location-58212b8e506639f2.yaml
+++ b/releasenotes/notes/image-allow-location-58212b8e506639f2.yaml
@ -0,0 +1,5 @@
+---
+features:
+  - The ``horizon_images_allow_location`` variable is added to support the
+    ``IMAGES_ALLOW_LOCATION`` setting in the horizon_local_settings.py file to
+    allow to specify and external location during the image creation.
--- a/releasenotes/notes/keystone-nginx-default-e9d91affd646f379.yaml
+++ b/releasenotes/notes/keystone-nginx-default-e9d91affd646f379.yaml
@ -0,0 +1,10 @@
+---
+upgrade:
+  - Keystone now uses uWSGI exclusively (instead of Apache with mod_wsgi)
+    and has the web server acting as a reverse proxy. The default web
+    server is now set to Nginx instead of Apache, but Apache will
+    automatically used if federation is configured.
+deprecations:
+  - The variables ``keystone_apache_enabled`` and ``keystone_mod_wsgi_enabled``
+    have been removed and replaced with a single variable ``keystone_web_server``
+    to optionally set the web server used for keystone.
--- a/releasenotes/notes/launch-instance-defaults-support-533844543082b2f4.yaml
+++ b/releasenotes/notes/launch-instance-defaults-support-533844543082b2f4.yaml
@ -0,0 +1,6 @@
+---
+features:
+  - It is now possible to use the horizon_launch_instance_defaults variable
+    that allows customizing the default values for properties found in the
+    Launch Instance modal, using the LAUNCH_INSTANCE_DEFAULTS config option.
+    See https://docs.openstack.org/developer/horizon/install/settings.html#launch-instance-defaults
--- a/releasenotes/notes/nova-data-migrations-f6c2bc0f9e7b1908.yaml
+++ b/releasenotes/notes/nova-data-migrations-f6c2bc0f9e7b1908.yaml
@ -0,0 +1,9 @@
+---
+features:
+  - The ``os_nova`` role now provides for doing
+    online data migrations once the db sync has
+    been completed. The data migrations will not
+    be executed until the boolean variable
+    ``nova_all_software_updated`` is true. This
+    variable will need to be set by the playbook
+    consuming the role.
--- a/releasenotes/notes/nova-init-config-overrides-ffce7e419061c4da.yaml
+++ b/releasenotes/notes/nova-init-config-overrides-ffce7e419061c4da.yaml
@ -0,0 +1,10 @@
+---
+features:
+  - New variables have been added to allow a deployer to customize
+    a designate systemd unit file to their liking.
+  - The task dropping the designate systemd unit files now uses the
+    ``config_template`` action plugin allowing deployers access to
+    customize the unit files as they see fit without having to
+    load extra options into the defaults and polute the generic
+    systemd unit file with jinja2 variables and conditionals.
+
--- a/releasenotes/notes/password-lifetime-opt-in-c380f0ec81daffd0.yaml
+++ b/releasenotes/notes/password-lifetime-opt-in-c380f0ec81daffd0.yaml
@ -0,0 +1,7 @@
+---
+features:
+  - |
+    The password minimum and maximum lifetimes are now opt-in changes that
+    can take action against user accounts instead of printing debug warnings.
+    Refer to the documentation for STIG requirements V-71927 and V-71931 to
+    review the opt-in process and warnings.
--- a/releasenotes/notes/pip-extra-index-remove-db32c770a70c8faa.yaml
+++ b/releasenotes/notes/pip-extra-index-remove-db32c770a70c8faa.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - The variable ``repo_build_pip_extra_index`` has been removed.
+    The replacement list variable ``repo_build_pip_extra_indexes``
+    should be used instead.
--- a/releasenotes/notes/plugins-remove-neutron-cbea1235e030e4f5.yaml
+++ b/releasenotes/notes/plugins-remove-neutron-cbea1235e030e4f5.yaml
@ -0,0 +1,5 @@
+---
+upgrade:
+  - The ``neutron`` library has been removed from OpenStack-Ansible's
+    plugins. Upstream Ansible modules for managing OpenStack network
+    resources should be used instead.
--- a/releasenotes/notes/recreate-option-d78bae1fd922a84d.yaml
+++ b/releasenotes/notes/recreate-option-d78bae1fd922a84d.yaml
@ -0,0 +1,6 @@
+---
+features:
+  - Added the ``lxc_container_recreate`` option, which will destroy then
+    recreate LXC containers. The container names and IP addresses will remain
+    the same, as will the MAC addresses of any containers using the
+    ``lxc_container_fixed_mac`` setting.
--- a/releasenotes/notes/remove_nova_cpu_mode_option-e9fcfc97aa13a29a.yaml
+++ b/releasenotes/notes/remove_nova_cpu_mode_option-e9fcfc97aa13a29a.yaml
@ -0,0 +1,9 @@
+---
+deprecations:
+  - |
+    The ``nova_cpu_mode`` Ansible variable has been removed by default,
+    to allow Nova to detect the default value automatically. Hard-coded
+    values can cause problems. You can still set ``nova_cpu_mode`` to
+    enforce a ``cpu_mode`` for Nova.
+    Additionally, the default value for the ``qemu`` ``libvirt_type``
+    is set to ``none`` to avoid issues caused with ``qemu`` 2.6.0.
--- a/releasenotes/notes/remove_rpc_backend-1163da2fe9418315.yaml
+++ b/releasenotes/notes/remove_rpc_backend-1163da2fe9418315.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``heat_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/remove_rpc_backend-1729234e23895f18.yaml
+++ b/releasenotes/notes/remove_rpc_backend-1729234e23895f18.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``octavia_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/remove_rpc_backend-187132a35223d295.yaml
+++ b/releasenotes/notes/remove_rpc_backend-187132a35223d295.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``keystone_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/remove_rpc_backend-7123da9fe3419215.yaml
+++ b/releasenotes/notes/remove_rpc_backend-7123da9fe3419215.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``cinder_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/remove_rpc_backend-78139a469235891f.yaml
+++ b/releasenotes/notes/remove_rpc_backend-78139a469235891f.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``trove_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/remove_rpc_backend-8134a355d9864e12.yaml
+++ b/releasenotes/notes/remove_rpc_backend-8134a355d9864e12.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``neutron_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/remove_rpc_backend-89135235e3513394.yaml
+++ b/releasenotes/notes/remove_rpc_backend-89135235e3513394.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``sahara_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/remove_rpc_backend-9813a3455f234521.yaml
+++ b/releasenotes/notes/remove_rpc_backend-9813a3455f234521.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``magnum_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/remove_rpc_backend-a37345891a987f21.yaml
+++ b/releasenotes/notes/remove_rpc_backend-a37345891a987f21.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``glance_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/save-mac-addresses-8b1e6e6301d99a37.yaml
+++ b/releasenotes/notes/save-mac-addresses-8b1e6e6301d99a37.yaml
@ -0,0 +1,7 @@
+---
+features:
+  - MAC addresses for containers with a fixed MAC (`lxc_container_fixed_mac`
+    variable) are now saved to the ``/etc/ansible/facts.d/mac.fact`` file.
+    Should such a container be destroyed but not removed from inventory,
+    the interfaces will be recreated with the same MAC address when the
+    container is recreated.
--- a/releasenotes/notes/service_net_endpoint_type-60dbb87c4f68403c.yaml
+++ b/releasenotes/notes/service_net_endpoint_type-60dbb87c4f68403c.yaml
@ -0,0 +1,7 @@
+---
+features:
+  - You can set the ``endpoint_type`` used when
+    creating the Trove service network by specifying
+    the ``trove_service_net_endpoint_type`` variable.
+    This will default to ``internal``. Other possible
+    options are ``public`` and ``admin``.
--- a/releasenotes/notes/ubuntu-s390x-0a561bc69354d48a.yaml
+++ b/releasenotes/notes/ubuntu-s390x-0a561bc69354d48a.yaml
@ -0,0 +1,3 @@
+---
+features:
+  - Add support for Ubuntu on IBM z Systems (s390x).
--- a/releasenotes/notes/ubuntu-s390x-c8dcc05e32e1d9eb.yaml
+++ b/releasenotes/notes/ubuntu-s390x-c8dcc05e32e1d9eb.yaml
@ -0,0 +1,3 @@
+---
+features:
+  - Add support for Ubuntu on IBM z Systems (s390x).
--- a/releasenotes/notes/update_translations-f950283d821bba05.yaml
+++ b/releasenotes/notes/update_translations-f950283d821bba05.yaml
@ -0,0 +1,8 @@
+---
+features:
+  - You can force update the translations direct
+    from Zanata by setting ``horizon_translations_update``
+    to ``True``. This will call the ``pull_catalog``
+    option built into ``horizon-manage.py``. You should
+    only use this when testing translations, otherwise
+    this should remain set to the default of ``False``.