openstack
/
openstack-ansible-os_barbican
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2018-02-15 16:00:18 +00:00 committed by Gerrit Code Review
parent 5cffdead71 64fb891d4a
commit bd8b72cb68
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -71,7 +71,7 @@ barbican_developer_mode: false
## The git source/branch ## The git source/branch
barbican_git_repo: "https://git.openstack.org/openstack/barbican" barbican_git_repo: "https://git.openstack.org/openstack/barbican"
barbican_git_install_branch: master barbican_git_install_branch: "stable/queens"
## The packages to build from source (used in developer mode) ## The packages to build from source (used in developer mode)
barbican_developer_constraints: barbican_developer_constraints:

24
tests/ansible-role-requirements.yml
View File

@ -1,48 +1,48 @@
- name: apt_package_pinning - name: apt_package_pinning
src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
scm: git scm: git
version: master version: stable/queens
- name: pip_install - name: pip_install
src: https://git.openstack.org/openstack/openstack-ansible-pip_install src: https://git.openstack.org/openstack/openstack-ansible-pip_install
scm: git scm: git
version: master version: stable/queens
- name: galera_client - name: galera_client
src: https://git.openstack.org/openstack/openstack-ansible-galera_client src: https://git.openstack.org/openstack/openstack-ansible-galera_client
scm: git scm: git
version: master version: stable/queens
- name: galera_server - name: galera_server
src: https://git.openstack.org/openstack/openstack-ansible-galera_server src: https://git.openstack.org/openstack/openstack-ansible-galera_server
scm: git scm: git
version: master version: stable/queens
- name: lxc_container_create - name: lxc_container_create
src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
scm: git scm: git
version: master version: stable/queens
- name: lxc_hosts - name: lxc_hosts
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
scm: git scm: git
version: master version: stable/queens
- name: memcached_server - name: memcached_server
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
scm: git scm: git
version: master version: stable/queens
- name: openstack_openrc - name: openstack_openrc
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
scm: git scm: git
version: master version: stable/queens
- name: os_keystone - name: os_keystone
src: https://git.openstack.org/openstack/openstack-ansible-os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
scm: git scm: git
version: master version: stable/queens
- name: rabbitmq_server - name: rabbitmq_server
src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
scm: git scm: git
version: master version: stable/queens
- name: openstack_hosts - name: openstack_hosts
src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
scm: git scm: git
version: master version: stable/queens
- name: os_tempest - name: os_tempest
src: https://git.openstack.org/openstack/openstack-ansible-os_tempest src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
scm: git scm: git
version: master version: stable/queens

4
tox.ini
View File

@ -75,8 +75,8 @@ commands =
[testenv:ansible] [testenv:ansible]
deps = deps =
{[testenv]deps} {[testenv]deps}
-rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.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 -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/queens
[testenv:ansible-syntax] [testenv:ansible-syntax]