From e53d07bffa39e8e0f2645a5dabbae3af76566102 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Thu, 15 Feb 2018 12:10:45 +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: I16d12b5098ffbdb160f4afc1af6cfca78263c0c4
---
 defaults/main.yml                   |  2 +-
 tests/ansible-role-requirements.yml | 26 +++++++++++++-------------
 tests/os_trove-overrides.yml        |  1 -
 tox.ini                             |  4 ++--
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3005d96..1df3d89 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -83,7 +83,7 @@ trove_venv_download: "{{ not trove_developer_mode | bool }}"
 trove_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/trove.tgz
 
 trove_git_repo: "https://git.openstack.org/openstack/trove"
-trove_git_install_branch: master
+trove_git_install_branch: "stable/queens"
 
 trove_developer_mode: false
 trove_developer_constraints:
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 95ec41b..856171c 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -1,52 +1,52 @@
 - name: apt_package_pinning
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   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: memcached_server
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   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_tempest
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   scm: git
-  version: master
+  version: stable/queens
diff --git a/tests/os_trove-overrides.yml b/tests/os_trove-overrides.yml
index 525c38b..6c29262 100644
--- a/tests/os_trove-overrides.yml
+++ b/tests/os_trove-overrides.yml
@@ -29,7 +29,6 @@ trove_rabbitmq_userid: trove
 trove_rabbitmq_vhost: /trove
 trove_guest_rabbitmq_servers: "{{ trove_rabbitmq_servers }}"
 trove_guest_auth_url: "{{ trove_auth_url }}"
-trove_requirements_git_install_branch: master
 trove_service_password: "secrete"
 trove_admin_user_password: "secrete"
 trove_taskmanager_rpc_encr_key: bzH6y0SGmjuoY0FNSTptrhgieGXNDX6PIhvz
diff --git a/tox.ini b/tox.ini
index bdcabc9..acf496b 100755
--- 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/queens
+    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/queens
 
 
 [testenv:ansible-syntax]