6 files changed, 65 insertions, 35 deletions
diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp
index 8e73ce3..7951941 100644
--- a/manifests/profile/base/haproxy.pp
+++ b/manifests/profile/base/haproxy.pp
@@ -68,7 +68,9 @@ class tripleo::profile::base::haproxy (
         # This is only needed for certmonger's local CA. For any other CA this
         # operation (trusting the CA) should be done by the deployer.
         if $certmonger_ca == 'local' {
-          include ::tripleo::certmonger::ca::local
+          class { '::tripleo::certmonger::ca::local':
+            notify => Class['::tripleo::haproxy']
+          }
         }
 
         Certmonger_certificate {
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/monitoring/fluentd.pp b/manifests/profile/base/monitoring/fluentd.pp
new file mode 100644
index 0000000..1ea7d39
--- /dev/null
+++ b/manifests/profile/base/monitoring/fluentd.pp
@@ -0,0 +1,40 @@
+# 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::monitoring::fluentd
+#
+# FluentD configuration for TripleO
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) String. The current step of the deployment
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::monitoring::fluentd (
+  $step = hiera('step', undef)
+) {
+
+  if $step == undef or $step >= 3 {
+    include ::fluentd
+
+    ::fluentd::plugin { 'rubygem-fluent-plugin-add':
+      plugin_provider => 'yum',
+    }
+
+    ::fluentd::plugin { 'rubygem-fluent-plugin-elasticsearch':
+      plugin_provider => 'yum',
+    }
+  }
+}
diff --git a/manifests/certmonger.pp b/manifests/profile/base/nova/compute/ironic.pp
index e5f5e04..a01e90f 100644
--- a/manifests/certmonger.pp
+++ b/manifests/profile/base/nova/compute/ironic.pp
@@ -12,26 +12,25 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# == Class: tripleo::certmonger
+# == Class: tripleo::profile::base::nova::compute::ironic
 #
-# Sets some default defaults necessary for the global certmonger setup.
+# Nova Compute Ironic profile for tripleo
 #
 # === Parameters
 #
-# [*global_ca*]
-#   The certmonger nickname for the CA that will be used.
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
 #
-class tripleo::certmonger (
-  $global_ca
-){
-  include ::certmonger
+class tripleo::profile::base::nova::compute::ironic (
+  $step = hiera('step'),
+) {
 
-  Certmonger_certificate {
-    ca          => $global_ca,
-    ensure      => 'present',
-    certbackend => 'FILE',
-    keybackend  => 'FILE',
-    wait        => true,
-    require     => Class['::certmonger'],
+  if $step >= 4 {
+    include ::tripleo::profile::base::nova::compute
+    include ::nova::compute::ironic
+    include ::nova::network::neutron
   }
+
 }
diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp
index 37cab9f..f3666c2 100644
--- a/manifests/profile/pacemaker/manila.pp
+++ b/manifests/profile/pacemaker/manila.pp
@@ -122,7 +122,6 @@ class tripleo::profile::pacemaker::manila (
     include ::tripleo::profile::base::manila::scheduler
     include ::tripleo::profile::base::manila::share
 
-    $manila_generic_enable = hiera('manila_generic_enable_backend', false)
     if $manila_generic_enable {
       $manila_generic_backend = hiera('manila::backend::generic::title')
       manila::backend::generic { $manila_generic_backend :
diff --git a/manifests/profile/pacemaker/sahara.pp b/manifests/profile/pacemaker/sahara.pp
index e6e5117..0627017 100644
--- a/manifests/profile/pacemaker/sahara.pp
+++ b/manifests/profile/pacemaker/sahara.pp
@@ -18,18 +18,13 @@
 #
 # === 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')
 #
 class tripleo::profile::pacemaker::sahara (
-  $bootstrap_node       = hiera('bootstrap_nodeid'),
-  $step                 = hiera('step'),
+  $step = hiera('step'),
 ) {
 
   Service <| tag == 'sahara-service' |> {
@@ -39,11 +34,5 @@ class tripleo::profile::pacemaker::sahara (
     stop       => '/bin/true',
   }
 
-  if $::hostname == downcase($bootstrap_node) {
-    $pacemaker_master = true
-  } else {
-    $pacemaker_master = false
-  }
-
   include ::tripleo::profile::base::sahara
 }