Point to Queens instead of master
There are references that are pointing to master in each role. This should change them. This also backports [1] to ensure only the required storage drivers are used. [1]: https://review.openstack.org/#/c/542898/4 Change-Id: Ibfa1611ca203525d6b278f8aeb5ef41aca048a6a
This commit is contained in:
parent
9c80fac251
commit
f9e2942718
|
@ -2,5 +2,5 @@
|
|||
src: https://git.openstack.org/openstack/openstack-ansible-plugins
|
||||
path: /etc/ansible
|
||||
scm: git
|
||||
version: master
|
||||
version: stable/queens
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ gnocchi_auth_mode: "{{ (gnocchi_keystone_auth | bool) | ternary('keystone', 'bas
|
|||
# to build an environment directly from a git source without the presence
|
||||
# of an OpenStack-Ansible repo_server.
|
||||
gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi
|
||||
gnocchi_git_install_branch: master
|
||||
gnocchi_git_install_branch: "stable/4.2"
|
||||
gnocchi_developer_mode: false
|
||||
gnocchi_developer_constraints:
|
||||
- "git+{{ gnocchi_git_repo }}@{{ gnocchi_git_install_branch }}#egg=gnocchi"
|
||||
|
@ -167,7 +167,7 @@ gnocchi_requires_pip_packages:
|
|||
gnocchi_pip_packages:
|
||||
- cryptography
|
||||
- gnocchiclient
|
||||
- "gnocchi[mysql,file,swift,ceph]"
|
||||
- "gnocchi[mysql,{{ gnocchi_storage_driver | default('file') }}]"
|
||||
- keystonemiddleware
|
||||
- python-memcached
|
||||
|
||||
|
|
|
@ -1,52 +1,52 @@
|
|||
- 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: 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: memcached_server
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
|
||||
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: openstack_openrc
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
|
||||
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: os_ceilometer
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
|
||||
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
|
||||
|
|
4
tox.ini
4
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]
|
||||
|
|
Loading…
Reference in New Issue