diff --git a/defaults/main.yml b/defaults/main.yml index c86ce248..5a4ac2ba 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,7 +19,7 @@ cinder_package_state: "latest" cinder_pip_package_state: "latest" cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: master +cinder_git_install_branch: stable/pike cinder_developer_mode: false cinder_developer_constraints: - "git+{{ cinder_git_repo }}@{{ cinder_git_install_branch }}#egg=cinder" diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 7711426d..60f60e10 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -1,55 +1,55 @@ - name: apt_package_pinning src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning scm: git - version: master + version: stable/pike - name: pip_install src: https://git.openstack.org/openstack/openstack-ansible-pip_install scm: git - version: master + version: stable/pike - name: memcached_server src: https://git.openstack.org/openstack/openstack-ansible-memcached_server scm: git - version: master + version: stable/pike - name: lxc_hosts src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts scm: git - version: master + version: stable/pike - name: lxc_container_create src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create scm: git - version: master + version: stable/pike - name: galera_client src: https://git.openstack.org/openstack/openstack-ansible-galera_client scm: git - version: master + version: stable/pike - name: galera_server src: https://git.openstack.org/openstack/openstack-ansible-galera_server scm: git - version: master + version: stable/pike - name: rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server scm: git - version: master + version: stable/pike - name: openstack_openrc src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc scm: git - version: master + version: stable/pike - name: os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone scm: git - version: master + version: stable/pike - name: os_tempest src: https://git.openstack.org/openstack/openstack-ansible-os_tempest scm: git - version: master + version: stable/pike - name: openstack_hosts src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts scm: git - version: master + version: stable/pike - name: ceph_client src: https://git.openstack.org/openstack/openstack-ansible-ceph_client scm: git - version: master + version: stable/pike - name: os_previous_cinder src: https://git.openstack.org/openstack/openstack-ansible-os_cinder scm: git diff --git a/tox.ini b/tox.ini index ed00f9bc..e1e4565d 100644 --- a/tox.ini +++ b/tox.ini @@ -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/pike + -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/pike [testenv:ansible-syntax]