Split requirements for multi-node

Many dependencies are only valid when conbinations
of services are installed on the same node.

They have been marked as optional requirements
using collection.

manifests/db.pp

@@ -8,7 +8,8 @@ class nova::db(
 ) {
 
   # Create the db instance before nova-common if its installed
-  Mysql::Db[$name] -> Package<| title == "nova-common" |>
+  Mysql::Db[$dbname] -> Package<| title == "nova-common" |>
+  Mysql::Db[$dbname] ~> Exec<| title == 'initial-db-sync' |>
 
   # now this requires storedconfigs
   # TODO - worry about the security implications
@@ -24,7 +25,7 @@ class nova::db(
     charset      => 'latin1',
     # I may want to inject some sql
     require      => Class['mysql::server'],
-    notify       => Exec["initial-db-sync"],
+#    notify       => Exec["initial-db-sync"],
   }
 
   if $allowed_hosts {

manifests/manage/admin.pp

@@ -1,9 +1,11 @@
 define nova::manage::admin {
+
   File['/etc/nova/nova.conf'] -> Nova::Manage::Admin[$name]
+  Exec<| title == 'initial-db-sync' |> -> Nova_admin[$name]
+
   nova_admin{ $name:
     ensure => present,
     provider => 'nova_manage',
     notify => Exec["nova-db-sync"],
-    require => Class["nova::db"],
   }
 }

manifests/manage/network.pp

@@ -1,11 +1,13 @@
 define nova::manage::network ( $network, $available_ips ) {
-  File['/etc/nova/nova.conf']->Nova_network[$name]
+
+  File['/etc/nova/nova.conf'] -> Nova_network[$name]
+  Exec<| title == 'initial-db-sync' |> -> Nova_network[$name]
+
   nova_network { $name:
     ensure        => present,
     network       => $network,
     available_ips => $available_ips,
     provider      => 'nova_manage',
     notify        => Exec["nova-db-sync"],
-    require       => Class["nova::db"],
   }
 }

manifests/manage/project.pp

@@ -1,10 +1,13 @@
 define nova::manage::project ( $owner ) {
+
   File['/etc/nova/nova.conf'] -> Nova_project[$name]
+  Exec<| title == 'initial-db-sync' |> -> Nova_project[$name]
+
   nova_project { $name:
     ensure   => present,
     provider => 'nova_manage',
     owner    => $owner,
     notify   => Exec["nova-db-sync"],
-    require  => [Class["nova::db"], Nova::Manage::Admin[$owner]],
+    require  => Nova::Manage::Admin[$owner],
   }
 }