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

The etcd role pin is set to the current pin in the
integrated repo.

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

diff --git a/defaults/main.yml b/defaults/main.yml
index 18b26898..87299034 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -22,7 +22,7 @@ octavia_package_state: "latest"
 octavia_pip_package_state: "latest"
 
 octavia_git_repo: https://git.openstack.org/openstack/octavia
-octavia_git_install_branch: master
+octavia_git_install_branch: stable/pike
 octavia_developer_mode: false
 octavia_developer_constraints:
   - "git+{{ octavia_git_repo }}@{{ octavia_git_install_branch }}#egg=octavia"
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 66cff4f1..a35aa2e5 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -1,72 +1,72 @@
 - name: apt_package_pinning
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
-  version: master
+  version: stable/pike
 - name: ceph_client
   src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
   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: 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: rabbitmq_server
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
   scm: git
-  version: master
+  version: stable/pike
 - name: os_keystone
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
   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: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: stable/pike
 - name: os_swift
   src: https://git.openstack.org/openstack/openstack-ansible-os_swift
   scm: git
-  version: master
+  version: stable/pike
 - name: os_neutron
   src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
   scm: git
-  version: master
+  version: stable/pike
 - name: os_glance
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
   scm: git
-  version: master
+  version: stable/pike
 - name: os_nova
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova
   scm: git
-  version: master
+  version: stable/pike
 - name: etcd # dependency of os_neutron role
   scm: git
   src: https://github.com/logan2211/ansible-etcd
-  version: master
+  version: '1.2'
 - name: rsyslog_client
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
   scm: git
-  version: master
+  version: stable/pike
diff --git a/tox.ini b/tox.ini
index e04a4b9d..07eb61e4 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
-    -rhttp://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
+    -rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/pike
 
 
 [testenv:ansible-syntax]