Point to Queens instead of master
There are references that are pointing to master in each role. This should change them. Change-Id: I99438a5377061bdeabd3c0bc3ddf28e3783c9b8c
This commit is contained in:
parent
70978e17b6
commit
a6f0e9d4be
|
@ -2,3 +2,4 @@
|
|||
host=review.openstack.org
|
||||
port=29418
|
||||
project=openstack/openstack-ansible-os_monasca.git
|
||||
defaultbranch=stable/queens
|
||||
|
|
|
@ -26,19 +26,19 @@ monasca_pip_package_state: "latest"
|
|||
|
||||
monasca_developer_mode: false
|
||||
monasca_api_git_repo: "https://git.openstack.org/openstack/monasca-api"
|
||||
monasca_api_git_install_branch: master
|
||||
monasca_api_git_install_branch: "stable/queens"
|
||||
monasca_common_git_repo: "https://git.openstack.org/openstack/monasca-common"
|
||||
monasca_common_git_install_branch: master
|
||||
monasca_common_git_install_branch: "stable/queens"
|
||||
monasca_thresh_git_repo: "https://git.openstack.org/openstack/monasca-thresh"
|
||||
monasca_thresh_git_install_branch: master
|
||||
monasca_thresh_git_install_branch: "stable/queens"
|
||||
monasca_notification_git_repo: "https://git.openstack.org/openstack/monasca-notification"
|
||||
monasca_notification_git_install_branch: master
|
||||
monasca_notification_git_install_branch: "stable/queens"
|
||||
monasca_persister_git_repo: "https://git.openstack.org/openstack/monasca-persister"
|
||||
monasca_persister_git_install_branch: master
|
||||
monasca_persister_git_install_branch: "stable/queens"
|
||||
monasca_python_client_git_repo: "https://git.openstack.org/openstack/python-monascaclient"
|
||||
monasca_python_client_git_install_branch: master
|
||||
monasca_python_client_git_install_branch: "stable/queens"
|
||||
monasca_statsd_git_repo: "https://git.openstack.org/openstack/monasca-statsd"
|
||||
monasca_statsd_git_install_branch: master
|
||||
monasca_statsd_git_install_branch: "stable/queens"
|
||||
|
||||
monasca_developer_constraints:
|
||||
- "git+{{ monasca_api_git_repo }}@{{ monasca_api_git_install_branch }}#egg=monasca-api"
|
||||
|
|
|
@ -17,33 +17,33 @@
|
|||
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
|
||||
|
||||
monasca_api_git_repo: "https://git.openstack.org/openstack/monasca-api"
|
||||
monasca_api_git_install_branch: master
|
||||
monasca_api_git_install_branch: "stable/queens"
|
||||
monasca_api_git_dest: "/opt/monasca_{{ monasca_api_git_install_branch | replace('/', '_') }}"
|
||||
|
||||
monasca_agent_git_repo: "https://git.openstack.org/openstack/monasca-agent"
|
||||
monasca_agent_git_install_branch: master
|
||||
monasca_agent_git_install_branch: "stable/queens"
|
||||
monasca_agent_git_dest: "/opt/monasca_{{ monasca_log_api_git_install_branch | replace('/', '_') }}"
|
||||
|
||||
monasca_common_git_repo: "https://git.openstack.org/openstack/monasca-common"
|
||||
monasca_common_git_install_branch: master
|
||||
monasca_common_git_install_branch: "stable/queens"
|
||||
monasca_common_git_dest: "/opt/monasca_{{ monasca_api_git_install_branch | replace('/', '_') }}"
|
||||
|
||||
monasca_thresh_git_repo: "https://git.openstack.org/openstack/monasca-thresh"
|
||||
monasca_thresh_git_install_branch: master
|
||||
monasca_thresh_git_install_branch: "stable/queens"
|
||||
monasca_thresh_git_dest: "/opt/monasca_{{ monasca_thresh_git_install_branch | replace('/', '_') }}"
|
||||
|
||||
monasca_notification_git_repo: "https://git.openstack.org/openstack/monasca-notification"
|
||||
monasca_notification_git_install_branch: master
|
||||
monasca_notification_git_install_branch: "stable/queens"
|
||||
monasca_notification_git_dest: "/opt/monasca_{{ monasca_notification_git_install_branch | replace('/', '_') }}"
|
||||
|
||||
monasca_persister_git_repo: "https://git.openstack.org/openstack/monasca-persister"
|
||||
monasca_persister_git_install_branch: master
|
||||
monasca_persister_git_install_branch: "stable/queens"
|
||||
monasca_persister_git_dest: "/opt/monasca_{{ monasca_persister_git_install_branch | replace('/', '_') }}"
|
||||
|
||||
monasca_python_client_git_repo: "https://git.openstack.org/openstack/python-monascaclient"
|
||||
monasca_python_client_git_install_branch: master
|
||||
monasca_python_client_git_install_branch: "stable/queens"
|
||||
monasca_python_client_git_dest: "/opt/monasca_{{ monasca_python_client_git_install_branch | replace('/', '_') }}"
|
||||
|
||||
monasca_ui_git_repo: "https://git.openstack.org/openstack/monasca-ui"
|
||||
monasca_ui_git_install_branch: master
|
||||
monasca_ui_git_install_branch: "stable/queens"
|
||||
monasca_ui_git_dest: "/opt/monasca_{{ monasca_ui_git_install_branch | replace('/', '_') }}"
|
||||
|
|
|
@ -1,68 +1,68 @@
|
|||
- 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: memcached_server
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
|
||||
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: 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_tempest
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
|
||||
scm: git
|
||||
version: master
|
||||
version: stable/queens
|
||||
- name: ansible-zookeeper
|
||||
src: https://github.com/Chillisystems/ansible-zookeeper
|
||||
scm: git
|
||||
version: master
|
||||
version: a856bc6e568d8104328af5d2cdfb86ab095d031f
|
||||
- name: ansible-kafka
|
||||
src: https://github.com/flaviodsr/ansible-kafka
|
||||
scm: git
|
||||
version: master
|
||||
version: f09820f5485883b272d4da724da699cb7e1e05cf
|
||||
- name: ansible-storm
|
||||
src: https://github.com/flaviodsr/ansible-storm
|
||||
scm: git
|
||||
version: master
|
||||
version: a1ba474cb2afc8d35599940c301952e1dba3f544
|
||||
- name: ansible-influxdb
|
||||
src: https://github.com/flaviodsr/ansible-influxdb
|
||||
scm: git
|
||||
version: master
|
||||
version: 6c25c6f46792ad4f2d00b9a6e6fbb86c6344c193
|
||||
- name: grafana-ansible
|
||||
src: https://github.com/flaviodsr/grafana-ansible
|
||||
scm: git
|
||||
version: master
|
||||
version: 796eb972d6712143a0430bc7b6a7aec2fbd9d231
|
||||
|
|
|
@ -21,7 +21,6 @@ test_monasca_group: "{{ ((groups['monasca_all'] is defined) and (groups['monasca
|
|||
test_monasca_host: "{{ hostvars[groups[test_monasca_group][0]]['ansible_host'] }}"
|
||||
monasca_venv_tag: "testing"
|
||||
monasca_developer_mode: true
|
||||
monasca_git_install_branch: master
|
||||
monasca_service_password: "secrete"
|
||||
monasca_galera_address: "{{ test_galera_host }}"
|
||||
monasca_galera_database: monasca
|
||||
|
@ -50,9 +49,9 @@ monasca_agent_roles:
|
|||
tempest_run: yes
|
||||
|
||||
tempest_plugins:
|
||||
- name: monasca-api
|
||||
repo: https://git.openstack.org/openstack/monasca-api
|
||||
branch: master
|
||||
- name: monasca-tempest-plugins
|
||||
repo: https://github.com/openstack/monasca-tempest-plugin
|
||||
branch: d04d12bdf9e76ca1fc15486e0edd9094357f8db7
|
||||
|
||||
tempest_test_whitelist:
|
||||
- monasca_tempest_tests.tests.api.*
|
||||
|
|
6
tox.ini
6
tox.ini
|
@ -7,7 +7,7 @@ envlist = docs,linters,functional
|
|||
[testenv]
|
||||
usedevelop = True
|
||||
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 =
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands =
|
||||
|
@ -76,8 +76,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