Merge "Point to Queens instead of master" into stable/queens
This commit is contained in:
commit
57a6abb948
|
@ -2,3 +2,4 @@
|
||||||
host=review.openstack.org
|
host=review.openstack.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/openstack-ansible-os_zaqar.git
|
project=openstack/openstack-ansible-os_zaqar.git
|
||||||
|
defaultbranch=stable/queens
|
||||||
|
|
|
@ -32,7 +32,7 @@ zaqar_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/zaqar.tgz
|
||||||
zaqar_venv_localpath: /opt/kong/zaqar.tgz
|
zaqar_venv_localpath: /opt/kong/zaqar.tgz
|
||||||
|
|
||||||
zaqar_git_repo: https://github.com/openstack/zaqar
|
zaqar_git_repo: https://github.com/openstack/zaqar
|
||||||
zaqar_git_install_branch: master
|
zaqar_git_install_branch: "stable/queens"
|
||||||
zaqar_developer_mode: false
|
zaqar_developer_mode: false
|
||||||
zaqar_developer_constraints:
|
zaqar_developer_constraints:
|
||||||
- "git+{{ zaqar_git_repo }}@{{ zaqar_git_install_branch }}#egg=zaqar"
|
- "git+{{ zaqar_git_repo }}@{{ zaqar_git_install_branch }}#egg=zaqar"
|
||||||
|
|
|
@ -1,41 +1,41 @@
|
||||||
- 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: 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: 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: 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: 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: 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: 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: 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
|
||||||
|
|
||||||
|
|
6
tox.ini
6
tox.ini
|
@ -7,7 +7,7 @@ envlist = docs,linters,functional
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command =
|
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 =
|
deps =
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
|
@ -82,8 +82,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]
|
||||||
|
|
Loading…
Reference in New Issue