Point to Queens instead of master
There are references that are pointing to master in each role. This should change them. Change-Id: I75fc41837a74365f1c1ae375f8906552b404e2c6
This commit is contained in:
parent
1bb603d223
commit
a2f796cd2a
@ -38,7 +38,7 @@ octavia_package_state: "latest"
|
|||||||
octavia_pip_package_state: "latest"
|
octavia_pip_package_state: "latest"
|
||||||
|
|
||||||
octavia_git_repo: https://git.openstack.org/openstack/octavia
|
octavia_git_repo: https://git.openstack.org/openstack/octavia
|
||||||
octavia_git_install_branch: master
|
octavia_git_install_branch: "stable/queens"
|
||||||
octavia_developer_mode: false
|
octavia_developer_mode: false
|
||||||
octavia_developer_constraints:
|
octavia_developer_constraints:
|
||||||
- "git+{{ octavia_git_repo }}@{{ octavia_git_install_branch }}#egg=octavia"
|
- "git+{{ octavia_git_repo }}@{{ octavia_git_install_branch }}#egg=octavia"
|
||||||
|
@ -1,76 +1,76 @@
|
|||||||
- 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: ceph_client
|
- name: ceph_client
|
||||||
src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
|
src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
|
||||||
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: 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: 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: 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: 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: 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: 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: 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_swift
|
- name: os_swift
|
||||||
src: https://git.openstack.org/openstack/openstack-ansible-os_swift
|
src: https://git.openstack.org/openstack/openstack-ansible-os_swift
|
||||||
scm: git
|
scm: git
|
||||||
version: master
|
version: stable/queens
|
||||||
- name: os_neutron
|
- name: os_neutron
|
||||||
src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
|
src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
|
||||||
scm: git
|
scm: git
|
||||||
version: master
|
version: stable/queens
|
||||||
- name: os_glance
|
- name: os_glance
|
||||||
src: https://git.openstack.org/openstack/openstack-ansible-os_glance
|
src: https://git.openstack.org/openstack/openstack-ansible-os_glance
|
||||||
scm: git
|
scm: git
|
||||||
version: master
|
version: stable/queens
|
||||||
- name: os_nova
|
- name: os_nova
|
||||||
src: https://git.openstack.org/openstack/openstack-ansible-os_nova
|
src: https://git.openstack.org/openstack/openstack-ansible-os_nova
|
||||||
scm: git
|
scm: git
|
||||||
version: master
|
version: stable/queens
|
||||||
- name: etcd # dependency of os_neutron role
|
- name: etcd # dependency of os_neutron role
|
||||||
scm: git
|
scm: git
|
||||||
src: https://github.com/logan2211/ansible-etcd
|
src: https://github.com/logan2211/ansible-etcd
|
||||||
version: master
|
version: '1.3'
|
||||||
- name: rsyslog_client
|
- name: rsyslog_client
|
||||||
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
|
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
|
||||||
scm: git
|
scm: git
|
||||||
version: master
|
version: stable/queens
|
||||||
- name: opendaylight
|
- name: opendaylight
|
||||||
scm: git
|
scm: git
|
||||||
src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
|
src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
|
||||||
version: master
|
version: 4aabce0605ef0f51eef4d6564cc7d779630706c5
|
||||||
|
@ -30,7 +30,8 @@ octavia_system_home_folder: "/var/lib/{{ octavia_system_user_name }}"
|
|||||||
# Octavia specific settings
|
# Octavia specific settings
|
||||||
octavia_venv_tag: "testing"
|
octavia_venv_tag: "testing"
|
||||||
octavia_developer_mode: True
|
octavia_developer_mode: True
|
||||||
octavia_git_install_branch: master
|
# Octavia branch is used outside the role in the test-configure-octavia.yml step
|
||||||
|
octavia_git_install_branch: "stable/queens"
|
||||||
octavia_service_internaluri: "http://{{ test_octavia_api_host }}:9876"
|
octavia_service_internaluri: "http://{{ test_octavia_api_host }}:9876"
|
||||||
octavia_service_internalurl: "{{ octavia_service_internaluri }}"
|
octavia_service_internalurl: "{{ octavia_service_internaluri }}"
|
||||||
octavia_service_password: "secrete"
|
octavia_service_password: "secrete"
|
||||||
|
4
tox.ini
4
tox.ini
@ -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
|
||||||
-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
|
||||||
|
|
||||||
|
|
||||||
[testenv:ansible-syntax]
|
[testenv:ansible-syntax]
|
||||||
|
Loading…
Reference in New Issue
Block a user