From c7029df803c7b59dc7eb7dc8752eac7b5d94b43b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Thu, 15 Feb 2018 12:11:50 +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: I0e5aed99fe724187cff03c76e570b3c010bea7fe
---
 .gitreview                          |  1 +
 defaults/main.yml                   |  2 +-
 tests/ansible-role-requirements.yml | 22 +++++++++++-----------
 tests/test-vars.yml                 |  2 +-
 tox.ini                             |  6 +++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.gitreview b/.gitreview
index 2752a65..aa8a41f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/openstack-ansible-os_watcher.git
+defaultbranch=stable/queens
diff --git a/defaults/main.yml b/defaults/main.yml
index b0d1c60..129c687 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -26,7 +26,7 @@ watcher_developer_mode: false
 
 ## The git source/branch
 watcher_git_repo: https://git.openstack.org/openstack/watcher
-watcher_git_install_branch: master
+watcher_git_install_branch: "stable/queens"
 
 ## The packages to build from source (used in developer mode)
 watcher_developer_constraints:
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index ba9188a..eea4514 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -1,44 +1,44 @@
 - 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: 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: os_keystone
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
   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
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index 336e0f1..3f8c118 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -24,7 +24,7 @@ watcher_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
 watcher_rabbitmq_password: "{{ rabbitmq_password }}"
 watcher_rabbitmq_userid: watcher
 watcher_rabbitmq_vhost: /watcher
-watcher_requirements_git_install_branch: master
+watcher_requirements_git_install_branch: "stable/queens"
 watcher_service_adminurl: "http://{{ hostvars[groups['watcher_api'][0]]['ansible_host'] }}:9322"
 watcher_service_password: "secrete"
 watcher_service_project_domain_id: default
diff --git a/tox.ini b/tox.ini
index 4ffbc4a..249e2a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ envlist = docs,linters,functional
 [testenv]
 usedevelop = True
 install_command =
-    pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+    pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} {opts} {packages}
 deps =
     -r{toxinidir}/test-requirements.txt
 commands =
@@ -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]