aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-06 18:12:58 +0000
committerGerrit Code Review <review@openstack.org>2017-07-06 18:12:58 +0000
commit76af0ab6a4fd1bb7267e187f680c1616f24cf4f5 (patch)
tree82edf87ef7cc349e8a16a37377146cab792a8442
parente74e32338e008f2085053c12bdb9e5b8024d3df8 (diff)
parentb6a6f3e28eb102cf66f6c4b6f75c42add0e11ca6 (diff)
Merge "Add Swift dispersion profile"
-rw-r--r--manifests/profile/base/swift/dispersion.pp33
-rw-r--r--releasenotes/notes/swift-dispersion-profile-09dc69980028e751.yaml6
2 files changed, 39 insertions, 0 deletions
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.