Fix consoleauth/spice duplicates on RH (#1278452)

On RedHat, consoleauth and spicehtml5proxy packages has the same name
(« openstack-nova-console »), so we have a duplicate resource (see: #1278452).
In this context we can't use ensure_package of stdlib because we loose
notify/names attributes.)

Closes-bug: #1278452

Change-Id: I0141ca0233aead072a06796759d211cf1b6dc657

manifests/generic_service.pp

@@ -32,10 +32,12 @@ define nova::generic_service(
   # I need to mark that ths package should be
   # installed before nova_config
   if ($package_name) {
-    package { $nova_title:
+    if !defined(Package[$package_name]) {
-      ensure => $ensure_package,
+      package { $nova_title:
-      name   => $package_name,
+        ensure => $ensure_package,
-      notify => Service[$nova_title],
+        name   => $package_name,
+        notify => Service[$nova_title],
+      }
     }
   }
 
@@ -53,7 +55,7 @@ define nova::generic_service(
       name      => $service_name,
       enable    => $enabled,
       hasstatus => true,
-      require   => [Package['nova-common'], Package[$nova_title]],
+      require   => [Package['nova-common'], Package[$package_name]],
     }
   }
 }

spec/defines/nova_generic_service_spec.rb

@@ -26,7 +26,7 @@ describe 'nova::generic_service' do
       'name'    => 'food',
       'ensure'  => 'running',
       'enable'  => true,
-      'require' => ['Package[nova-common]', 'Package[nova-foo]']
+      'require' => ['Package[nova-common]', 'Package[foo]']
     )}
   end
 end