3 files changed, 58 insertions, 10 deletions
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index a7d62ce..97e1bb8 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -23,18 +23,16 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*pacemaker_master*]
-#   (Optional) The master node runs some tasks
-#   one step earlier than others; disable to
-#   the node is not the master.
+# [*sync_db*]
+#   (Optional) Whether to run db sync
 #   Defaults to true
-
+#
 class tripleo::profile::base::ceilometer (
   $step             = hiera('step'),
-  $pacemaker_master = true,
+  $sync_db = true,
 ) {
 
-  if $step >= 4 or ($step >= 3 and $pacemaker_master) {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::ceilometer
     include ::ceilometer::db
     include ::ceilometer::config
diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp
index 6891f9c..34ee90b 100644
--- a/manifests/profile/base/ceilometer/collector.pp
+++ b/manifests/profile/base/ceilometer/collector.pp
@@ -33,9 +33,7 @@ class tripleo::profile::base::ceilometer::collector (
   $sync_db = true,
 ) {
 
-  class { '::tripleo::profile::base::ceilometer':
-    pacemaker_master => $sync_db,
-  }
+  include ::tripleo::profile::base::ceilometer
 
   if $step >= 3 and $sync_db {
     $ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb'))
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
new file mode 100644
index 0000000..371cb0d
--- /dev/null
+++ b/manifests/profile/base/swift/storage.pp
@@ -0,0 +1,52 @@
+# 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::swift::storage
+#
+# Swift storage profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+# [*enable_swift_storage*]
+#   (Optional) enable_swift_storage
+#   Deprecated: defaults to true
+#
+class tripleo::profile::base::swift::storage (
+  $step                 = hiera('step'),
+  # Deprecated conditional to support ControllerEnableSwiftStorage parameter
+  $enable_swift_storage = true,
+) {
+
+  if $step >= 4 {
+    if $enable_swift_storage {
+      include ::swift::storage::all
+      if(!defined(File['/srv/node'])) {
+        file { '/srv/node':
+          ensure  => directory,
+          owner   => 'swift',
+          group   => 'swift',
+          require => Package['openstack-swift'],
+        }
+      }
+      $swift_components = ['account', 'container', 'object']
+      swift::storage::filter::recon { $swift_components : }
+      swift::storage::filter::healthcheck { $swift_components : }
+    }
+  }
+}