Update nova to a502faaaa7356dd19d930aa70bd4e16c1f9b2921

a502faaaa7356dd19d930aa70bd4e16c1f9b2921 Merge "Better handling of package dependencies in nova generic_service"
517b7b800c45259e675ccbfa6e1c011485f8e12d Release 5.1.0 - Juno
e5bac20e8888cc6fe643bc8322459320289f4001 Merge "Introduce public_url, internal_url and admin_url (and v3/ec2)"
005781fe1fcfb73e70c111949f18df85c659622f Better handling of package dependencies in nova generic_service
b22c9218ba35611c52f5c9ef87e2a83a143791ad Introduce public_url, internal_url and admin_url (and v3/ec2)
940ae15644b1bd1c0e893eabe1eaec1d1bed2a29 Merge "Update spec_helper_acceptance for project renames"
4e465246f3e481fe7c3af67e1f5a62961b43f591 Update spec_helper_acceptance for project renames

Change-Id: Ia500ad7bacbd3b530f0d56125c8c6cc1914874a0

Puppetfile

@@ -123,7 +123,7 @@ mod 'neutron',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',
-  :commit => '273728b88d8dd17cbb42485ec6fe06ce3d854fc8',
+  :commit => 'a502faaaa7356dd19d930aa70bd4e16c1f9b2921',
   :git => 'https://github.com/openstack/puppet-nova.git'
 
 mod 'nssdb',

nova/README.md

@@ -1,7 +1,7 @@
 nova
 ====
 
-5.0.0 - 2014.2.0 - Juno
+5.1.0 - 2014.2 - Juno
 
 #### Table of Contents
 
@@ -107,6 +107,36 @@ Contributors
 Release Notes
 -------------
 
+**5.1.0**
+
+* move setting of novncproxy_base_url
+* Added parameters for availability zones configuration
+* crontab: ensure nova-common is installed before
+* Correct docs on format for nova::policy data
+* Allow libvirt secret key setting from param
+* Fix behaviour of 'set-secret-value virsh' exec
+* MySQL: change default MySQL collate to utf8_general_ci
+* Pin puppetlabs-concat to 1.2.1 in fixtures
+* Make group on /var/log/nova OS specific
+* IPv6 support for migration check.
+* Database: add slave_connection support
+* Correct references to ::nova::rabbit_* variables
+* Add optional network_api_class parameter to nova::network::neutron class
+* Add Nova Aggregate support
+* rpc_backend: simplify parameters
+* supporting lxc cpu mode Fixing the default cpu_mode from None to none
+* virsh returns a list of secret uuids, not keyring names
+* Pin fixtures for stables branches
+* Add serialproxy configuration
+* Switch to TLSv1 as SSLv3 is considered insecure and is disabled by default
+* Disable file injection when using RBD as compute ephemeral storage
+* Add PCI Passthrough/SR-IOV support
+* Add Ironic support into nova puppet modules
+* spec: pin rspec-puppet to 1.0.1
+* Correct section for cell_type nova.conf parameter
+* crontab: ensure the script is run with shell
+* Configure database parameters on the right nodes
+
 **5.0.0**
 
 * Stable Juno release

nova/manifests/generic_service.pp

@@ -32,14 +32,22 @@
   # I need to mark that ths package should be
   # installed before nova_config
   if ($package_name) {
-    if !defined(Package[$package_name]) {
+    if !defined(Package[$nova_title]) and !defined(Package[$package_name]) {
       package { $nova_title:
         ensure => $ensure_package,
         name   => $package_name,
         notify => Service[$nova_title],
         tag    => ['openstack'],
       }
     }
+
+    if $service_name {
+      # Do the dependency relationship here in case the package
+      # has been defined elsewhere, either as Package[$nova_title]
+      # or Package[$package_name]
+      Package<| title == $nova_title |> -> Service[$nova_title]
+      Package<| title == $package_name |> -> Service[$nova_title]
+    }
   }
 
   if $service_name {
@@ -56,7 +64,7 @@
       name      => $service_name,
       enable    => $enabled,
       hasstatus => true,
-      require   => [Package['nova-common'], Package[$nova_title]],
+      require   => [Package['nova-common']],
     }
   }
 }