summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/swift
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/profile/base/swift')
-rw-r--r--manifests/profile/base/swift/add_devices.pp3
-rw-r--r--manifests/profile/base/swift/proxy.pp2
-rw-r--r--manifests/profile/base/swift/ringbuilder.pp33
-rw-r--r--manifests/profile/base/swift/storage.pp11
4 files changed, 24 insertions, 25 deletions
diff --git a/manifests/profile/base/swift/add_devices.pp b/manifests/profile/base/swift/add_devices.pp
index f61f418..bd4c91c 100644
--- a/manifests/profile/base/swift/add_devices.pp
+++ b/manifests/profile/base/swift/add_devices.pp
@@ -20,11 +20,10 @@
#
# [*swift_zones*]
# (Optional) The number of swift zones.
-
+#
define tripleo::profile::base::swift::add_devices(
$swift_zones = '1'
){
-
# NOTE(dprince): Swift zones is not yet properly wired into the Heat
# templates. See: https://review.openstack.org/#/c/97758/3
# For now our regex supports the r1z1-192.0.2.6:%PORT%/d1 syntax or the
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 40e61ae..1e763a1 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
-#
class tripleo::profile::base::swift::proxy (
$step = hiera('step'),
) {
-
if $step >= 4 {
include ::swift::proxy
include ::swift::proxy::proxy_logging
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index d94c6be..e0f67cd 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -18,30 +18,33 @@
#
# === Parameters
#
-# [*step*]
+# [*replicas*]
+# replicas
+#
+# [*build_ring*] = true,
+# (Optional) Whether to build the ring
+# Defaults to true
+#
+# [*devices*]
+# (Optional) The swift devices
+# Defaults to ''
+#
+# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
+#
# [*swift_zones*]
# (Optional) The swift zones
# Defaults to 1
-# [*devices*]
-# (Optional) The swift devices
-# Defaults to ''
-# [*build_ring*] = true,
-# (Optional) Whether to build the ring
-# Defaults to true
-# [*replicas*]
-# replicas
-
+#
class tripleo::profile::base::swift::ringbuilder (
- $step = hiera('step'),
- $swift_zones = '1',
- $devices = '',
- $build_ring = true,
$replicas,
+ $build_ring = true,
+ $devices = '',
+ $step = hiera('step'),
+ $swift_zones = '1',
) {
-
if $step >= 2 {
# pre-install swift here so we can build rings
include ::swift
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index 371cb0d..5e266a9 100644
--- a/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@ -18,21 +18,20 @@
#
# === Parameters
#
+# [*enable_swift_storage*]
+# (Optional) enable_swift_storage
+# Deprecated: defaults to true
+#
# [*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,
+ $step = hiera('step'),
) {
-
if $step >= 4 {
if $enable_swift_storage {
include ::swift::storage::all