From 032a3ab3d436cd74d14a260d34d4baacb14d5efe Mon Sep 17 00:00:00 2001
From: vic <vgalkin@mirantis.com>
Date: Sat, 23 Feb 2013 04:16:04 +0400
Subject: [PATCH] Minor fixes

---
 deployment/puppet/l23network/manifests/l2/bridge.pp      | 2 +-
 deployment/puppet/l23network/manifests/l2/port.pp        | 2 +-
 deployment/puppet/nova/manifests/generic_service.pp      | 4 ++--
 deployment/puppet/nova/manifests/metadata_api.pp         | 9 +++++----
 .../puppet/quantum/manifests/plugins/ovs/bridge.pp       | 2 +-
 deployment/puppet/quantum/manifests/plugins/ovs/port.pp  | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/deployment/puppet/l23network/manifests/l2/bridge.pp b/deployment/puppet/l23network/manifests/l2/bridge.pp
index 6e84b946ed..229b926d97 100644
--- a/deployment/puppet/l23network/manifests/l2/bridge.pp
+++ b/deployment/puppet/l23network/manifests/l2/bridge.pp
@@ -26,8 +26,8 @@ define l23network::l2::bridge (
       ensure       => $ensure,
       external_ids => $external_ids,
       skip_existing=> $skip_existing,
-      require      => Service<| title == 'openvswitch-service' |>,
     }
+    Service<| title == 'openvswitch-service' |> -> L2_ovs_bridge[$name]
   }
 }
 
diff --git a/deployment/puppet/l23network/manifests/l2/port.pp b/deployment/puppet/l23network/manifests/l2/port.pp
index d23f0198ee..3372f89692 100644
--- a/deployment/puppet/l23network/manifests/l2/port.pp
+++ b/deployment/puppet/l23network/manifests/l2/port.pp
@@ -34,7 +34,7 @@ define l23network::l2::port (
       bridge        => $bridge,
       type          => $type,
       skip_existing => $skip_existing,
-      require       => Service<| title == 'openvswitch-service' |>,
     }
+    Service<| title == 'openvswitch-service' |> -> L2_ovs_port[$name]
   }
 }
diff --git a/deployment/puppet/nova/manifests/generic_service.pp b/deployment/puppet/nova/manifests/generic_service.pp
index 402066944e..cc157100bc 100644
--- a/deployment/puppet/nova/manifests/generic_service.pp
+++ b/deployment/puppet/nova/manifests/generic_service.pp
@@ -41,8 +41,8 @@ define nova::generic_service(
       name   => $package_name,
       ensure => $ensure_package,
     }
-    Stdlib::Safe_package[$nova_title] -> Service[$nova_title]
-    Stdlib::Safe_package[$nova_title] ~> Service[$nova_title]
+    Package[$nova_title] -> Service[$nova_title]
+    Package[$nova_title] ~> Service[$nova_title]
   }
 
   if ($service_name) {
diff --git a/deployment/puppet/nova/manifests/metadata_api.pp b/deployment/puppet/nova/manifests/metadata_api.pp
index 441a9db45d..58026b74cf 100644
--- a/deployment/puppet/nova/manifests/metadata_api.pp
+++ b/deployment/puppet/nova/manifests/metadata_api.pp
@@ -30,12 +30,13 @@ class nova::metadata_api (
   Package['nova-metadata-api'] -> Nova_config<||>
   Nova_config<||> ~> Service['nova-metadata-api']
 
-  stdlib::safe_package {'nova-metadata-api':
-    name   => $::nova::params::meta_api_package_name,
-    ensure => present,
+  if ! defined(Package['nova-metadata-api']) {
+    package {'nova-metadata-api':
+      name   => $::nova::params::meta_api_package_name,
+      ensure => present,
+    }
   }
 
-
   service { 'nova-metadata-api':
     name    => $::nova::params::meta_api_service_name,
     ensure  => 'running',
diff --git a/deployment/puppet/quantum/manifests/plugins/ovs/bridge.pp b/deployment/puppet/quantum/manifests/plugins/ovs/bridge.pp
index b9da4900fd..214ebf9b6b 100644
--- a/deployment/puppet/quantum/manifests/plugins/ovs/bridge.pp
+++ b/deployment/puppet/quantum/manifests/plugins/ovs/bridge.pp
@@ -2,7 +2,7 @@ define quantum::plugins::ovs::bridge {
   $mapping = split($name, ":")
   $bridge = $mapping[1]
 
-  if !defined(l23network::l2::bridge[$bridge]) {
+  if !defined(L23network::L2::Bridge[$bridge]) {
     l23network::l2::bridge {$bridge:
       ensure        => present,
       external_ids  => "bridge-id=${bridge}",
diff --git a/deployment/puppet/quantum/manifests/plugins/ovs/port.pp b/deployment/puppet/quantum/manifests/plugins/ovs/port.pp
index 2606120225..4248bb625b 100644
--- a/deployment/puppet/quantum/manifests/plugins/ovs/port.pp
+++ b/deployment/puppet/quantum/manifests/plugins/ovs/port.pp
@@ -3,7 +3,7 @@ define quantum::plugins::ovs::port {
   $bridge  = $mapping[0]
   $port    = $mapping[1]
 
-  if !defined(l23network::l2::port[$port]) {
+  if !defined(L23network::L2::Port[$port]) {
     l23network::l2::port {$port:
       ensure => present,
       bridge => $bridge,