From bd2bb462f2770f35d7a240e6e29a363db458b788 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Wed, 23 Aug 2017 12:26:10 +0100
Subject: [PATCH] Update vars and test tooling for Pike

Change-Id: I9896571497d28b5ebc8628052c1d8fa13061f261
---
 defaults/main.yml                   |  2 +-
 tests/ansible-role-requirements.yml | 24 ++++++++++++------------
 tox.ini                             |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index fecea774..3750e2b1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -28,7 +28,7 @@ keystone_shibboleth_repo: {}
 # to build an environment directly from a git source without the presence
 # of an OpenStack-Ansible repo_server.
 keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: master
+keystone_git_install_branch: stable/pike
 keystone_developer_mode: false
 keystone_developer_constraints:
   - "git+{{ keystone_git_repo }}@{{ keystone_git_install_branch }}#egg=keystone"
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 6fc75a61..16860b26 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -1,47 +1,47 @@
 - name: apt_package_pinning
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
-  version: master
+  version: stable/pike
 - name: pip_install
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
   scm: git
-  version: master
+  version: stable/pike
 - name: memcached_server
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
-  version: master
+  version: stable/pike
 - name: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: stable/pike
 - name: lxc_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
   scm: git
-  version: master
+  version: stable/pike
 - name: lxc_container_create
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
   scm: git
-  version: master
+  version: stable/pike
 - name: galera_client
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
   scm: git
-  version: master
+  version: stable/pike
 - name: galera_server
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
   scm: git
-  version: master
+  version: stable/pike
 - name: haproxy_server
   src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
   scm: git
-  version: master
+  version: stable/pike
 - name: rabbitmq_server
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
   scm: git
-  version: master
+  version: stable/pike
 - name: openstack_openrc
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
   scm: git
-  version: master
+  version: stable/pike
 - name: os_previous_keystone
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
   scm: git
@@ -49,4 +49,4 @@
 - name: os_tempest
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   scm: git
-  version: master
+  version: stable/pike
diff --git a/tox.ini b/tox.ini
index 022c0c46..21ce5fa9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,8 +75,8 @@ commands =
 [testenv:ansible]
 deps =
     {[testenv]deps}
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
+    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt?h=stable/pike
+    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/pike
 
 
 [testenv:ansible-syntax]