From 36c48a38efbda0d0de7efdb8f48fa638e35df170 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Thu, 15 Feb 2018 10:57:58 +0000
Subject: [PATCH] Point to Queens instead of master

There are references that are pointing to master in each role.
This should change them.

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

diff --git a/defaults/main.yml b/defaults/main.yml
index 41ec428..2e58db8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -20,7 +20,7 @@ sahara_package_state: "latest"
 sahara_pip_package_state: "latest"
 
 sahara_git_repo: https://git.openstack.org/openstack/sahara
-sahara_git_install_branch: master
+sahara_git_install_branch: "stable/queens"
 sahara_developer_mode: false
 sahara_developer_constraints:
   - "git+{{ sahara_git_repo }}@{{ sahara_git_install_branch }}#egg=sahara"
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index a1b51f8..042650c 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -1,56 +1,56 @@
 - name: apt_package_pinning
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
-  version: master
+  version: stable/queens
 - name: ceph_client
   src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
   scm: git
-  version: master
+  version: stable/queens
 - name: pip_install
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
   scm: git
-  version: master
+  version: stable/queens
 - name: memcached_server
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
-  version: master
+  version: stable/queens
 - name: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: stable/queens
 - name: lxc_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
   scm: git
-  version: master
+  version: stable/queens
 - name: lxc_container_create
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
   scm: git
-  version: master
+  version: stable/queens
 - name: galera_client
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
   scm: git
-  version: master
+  version: stable/queens
 - name: galera_server
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
   scm: git
-  version: master
+  version: stable/queens
 - name: rabbitmq_server
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
   scm: git
-  version: master
+  version: stable/queens
 - name: openstack_openrc
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
   scm: git
-  version: master
+  version: stable/queens
 - name: os_keystone
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
   scm: git
-  version: master
+  version: stable/queens
 - name: os_nova
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova
   scm: git
-  version: master
+  version: stable/queens
 - name: os_tempest
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   scm: git
-  version: master
+  version: stable/queens
diff --git a/tox.ini b/tox.ini
index b56232b..69a28dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -76,8 +76,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/queens
+    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/queens
 
 
 [testenv:ansible-syntax]