Merge "Point to Queens instead of master" into stable/queens

.gitreview

@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/openstack-ansible-os_cloudkitty.git
+defaultbranch=stable/queens

defaults/main.yml

@@ -44,10 +44,10 @@ cloudkitty_venv_download: "{{ not cloudkitty_developer_mode | bool }}"
 cloudkitty_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/cloudkitty.tgz
 
 cloudkitty_git_repo: https://git.openstack.org/openstack/cloudkitty
-cloudkitty_git_install_branch: master
+cloudkitty_git_install_branch: "15d0a7dd0543f00fa3886d287b980e65b346d949" #frozen head of master, no "stable/queens" branch yet.
 
 cloudkitty_developer_constraints:
-  - "git+{{ cloudkitty_git_repo }}@{{ cloudkitty_requirements_git_install_branch }}#egg=cloudkitty"
+  - "git+{{ cloudkitty_git_repo }}@{{ cloudkitty_git_install_branch }}#egg=cloudkitty"
 
 cloudkitty_developer_mode: false
 cloudkitty_notification_topics: notifications

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

tests/os_cloudkitty-overrides.yml

@@ -15,8 +15,6 @@
 
 cloudkitty_venv_tag: "testing"
 cloudkitty_developer_mode: true
-cloudkitty_git_install_branch: master
-cloudkitty_requirements_git_install_branch: master
 cloudkitty_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
 cloudkitty_container_mysql_password: "SuperSecrete"
 cloudkitty_service_password: "secrete"

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 =
@@ -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]