diff --git a/Puppetfile b/Puppetfile
index 8d607d8e8..ca808f9f0 100755
--- a/Puppetfile
+++ b/Puppetfile
@@ -4,87 +4,87 @@ moduledir '/usr/share/openstack-puppet/modules'
 
 mod 'aodh',
   :git => 'https://github.com/openstack/puppet-aodh',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'ceilometer',
   :git => 'https://github.com/openstack/puppet-ceilometer',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'cinder',
   :git => 'https://github.com/openstack/puppet-cinder',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'glance',
   :git => 'https://github.com/openstack/puppet-glance',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'gnocchi',
   :git => 'https://github.com/openstack/puppet-gnocchi',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'heat',
   :git => 'https://github.com/openstack/puppet-heat',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'magnum',
   :git => 'https://github.com/openstack/puppet-magnum',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'horizon',
   :git => 'https://github.com/openstack/puppet-horizon',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'ironic',
   :git => 'https://github.com/openstack/puppet-ironic',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'keystone',
   :git => 'https://github.com/openstack/puppet-keystone',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'manila',
   :git => 'https://github.com/openstack/puppet-manila',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'neutron',
   :git => 'https://github.com/openstack/puppet-neutron',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'nova',
   :git => 'https://github.com/openstack/puppet-nova',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'openstack_extras',
   :git => 'https://github.com/openstack/puppet-openstack_extras',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'openstacklib',
   :git => 'https://github.com/openstack/puppet-openstacklib',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'oslo',
   :git => 'https://github.com/openstack/puppet-oslo',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'sahara',
   :git => 'https://github.com/openstack/puppet-sahara',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'swift',
   :git => 'https://github.com/openstack/puppet-swift',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'tempest',
   :git => 'https://github.com/openstack/puppet-tempest',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'trove',
   :git => 'https://github.com/openstack/puppet-trove',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 mod 'vswitch',
   :git => 'https://github.com/openstack/puppet-vswitch',
-  :ref => 'master'
+  :ref => 'stable/ocata'
 
 ## Non-OpenStack modules
 
diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py
index 2413203f8..ed02ce52e 100644
--- a/packstack/plugins/nova_300.py
+++ b/packstack/plugins/nova_300.py
@@ -341,17 +341,6 @@ def create_compute_manifest(config, messages):
     else:
         config["CONFIG_VNCPROXY_PROTOCOL"] = "http"
 
-    migrate_protocol = config['CONFIG_NOVA_COMPUTE_MIGRATE_PROTOCOL']
-    if migrate_protocol == 'ssh':
-        config['CONFIG_NOVA_COMPUTE_MIGRATE_URL'] = (
-            'qemu+ssh://nova@%s/system?no_verify=1&'
-            'keyfile=/etc/nova/ssh/nova_migration_key'
-        )
-    else:
-        config['CONFIG_NOVA_COMPUTE_MIGRATE_URL'] = (
-            'qemu+tcp://nova@%s/system'
-        )
-
     config["CONFIG_NOVA_ALLOW_RESIZE_TO_SAME"] = len(compute_hosts) == 1
 
     ssh_keys_details = {}
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute.pp b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
index 8d7ef7e25..53b8fe8bc 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
@@ -29,8 +29,6 @@ class packstack::nova::compute ()
     nova_config{
       'DEFAULT/volume_api_class':
         value => 'nova.volume.cinder.API';
-      'libvirt/live_migration_uri':
-        value => hiera('CONFIG_NOVA_COMPUTE_MIGRATE_URL');
     }
 
     if ($::fqdn == '' or $::fqdn =~ /localhost/) {
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp b/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp
index c10edb326..86f5a9548 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp
@@ -27,6 +27,23 @@ class packstack::nova::compute::libvirt ()
         Service <| title == 'libvirt' |>
     }
 
+    $migrate_transport = hiera('CONFIG_NOVA_COMPUTE_MIGRATE_PROTOCOL')
+    if $migrate_transport == 'ssh' {
+      $client_extraparams = {
+        no_verify => 1,
+        keyfile   => '/etc/nova/ssh/nova_migration_key',
+      }
+    } else {
+      $client_extraparams = {}
+    }
+
+    class { '::nova::migration::libvirt':
+      transport   => $migrate_transport,
+      client_user => 'nova',
+      client_extraparams => $client_extraparams,
+      require => Class['::nova::compute::libvirt']
+    }
+
     class { '::nova::compute::libvirt':
       libvirt_virt_type        => $libvirt_virt_type,
       vncserver_listen         => $libvirt_vnc_bind_host,
diff --git a/run_tests.sh b/run_tests.sh
index 9825cb8eb..946162e71 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -20,8 +20,8 @@ SCENARIO=${SCENARIO:-scenario001}
 # We could want to override the default repositories or install behavior
 INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true}
 MANAGE_REPOS=${MANAGE_REPOS:-true}
-DELOREAN=${DELOREAN:-http://trunk.rdoproject.org/centos7-master/current-passed-ci/delorean.repo}
-DELOREAN_DEPS=${DELOREAN_DEPS:-http://trunk.rdoproject.org/centos7-master/delorean-deps.repo}
+DELOREAN=${DELOREAN:-http://trunk.rdoproject.org/centos7-ocata/current-passed-ci/delorean.repo}
+DELOREAN_DEPS=${DELOREAN_DEPS:-http://trunk.rdoproject.org/centos7-ocata/delorean-deps.repo}
 GIT_BASE_URL=${GIT_BASE_URL:-git://git.openstack.org}
 ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-}
 # If logs should be retrieved automatically