diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
index c24f2f093cea..7d2e19dca77f 100755
--- a/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@ -10806,7 +10806,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
 
         def fake_create_domain_and_network(
                 context, xml, instance, network_info,
-                block_device_info=None, power_on=True, reboot=False,
+                block_device_info=None, power_on=True,
                 vifs_already_plugged=False, post_xml_callback=None,
                 destroy_disks_on_failure=False):
             # The config disk should be created by this callback, so we need
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 6b0f65075a6a..71304303c7cc 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -5176,8 +5176,7 @@ class LibvirtDriver(driver.ComputeDriver):
                          destroy_disks=destroy_disks)
 
     def _create_domain_and_network(self, context, xml, instance, network_info,
-                                   block_device_info=None,
-                                   power_on=True, reboot=False,
+                                   block_device_info=None, power_on=True,
                                    vifs_already_plugged=False,
                                    post_xml_callback=None,
                                    destroy_disks_on_failure=False):
@@ -5189,7 +5188,7 @@ class LibvirtDriver(driver.ComputeDriver):
         for vol in block_device_mapping:
             connection_info = vol['connection_info']
 
-            if (not reboot and 'data' in connection_info and
+            if ('data' in connection_info and
                     'volume_id' in connection_info['data']):
                 volume_id = connection_info['data']['volume_id']
                 encryption = encryptors.get_encryption_metadata(