diff --git a/manifests/compute/xenserver.pp b/manifests/compute/xenserver.pp
index 9265e5be2..cebd6d23e 100644
--- a/manifests/compute/xenserver.pp
+++ b/manifests/compute/xenserver.pp
@@ -13,29 +13,31 @@
 # [*xenapi_connection_password*]
 #   (required) Password for connection to XenServer/Xen Cloud Platform
 #
-# [*xenapi_inject_image*]
-#   (optional) This parameter was removed in Diablo and does nothing.
-#   Defaults to false
-#
 # [*compute_driver*]
 #   (optional) Compute driver.
 #   Defaults to 'xenapi.XenAPIDriver'
 #
+# [*xenapi_inject_image*]
+#   (optional) DEPRECATED: This parameter does nothing.
+#
 class nova::compute::xenserver(
   $xenapi_connection_url,
   $xenapi_connection_username,
   $xenapi_connection_password,
-  $xenapi_inject_image = false,
-  $compute_driver = 'xenapi.XenAPIDriver'
+  $compute_driver = 'xenapi.XenAPIDriver',
+  # DEPRECATED PARAMETERS
+  $xenapi_inject_image = undef,
 ) {
 
+  if $xenapi_inject_image != undef {
+    warning('The xenapi_inject_image parameter is deprecated and has no effect.')
+  }
+
   nova_config {
     'DEFAULT/compute_driver':             value => $compute_driver;
-    'DEFAULT/connection_type':            value => 'xenapi';
     'DEFAULT/xenapi_connection_url':      value => $xenapi_connection_url;
     'DEFAULT/xenapi_connection_username': value => $xenapi_connection_username;
     'DEFAULT/xenapi_connection_password': value => $xenapi_connection_password;
-    'DEFAULT/xenapi_inject_image':        value => $xenapi_inject_image;
   }
 
   ensure_packages(['python-pip'])
diff --git a/spec/classes/nova_compute_xenserver_spec.rb b/spec/classes/nova_compute_xenserver_spec.rb
index b47a44894..5aaf2d899 100644
--- a/spec/classes/nova_compute_xenserver_spec.rb
+++ b/spec/classes/nova_compute_xenserver_spec.rb
@@ -12,11 +12,9 @@ describe 'nova::compute::xenserver' do
 
     it 'configures xenapi in nova.conf' do
       is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('xenapi.XenAPIDriver')
-      is_expected.to contain_nova_config('DEFAULT/connection_type').with_value('xenapi')
       is_expected.to contain_nova_config('DEFAULT/xenapi_connection_url').with_value(params[:xenapi_connection_url])
       is_expected.to contain_nova_config('DEFAULT/xenapi_connection_username').with_value(params[:xenapi_connection_username])
       is_expected.to contain_nova_config('DEFAULT/xenapi_connection_password').with_value(params[:xenapi_connection_password])
-      is_expected.to contain_nova_config('DEFAULT/xenapi_inject_image').with_value(false)
     end
 
     it 'installs xenapi with pip' do