2 files changed, 30 insertions, 7 deletions
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 3b36c57..285e0b7 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -16,21 +16,24 @@
 #
 # Nova API profile for tripleo
 #
-# === Parameters
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*sync_db*]
-#   (Optional) Whether to run db sync
-#   Defaults to true
-#
 class tripleo::profile::base::nova::api (
-  $step    = hiera('step'),
-  $sync_db = true,
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step           = hiera('step'),
 ) {
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
 
   include ::tripleo::profile::base::nova
 
@@ -46,5 +49,11 @@ class tripleo::profile::base::nova::api (
     }
     include ::nova::network::neutron
   }
+
+  if $step >= 5 {
+    if hiera('nova_enable_db_purge', true) {
+      include ::nova::cron::archive_deleted_rows
+    }
+  }
 }
 
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index 16b61df..076996a 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -38,9 +38,23 @@ class tripleo::profile::base::nova::compute (
 
     # deploy basic bits for nova-compute
     include ::nova::compute
+    # If Service['nova-conductor'] is in catalog, make sure we start it
+    # before nova-compute.
+    Service<| title == 'nova-conductor' |> -> Service['nova-compute']
 
     # deploy bits to connect nova compute to neutron
     include ::nova::network::neutron
+
+    # When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1244328
+    exec { 'reset-iscsi-initiator-name':
+      command => '/bin/echo InitiatorName=$(/usr/sbin/iscsi-iname) > /etc/iscsi/initiatorname.iscsi',
+      onlyif  => '/usr/bin/test ! -f /etc/iscsi/.initiator_reset',
+      before  => File['/etc/iscsi/.initiator_reset'],
+    }
+    file { '/etc/iscsi/.initiator_reset':
+      ensure => present,
+    }
   }
 
   # If NFS is used as a Cinder backend