Merge "Update upgrade role for Queens from P"

tests/ansible-role-requirements.yml

@@ -45,7 +45,7 @@
 - name: os_previous_keystone
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
   scm: git
-  version: stable/ocata
+  version: stable/pike
 - name: os_tempest
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   scm: git

tests/test-upgrade-pre.yml

@@ -31,5 +31,8 @@
 # Install RabbitMQ/MariaDB
 - include: common/test-install-infra.yml
 
+# Ensure the repo is setup for previous version
+- include: common/previous/test-repo-setup.yml
+
 # Install previous Keystone
 - include: test-install-previous-keystone.yml