Merge "Allow use of raw disks for Swift storage role"

diff --cc manifests/profile/base/swift/storage.pp
index 5e266a9,3447a44..0b09ea6
--- 1/manifests/profile/base/swift/storage.pp
--- 2/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@@ -27,13 -23,19 +27,14 @@@
  #   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::disks
        include ::swift::storage::all
        if(!defined(File['/srv/node'])) {
          file { '/srv/node':