7 files changed, 100 insertions, 27 deletions
diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp
index a9224d3..9736656 100644
--- a/manifests/profile/base/ceph/osd.pp
+++ b/manifests/profile/base/ceph/osd.pp
@@ -34,7 +34,7 @@ class tripleo::profile::base::ceph::osd (
 
   include ::tripleo::profile::base::ceph
 
-  if $step >= 2 {
+  if $step >= 3 {
     if $ceph_osd_selinux_permissive {
       exec { 'set selinux to permissive on boot':
         command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config",
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index dd30dd7..ca4f366 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -30,19 +30,20 @@ class tripleo::profile::base::ironic (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
 ) {
+  # Database is accessed by both API and conductor, hence it's here.
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
   } else {
     $sync_db = false
   }
 
-  if $step >= 3 {
-    include ::ironic
+  if $step >= 3 and $sync_db {
+    include ::ironic::db::mysql
+  }
 
-    # Database is accessed by both API and conductor, hence it's here.
-    if $sync_db {
-      include ::ironic::db::mysql
-      include ::ironic::db::sync
+  if $step >= 4 or ($step >= 3 and $sync_db) {
+    class { '::ironic':
+      sync_db => $sync_db,
     }
   }
 }
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index 42507b9..c0b0538 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -18,22 +18,34 @@
 #
 # === Parameters
 #
-# [*sync_db*]
-#   (Optional) Whether to run db sync
-#   Defaults to true
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 class tripleo::profile::base::mistral (
-  $sync_db = true,
-  $step = hiera('step'),
+  $step           = hiera('step'),
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
 ) {
 
-  if $step >= 3 {
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
+  if $step >= 3 and $sync_db {
+    include ::mistral::db::mysql
+  }
+
+  if $step >= 4 and $sync_db {
     include ::mistral
     include ::mistral::config
+    include ::mistral::client
+    include ::mistral::db::sync
   }
 }
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index b955c8d..38e1e61 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -23,13 +23,24 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 class tripleo::profile::base::mistral::api (
   $step           = hiera('step'),
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
 ) {
 
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 {
+  if $step >= 4 and $sync_db {
     include ::mistral::api
   }
 }
diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp
index 141cbad..dfcbc2c 100644
--- a/manifests/profile/base/mistral/engine.pp
+++ b/manifests/profile/base/mistral/engine.pp
@@ -18,28 +18,29 @@
 #
 # === Parameters
 #
-# [*sync_db*]
-#   (Optional) Whether to run db sync
-#   Defaults to undef
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 class tripleo::profile::base::mistral::engine (
-  $sync_db        = true,
   $step           = hiera('step'),
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
 ) {
 
-  include ::tripleo::profile::base::mistral
-
-  if $step >= 3 and $sync_db {
-    include ::mistral::db::mysql
-    include ::mistral::db::sync
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
   }
 
-  if $step >= 4 {
+  include ::tripleo::profile::base::mistral
+
+  if $step >= 4 and $sync_db {
     include ::mistral::engine
   }
 
diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp
index d7b5776..6f101c8 100644
--- a/manifests/profile/base/mistral/executor.pp
+++ b/manifests/profile/base/mistral/executor.pp
@@ -23,13 +23,25 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 class tripleo::profile::base::mistral::executor (
   $step           = hiera('step'),
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+
 ) {
 
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 {
+  if $step >= 4 and $sync_db {
     include ::mistral::executor
   }
 
diff --git a/manifests/profile/base/nova/compute/ironic.pp b/manifests/profile/base/nova/compute/ironic.pp
new file mode 100644
index 0000000..a01e90f
--- /dev/null
+++ b/manifests/profile/base/nova/compute/ironic.pp
@@ -0,0 +1,36 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::base::nova::compute::ironic
+#
+# Nova Compute Ironic profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::nova::compute::ironic (
+  $step = hiera('step'),
+) {
+
+  if $step >= 4 {
+    include ::tripleo::profile::base::nova::compute
+    include ::nova::compute::ironic
+    include ::nova::network::neutron
+  }
+
+}