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

defaults/main.yml

@@ -26,7 +26,7 @@ ceilometer_developer_mode: false
 
 ## The git source/branch
 ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
-ceilometer_git_install_branch: master
+ceilometer_git_install_branch: "stable/queens"
 
 ## The packages to build from source (used in developer mode)
 ceilometer_developer_constraints:

tests/ansible-role-requirements.yml

@@ -1,60 +1,60 @@
 - 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: os_tempest
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   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: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: stable/queens
 - name: os_gnocchi
   src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
   scm: git
-  version: master
+  version: stable/queens

tests/os_ceilometer-gnocchi-overrides.yml

@@ -19,7 +19,7 @@ ceilometer_rabbitmq_vhost: /ceilometer
 ceilometer_rabbitmq_servers: "{{ rabbitmq_servers }}"
 ceilometer_venv_tag: "testing"
 ceilometer_developer_mode: True
-ceilometer_git_install_branch: master
+ceilometer_git_install_branch: "stable/queens"
 ceilometer_service_password: secrete
 ceilometer_telemetry_secret: secrete
 ceilometer_gnocchi_enabled: True
@@ -48,7 +48,7 @@ tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
 tempest_plugins:
   - name: tempest-ceilometer
     repo: https://git.openstack.org/openstack/ceilometer
-    branch: master
+    branch: stable/queens
 
 tempest_test_whitelist:
   - ceilometer.tests.tempest.api.test_telemetry_notification_api

tests/os_ceilometer-overrides.yml

@@ -21,7 +21,7 @@ ceilometer_rabbitmq_vhost: /ceilometer
 ceilometer_rabbitmq_servers: "{{ rabbitmq_servers }}"
 ceilometer_venv_tag: "testing"
 ceilometer_developer_mode: True
-ceilometer_git_install_branch: master
+ceilometer_git_install_branch: "stable/queens"
 ceilometer_service_password: secrete
 ceilometer_telemetry_secret: secrete
 ceilometer_container_db_password: secrete
@@ -53,7 +53,7 @@ tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
 tempest_plugins:
   - name: tempest-ceilometer
     repo: https://git.openstack.org/openstack/ceilometer
-    branch: master
+    branch: stable/queens
 
 tempest_test_whitelist:
   - ceilometer.tests.tempest.api.test_telemetry_notification_api

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]