diff --git a/deployment/puppet/nova/manifests/generic_service.pp b/deployment/puppet/nova/manifests/generic_service.pp
index f94fa8a3bf..7ad3421aee 100644
--- a/deployment/puppet/nova/manifests/generic_service.pp
+++ b/deployment/puppet/nova/manifests/generic_service.pp
@@ -28,7 +28,7 @@ define nova::generic_service(
   $nova_title = "nova-${name}"
   # ensure that the service is only started after
   # all nova config entries have been set
-  Exec['post-nova_config'] ~> Service<| title == $nova_title |>
+  Nova_config<| |> ~> Service<| title == $nova_title |>
   # ensure that the service has only been started
   # after the initial db sync
   Exec<| title == 'nova-db-sync' |> ~> Service<| title == $nova_title |>
@@ -59,8 +59,8 @@ define nova::generic_service(
       name    => $service_name,
       ensure  => $service_ensure,
       enable  => $enabled,
-      require => Package['nova-common'],
     }
+    Package<| title == 'nova-common' |> -> Service[$nova_title]
   }
 
 }
diff --git a/deployment/puppet/nova/manifests/metadata_api.pp b/deployment/puppet/nova/manifests/metadata_api.pp
index 11eaf2e180..c8235346dd 100644
--- a/deployment/puppet/nova/manifests/metadata_api.pp
+++ b/deployment/puppet/nova/manifests/metadata_api.pp
@@ -22,9 +22,9 @@ class nova::metadata_api (
   if !defined(Package[$::nova::params::pymemcache_package_name]) {
     package { $::nova::params::pymemcache_package_name:
       ensure => present,
-      before => Nova::Generic_service['api'],
     }
   }
+  Package[$::nova::params::pymemcache_package_name]-> Nova::Generic_service<|title=='api'|>
 
   nova::generic_service { 'metadata-api':
     enabled        => true,
diff --git a/deployment/puppet/quantum/manifests/agents/l3.pp b/deployment/puppet/quantum/manifests/agents/l3.pp
index a29dbee935..27ec59539e 100644
--- a/deployment/puppet/quantum/manifests/agents/l3.pp
+++ b/deployment/puppet/quantum/manifests/agents/l3.pp
@@ -120,8 +120,8 @@ class quantum::agents::l3 (
         $external_alloc_pool = [$ext_ipinfo['pool_start'], $ext_ipinfo['pool_end']]
       }
 
-      Keystone_user_role["$auth_user@$auth_tenant"] -> Quantum::Network::Setup <| |>
-      Keystone_user_role["$auth_user@$auth_tenant"] -> Quantum::Network::Provider_router <| |>
+      Keystone_user_role<| title=="$auth_user@$auth_tenant"|> -> Quantum::Network::Setup <| |>
+      Keystone_user_role<| title=="$auth_user@$auth_tenant"|> -> Quantum::Network::Provider_router <| |>
 
       quantum::network::setup { 'net04':
         physnet      => $internal_physical_network,