diff --git a/defaults/main.yml b/defaults/main.yml index 4d525e9..350fb5e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -26,7 +26,7 @@ rally_system_user_home: "/var/lib/{{ rally_system_user_name }}" rally_etc_directory: /etc/rally rally_git_repo: https://git.openstack.org/openstack/rally -rally_git_install_branch: master +rally_git_install_branch: 0.8.1 rally_developer_mode: false rally_developer_constraints: - "git+{{ rally_git_repo }}@{{ rally_git_install_branch }}#egg=rally" diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index ddaa3ae..937aa48 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -1,44 +1,44 @@ - name: apt_package_pinning src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning scm: git - version: master + version: origin/stable/ocata - name: pip_install src: https://git.openstack.org/openstack/openstack-ansible-pip_install scm: git - version: master + version: origin/stable/ocata - name: openstack_hosts src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts scm: git - version: master + version: origin/stable/ocata - name: lxc_hosts src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts scm: git - version: master + version: origin/stable/ocata - name: lxc_container_create src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create scm: git - version: master + version: origin/stable/ocata - name: rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server scm: git - version: master + version: origin/stable/ocata - name: galera_client src: https://git.openstack.org/openstack/openstack-ansible-galera_client scm: git - version: master + version: origin/stable/ocata - name: galera_server src: https://git.openstack.org/openstack/openstack-ansible-galera_server scm: git - version: master + version: origin/stable/ocata - name: openstack_openrc src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc scm: git - version: master + version: origin/stable/ocata - name: memcached_server src: https://git.openstack.org/openstack/openstack-ansible-memcached_server scm: git - version: master + version: origin/stable/ocata - name: os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone scm: git - version: master + version: origin/stable/ocata diff --git a/tox.ini b/tox.ini index 2c2c7fb..f449ee0 100644 --- a/tox.ini +++ b/tox.ini @@ -56,7 +56,7 @@ commands = [testenv:tests_clone] commands = bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \ - git clone https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \ + git clone -b stable/ocata https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \ fi" @@ -82,7 +82,7 @@ commands = [testenv:ansible] deps = {[testenv]deps} - -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/ocata [testenv:ansible-syntax]