x/packstack
Code Issues Proposed changes

Revert "Fix cinder directory permissions" and fix swift manifest

Browse Source 
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
This commit is contained in:
Javier Peña 2016-06-06 14:06:15 +00:00 committed by Javier Pena
parent e64086208b
commit ac8dc735a3
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packstack/puppet/templates/cinder_lvm.pp
View File

@ -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

4
packstack/puppet/templates/swift_common.pp
View File

@ -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,
}