From: Christian Schwede <cschwede@redhat.com>
Date: Wed, 21 Jun 2017 19:34:09 +0000 (+0200)
Subject: Add Swift dispersion profile
X-Git-Tag: opnfv-6.0.0~121^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b6a6f3e28eb102cf66f6c4b6f75c42add0e11ca6;p=apex-puppet-tripleo.git

Add Swift dispersion profile

The swift-dispersion-populate command needs to be called when Swift and
Keystone are up and running, and therefore we need to ensure this is
running in step 5 or later.

Change-Id: I5b4c08c252b6083dace5a65367920c475de416ce
---

diff --git a/manifests/profile/base/swift/dispersion.pp b/manifests/profile/base/swift/dispersion.pp
new file mode 100644
index 0000000..44af463
--- /dev/null
+++ b/manifests/profile/base/swift/dispersion.pp
@@ -0,0 +1,33 @@
+# Copyright 2017 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::dispersion
+#
+# Swift dispersion 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::swift::dispersion (
+  $step = Integer(hiera('step')),
+) {
+  if $step >= 5 {
+    include ::swift::client
+    include ::swift::dispersion
+  }
+}
diff --git a/releasenotes/notes/swift-dispersion-profile-09dc69980028e751.yaml b/releasenotes/notes/swift-dispersion-profile-09dc69980028e751.yaml
new file mode 100644
index 0000000..18c8642
--- /dev/null
+++ b/releasenotes/notes/swift-dispersion-profile-09dc69980028e751.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added a new profile for the setup of the Swift dispersion tool. This will
+    be executed in step 5 or later to ensure Swift and Keystone are already up
+    and running.