diff --git a/defaults/main.yml b/defaults/main.yml index a8b966b..f513d5f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -20,7 +20,7 @@ sahara_package_state: "latest" sahara_pip_package_state: "latest" sahara_git_repo: https://git.openstack.org/openstack/sahara -sahara_git_install_branch: master +sahara_git_install_branch: stable/ocata sahara_developer_mode: false sahara_developer_constraints: - "git+{{ sahara_git_repo }}@{{ sahara_git_install_branch }}#egg=sahara" diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index afce09c..8015592 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -1,52 +1,52 @@ - 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: memcached_server src: https://git.openstack.org/openstack/openstack-ansible-memcached_server 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: 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: rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_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: os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone scm: git - version: master + version: origin/stable/ocata - name: os_nova src: https://git.openstack.org/openstack/openstack-ansible-os_nova scm: git - version: master + version: origin/stable/ocata - name: os_tempest src: https://git.openstack.org/openstack/openstack-ansible-os_tempest scm: git - version: master + version: origin/stable/ocata diff --git a/tox.ini b/tox.ini index 657950a..86e9376 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" @@ -83,7 +83,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]