Update repo for stable/ocata

Change-Id: If913ce20622f13c1e5a73e5a010ad421568c681c

defaults/main.yml

@@ -59,7 +59,7 @@ magnum_venv_download: "{{ not magnum_developer_mode | bool }}"
 magnum_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/magnum.tgz
 
 magnum_git_repo: "https://git.openstack.org/openstack/magnum"
-magnum_git_install_branch: master
+magnum_git_install_branch: stable/ocata
 magnum_developer_mode: false
 magnum_developer_constraints:
   - "git+{{ magnum_git_repo }}@{{ magnum_git_install_branch }}#egg=magnum"

tests/ansible-role-requirements.yml

@@ -1,76 +1,76 @@
 - name: apt_package_pinning
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   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: 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: 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: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   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: haproxy_server
   src: https://git.openstack.org/openstack/openstack-ansible-haproxy_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: os_keystone
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: os_glance
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
   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: etcd # dependency of os_neutron role
   scm: git
   src: https://github.com/logan2211/ansible-etcd
-  version: master
+  version: 1.2
 - name: os_neutron
   src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
   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
 - name: os_cinder
   src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: os_heat
   src: https://git.openstack.org/openstack/openstack-ansible-os_heat
   scm: git
-  version: master
+  version: origin/stable/ocata

tests/magnum-test-vars.yml

@@ -23,7 +23,7 @@ magnum_glance_images:
     public: true
     file: https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2
     distro: fedora-atomic
-    checksum: "sha1:edbaeb0ece775dff88c5fa2fdf3bbdad79bd2b4d"
+    checksum: "sha1:eba0fa9a8f03de3c646ef7cb080872634497463a"
 
 haproxy_default_services:
   - service:

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]