Revert role pin for further Pike development

Now that Pike-2 has been released, we can continue to develop against the master branches of all the roles. Some service SHA's are also updated due to the keystonemiddleware switch from pycrypto to cryptography. Change-Id: Ieb103093b7cd8fbf8b8f1acffd7b07efe70ab5d9
2017-06-08 13:54:01 +01:00 · 2017-06-08 13:54:01 +01:00 · ed7032f8be
parent cd77532a0c
commit ed7032f8be
2 changed files with 41 additions and 41 deletions
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@ -1,27 +1,27 @@
 - name: apt_package_pinning
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: 2be5763f6937f1791ea3c99ade4386c89d5ad8a6
+  version: master
 - name: pip_install
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: 1bd49f3201d511a841dc79b1dc9ad83c15de808a
+  version: master
 - name: galera_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: fba14dd2059f198753f4aff49e9df44c66d4e780
+  version: master
 - name: galera_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: e05b6a85f2476ad5761867051c5761c756a17dcd
+  version: master
 - name: ceph_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: f8b5f7ed90d149e84ada05a0b5a3a44afaff344b
+  version: master
 - name: haproxy_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: 51a35bb25d4654bc20fd590100f0f0fb73524cf0
+  version: master
 - name: keepalived
  scm: git
  src: https://github.com/evrardjp/ansible-keepalived
@ -29,123 +29,123 @@
 - name: lxc_container_create
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: 64261a0c192f43a6f8338eba49acb46b91c31833
+  version: master
 - name: lxc_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: 95d03caaa3cb53fb4119016079d5e4fd8bcbadca
+  version: master
 - name: memcached_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: a25aa31ccf0089229ac9c31c05ebc0640abebd37
+  version: master
 - name: openstack-ansible-security
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-security
-  version: 1f89531fb821bc7fccf06089e7dfd9929df88cf8
+  version: master
 - name: openstack_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: 595a3c4f35341d537fe112d979f4f080122b2e21
+  version: master
 - name: os_keystone
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: 13b3a270d98536ae8f13359b974857b13c395557
+  version: master
 - name: openstack_openrc
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: 8ad46e857d38e4fb30f3c2c49b6b4c55a4cf158d
+  version: master
 - name: os_aodh
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: 8c72de83a728a14111b76a8582fdc5723946d689
+  version: master
 - name: os_barbican
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: ed8e52b82055dffa0e3403400deb6f188c62b93c
+  version: master
 - name: os_ceilometer
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: 3f1a5729abfc9b37ab3be2d468d748f63f9660cf
+  version: master
 - name: os_cinder
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: 49435e21fee0f227eaa6c5a3992a836d6abf0621
+  version: master
 - name: os_glance
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: 384215e4560e358ccb7ede9c0e5e1523c29cee26
+  version: master
 - name: os_gnocchi
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: 1f286a89e1b948a60514a333a5ad7e845b48afef
+  version: master
 - name: os_heat
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: d6c23fa6b04c3737389cf06bdd115dad52b1d610
+  version: master
 - name: os_horizon
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: f3cac1b5c46f562d4289a950426a9626332b9125 
+  version: master
 - name: os_ironic
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: 935fde61e0da928e879f92a3f7b2fc317a040b29
+  version: master
 - name: os_magnum
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: 15aecbbd9a59d9867d74a2f831f8816aad25d97e
+  version: master
 - name: os_trove
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: 9855742abdf542d135d83ebd3072890b16d18af4
+  version: master
 - name: os_neutron
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: fcc1aa8792a8687ad66f0e8717a8ecee97bded64
+  version: master
 - name: os_nova
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: 08a7da5f372d75ecf130da1a424790a0c3de1dc3
+  version: master
 - name: os_rally
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: a1ca8da03c2c9289f670b01a10addca689bffaff
+  version: master
 - name: os_sahara
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: ac72d9ab8e1a901ba1ffb3c2eb24f9d6c3bce11d
+  version: master
 - name: os_swift
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: 5de40ebea40a81148ec1f5ab903902f3ebe0920b
+  version: master
 - name: os_tempest
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: e3974d45c0bedc9e9449c462f4c49c2d1f0ce6a2
+  version: master
 - name: plugins
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: 573c8a84800f5bf1994b5f5e6490054f89a9ca31
+  version: master
 - name: rabbitmq_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: abaca366186b503c5afd7b9ff9741f37a406a3fe
+  version: master
 - name: repo_build
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: a0ca13626ae85b500af3838ba8c8c3c664fded30
+  version: master
 - name: repo_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: 05fee07110e39af55b41069c8b9e35a328e8d63f
+  version: master
 - name: rsyslog_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: a7405329cdab24c02c86d776e1154b96be7951ae
+  version: master
 - name: rsyslog_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: 0b914b6bd133ca657c2ba38455d80c207c868103
+  version: master
 - name: sshd
  scm: git
  src: https://github.com/willshersystems/ansible-sshd
@ -169,7 +169,7 @@
 - name: os_designate
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_designate
-  version: c505653af5c7b1d880dd9a31759f3a1bade69ed3
+  version: master
 - name: ceph.ceph-common
  scm: git
  src: https://github.com/ceph/ansible-ceph-common
@ -189,8 +189,8 @@
 - name: os_octavia
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
-  version: 2eb17d626032a76b13098d4ec4be6ececb41e6b6
+  version: master
 - name: os_molteniron
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
-  version: f487af10c2caef009e64b020501715b30094958b
+  version: master
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@ -31,7 +31,7 @@

 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: ef4f008c43302107b6b1bf8cbad025fd8b2869f0 # HEAD of "master" as of 02.06.2017
+requirements_git_install_branch: 5e111bc5f5423cad6d526a992f6f7d3520a5c1b2 # HEAD of "master" as of 05.06.2017


 ## Aodh service
@ -90,7 +90,7 @@ heat_git_project_group: heat_all

 ## Horizon service
 horizon_git_repo: https://git.openstack.org/openstack/horizon
-horizon_git_install_branch: d6aca627bbdaf1b2f89293540a70e872458bda5b # HEAD of "master" as of 02.06.2017
+horizon_git_install_branch: c01c4d98730f43bd29afa6a887e258293fd0b99b # HEAD of "master" as of 05.06.2017
 horizon_git_project_group: horizon_all

 ## Horizon Ironic dashboard plugin