From a2f796cd2aa8074ffa9ad89d0f11a1bf434308ba Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Thu, 15 Feb 2018 10:54:10 +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: I75fc41837a74365f1c1ae375f8906552b404e2c6
---
 defaults/main.yml                   |  2 +-
 tests/ansible-role-requirements.yml | 38 ++++++++++++++---------------
 tests/os_octavia-overrides.yml      |  3 ++-
 tox.ini                             |  4 +--
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e21edc6e..859ac577 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -38,7 +38,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/queens"
 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 7db6fd70..86577d82 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -1,76 +1,76 @@
 - 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: 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
 - name: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: stable/queens
 - name: os_swift
   src: https://git.openstack.org/openstack/openstack-ansible-os_swift
   scm: git
-  version: master
+  version: stable/queens
 - name: os_neutron
   src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
   scm: git
-  version: master
+  version: stable/queens
 - name: os_glance
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
   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: etcd # dependency of os_neutron role
   scm: git
   src: https://github.com/logan2211/ansible-etcd
-  version: master
+  version: '1.3'
 - name: rsyslog_client
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
   scm: git
-  version: master
+  version: stable/queens
 - name: opendaylight
   scm: git
   src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
-  version: master
+  version: 4aabce0605ef0f51eef4d6564cc7d779630706c5
diff --git a/tests/os_octavia-overrides.yml b/tests/os_octavia-overrides.yml
index 92f4de90..9d27b60e 100644
--- a/tests/os_octavia-overrides.yml
+++ b/tests/os_octavia-overrides.yml
@@ -30,7 +30,8 @@ octavia_system_home_folder: "/var/lib/{{ octavia_system_user_name }}"
 # Octavia specific settings
 octavia_venv_tag: "testing"
 octavia_developer_mode: True
-octavia_git_install_branch: master
+# Octavia branch is used outside the role in the test-configure-octavia.yml step
+octavia_git_install_branch: "stable/queens"
 octavia_service_internaluri: "http://{{ test_octavia_api_host }}:9876"
 octavia_service_internalurl: "{{ octavia_service_internaluri }}"
 octavia_service_password: "secrete"
diff --git a/tox.ini b/tox.ini
index 9ee77e3e..b8848230 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/queens
+    -rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/queens
 
 
 [testenv:ansible-syntax]