Merge "Update all SHAs for Ocata 2016-10-12"

ansible-role-requirements.yml

@@ -1,164 +1,164 @@
 - name: apt_package_pinning
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: b158dadd1338bfa09620df3ab3c2985a12f7969e
+  version: master
 - name: pip_install
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: 03a71eecc8a6cb1b1026b17bdf500a980014c836
+  version: master
 - name: galera_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: 13a8fce22a00b79c39d9628313dbea889eacf925
+  version: master
 - name: galera_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: 74ac0dc33e244c5448342ad944059be3567bc499
+  version: master
 - name: ceph_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: 2c70bace36da641ad582bdc0c4a86796c5fc0b5a
+  version: master
 - name: haproxy_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: 6bf9f725022412e3bc1e8677343c460a4e2a2ddc
+  version: master
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
-  version: 2.1.1
+  version: master
 - name: lxc_container_create
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: edb14fb1dc52f3f9728944990a81702857fec728
+  version: master
 - name: lxc_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: d1d87b8f12669a7f96e1ff60da561ac28b6b2630
+  version: master
 - name: memcached_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: e16ddfd17ad9771230de41aa58e72ef46123443a
+  version: master
 - name: openstack-ansible-security
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-security
-  version: f460a976513281a96c20745419ae915ff5062533
+  version: master
 - name: openstack_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: e6240591f366ab16d0a01bb6e578ebf00c974de6
+  version: master
 - name: os_keystone
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: 0bbacf63ba98e56616c351e218f6b59e55c849ac
+  version: master
 - name: openstack_openrc
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: f73263b6ffbaab128c674b24b5c0114a162b216f
+  version: master
 - name: os_aodh
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: 5845161e1544f1ea4cb070abd195c821d2d520bd
+  version: master
 - name: os_ceilometer
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: 8818c7ac9ea3ac0de7c5bb1d783e2dcc4bdf77c2
+  version: master
 - name: os_cinder
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: ac5913b888f0430355622852406ad70edaea49b1
+  version: master
 - name: os_glance
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: 8d00fe10692830299057b0c83f45343c85f23ace
+  version: master
 - name: os_gnocchi
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: 387a289b290f9a3f241c7622fc322fda373ae674
+  version: master
 - name: os_heat
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: f71a7a83cd1f61e15a820f38c707f51489a18da3
+  version: master
 - name: os_horizon
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: 19b8c679e42ab54b7b72e3f80b239a43f5e20a89
+  version: master
 - name: os_ironic
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: b0fa2aa408e52879b6e7697f19e14d9b773995e7
+  version: master
 - name: os_magnum
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: 3475d51c5b5f73d1cf6bc66bdfd1e8f6f7e7e5ff
+  version: master
 - name: os_trove
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: 252822cfc2950c54059103eeccfab1daacdda64d
+  version: master
 - name: os_neutron
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: d2adbdded42ed7dd41e61935ef193972c534591a
+  version: master
 - name: os_nova
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: 43485eede895d3fd6758ce710b41c065d88c8aa4
+  version: master
 - name: os_rally
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: b652896a76fbf64be8807eca8fab141f1addee5d
+  version: master
 - name: os_sahara
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: 1ac57433a2234b4f945e82a8d2a51948e51b984f
+  version: master
 - name: os_swift
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: 9525418413dacc9e86fa8454b479017b0cef6aad
+  version: master
 - name: os_tempest
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: 882112cd75ed90e4cad129c7c71e61949b17547e
+  version: master
 - name: plugins
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: 544adfe6863b4291c04b955c5e4b8e6aa5351b88
+  version: master
 - name: rabbitmq_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: 811173b87d38a981ddf926765e43b3a72eff5351
+  version: master
 - name: repo_build
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: 6c53adadd62bb49d44e724d89d8212dffd94918b
+  version: master
 - name: repo_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: 452f08fa8e78d3f1b3b4f8d3315000491198b460
+  version: 9aafde635d1c9973e52925b235dbf0500622f0f1
 - name: rsyslog_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: a1cb34b9b6a6a1589781f04f7cf8220075d1f782
+  version: master
 - name: rsyslog_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: 2d196fb8b3b9a01c8a4d495e2f8ccdf121b809be
+  version: master
 - name: sshd
   scm: git
   src: https://github.com/willshersystems/ansible-sshd
-  version: 0.4.5
+  version: master
 - name: bird
   scm: git
   src: https://github.com/logan2211/ansible-bird
-  version: f041285321e3fb65fc652a9d82d43d2a5ccb8937
+  version: master
 - name: etcd
   scm: git
   src: https://github.com/logan2211/ansible-etcd
-  version: '1.0'
+  version: master
 - name: unbound
   scm: git
   src: https://github.com/logan2211/ansible-unbound
-  version: '1.0'
+  version: master
 - name: resolvconf
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
-  version: '1.1'
+  version: master

global-requirement-pins.txt

@@ -10,5 +10,5 @@
 ### These pins are updated through the sources-branch-updater script ###
 ###
 pip==8.1.2
-setuptools==27.3.0
+setuptools==28.3.0
 wheel==0.29.0

playbooks/defaults/repo_packages/gnocchi.yml

@@ -33,6 +33,6 @@
 ## This service has a different stable branch strategy to the rest of OpenStack.
 ## The SHA is recorded here to make the SHA updating easier.
 gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi
-gnocchi_git_install_branch: c6b2c5185c67038545759aef067198207756bad0 # HEAD of "stable/3.0" as of 27.09.2016
+gnocchi_git_install_branch: 20176761cfe7816204bf397ca319a2559b26d2c9 # HEAD of "master" as of 12.10.2016
 gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
 gnocchi_git_project_group: gnocchi_all

playbooks/defaults/repo_packages/nova_consoles.yml

@@ -27,13 +27,13 @@
 
 ## NOVNC from source
 novncproxy_git_repo: https://github.com/kanaka/novnc
-novncproxy_git_install_branch: 33e1462999d78bafff55be9723a90c6498d2d9e8 # HEAD of "master" as of 20.09.2016
+novncproxy_git_install_branch: 00df30999b88803f65f1c83cf278ede4b5195e1e # HEAD of "master" as of 12.10.2016
 novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}"
 novncproxy_git_project_group: nova_console
 
 ## spice-html5 from source
 spicehtml5_git_repo: https://github.com/SPICE/spice-html5
-spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 20.09.2016
+spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 12.10.2016
 spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
 spicehtml5_git_project_group: nova_console