From ac8dc735a3e0f06e7ed7a1dff6ce7122cc1210fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Pe=C3=B1a?= Date: Mon, 6 Jun 2016 14:06:15 +0000 Subject: [PATCH] Revert "Fix cinder directory permissions" and fix swift manifest This should not be needed anymore. Commit https://review.openstack.org/325334 to puppet-cinder sets the proper permissions. This reverts commit 8178b046156247e75234d928d5affb16caec696e. Also, change swift_hash_suffix to swift_hash_path_suffix, as required by upstream puppet-swift change https://review.openstack.org/324203 . This is included here to allow CI to pass, as we need the two fixes merged together (it comes from abandoned change https://review.openstack.org/325786). Change-Id: I0c51a38b5e8a7181689276ce307f2f91aa18a92d --- packstack/puppet/templates/cinder_lvm.pp | 6 ------ packstack/puppet/templates/swift_common.pp | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packstack/puppet/templates/cinder_lvm.pp b/packstack/puppet/templates/cinder_lvm.pp index 4726383c5..653b17c18 100644 --- a/packstack/puppet/templates/cinder_lvm.pp +++ b/packstack/puppet/templates/cinder_lvm.pp @@ -9,12 +9,6 @@ if $create_cinder_volume == 'y' { loopback_device => $loop_dev, volume_path => '/var/lib/cinder', volume_name => 'cinder-volumes', - } -> - - file {'/var/lib/cinder': - ensure => directory, - mode => "0600", - recurse => true, } # Add loop device on boot diff --git a/packstack/puppet/templates/swift_common.pp b/packstack/puppet/templates/swift_common.pp index 488fa17e1..792212a7d 100644 --- a/packstack/puppet/templates/swift_common.pp +++ b/packstack/puppet/templates/swift_common.pp @@ -3,6 +3,6 @@ Class['swift'] -> Service <| |> class { '::swift': # not sure how I want to deal with this shared secret - swift_hash_suffix => hiera('CONFIG_SWIFT_HASH'), - package_ensure => latest, + swift_hash_path_suffix => hiera('CONFIG_SWIFT_HASH'), + package_ensure => latest, }