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

defaults/main.yml

@@ -26,9 +26,9 @@ tacker_package_state: "latest"
 tacker_pip_package_state: "latest"
 
 tacker_git_repo: https://git.openstack.org/openstack/tacker
-tacker_git_install_branch: master
+tacker_git_install_branch: "stable/queens"
 tacker_requirements_git_repo: https://git.openstack.org/openstack/requirements
-tacker_requirements_git_install_branch: master
+tacker_requirements_git_install_branch: "stable/queens"
 tacker_developer_mode: false
 tacker_developer_constraints:
   - "git+{{ tacker_git_repo }}@{{ tacker_git_install_branch }}#egg=tacker"
@@ -137,7 +137,7 @@ heat_service_adminurl: "{{ tacker_service_publicuri_proto }}://{{ external_lb_vi
 #NOTE: these default should be updated approprietly
 # tacker-horizon uses this
 tackerclient_git_url: https://github.com/openstack/python-tackerclient.git
-tacker_git_branch: "master"
+tacker_git_branch: "stable/queens"
 
 # tacker horizon vars
 tacker_horizon_venv: "/openstack/venvs/horizon-{{ openstack_release }}"

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

tox.ini

@@ -82,7 +82,7 @@ commands =
 [testenv:ansible]
 deps =
     {[testenv]deps}
-    -rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
+    -rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/queens
 commands =
     {[testenv:tests_clone]commands}
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"