diff --git a/packstack/puppet/modules/packstack/manifests/nova/common.pp b/packstack/puppet/modules/packstack/manifests/nova/common.pp
index 2f475fa34..f300fab76 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/common.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/common.pp
@@ -3,9 +3,4 @@ class packstack::nova::common ()
     # Ensure Firewall changes happen before nova services start
     # preventing a clash with rules being set by nova-compute and nova-network
     Firewall <| |> -> Class['nova']
-
-    nova_config{
-      # metadata_host has to be IP
-      'DEFAULT/metadata_host': value => force_ip(lookup('CONFIG_CONTROLLER_HOST'));
-    }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute.pp b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
index e90695fc8..0dd066cc1 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
@@ -53,11 +53,6 @@ class packstack::nova::compute ()
       }
     }
 
-    nova_config{
-      'DEFAULT/volume_api_class':
-        value => 'nova.volume.cinder.API';
-    }
-
     if ($::fqdn == '' or $::fqdn =~ /localhost/) {
       # For cases where FQDNs have not been correctly set
       $vncproxy_server = choose_my_ip(lookup('HOST_LIST'))