Bugfix run_command status check

Change-Id: Iccd6f628589961966fc9ee1555617f04f53e9d55
Closes-Bug: #1320033
This commit is contained in:
Alan Meadows
2014-05-15 17:37:00 -07:00
parent 0d0cc9a530
commit bd6c1c9f41
3 changed files with 6 additions and 3 deletions

View File

@@ -1,6 +1,9 @@
# CHANGELOG for cookbook-openstack-object-storage
This file is used to list changes made in each version of cookbook-openstack-object-storage.
## 9.0.3
* Bugfix run_command exitstatus
## 9.0.2
* Fix package action to allow updates

View File

@@ -3,7 +3,7 @@ maintainer 'ATT, Inc.'
license 'Apache 2.0'
description 'Installs and configures Openstack Swift'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '9.0.2'
version '9.0.3'
recipe 'openstack-object-storage::account-server', 'Installs the swift account server'
recipe 'openstack-object-storage::client', 'Install the switch client'

View File

@@ -243,12 +243,12 @@ action :ensure_exists do
case params[:type]
when 'xfs'
unless Mixlib::ShellOut.new("xfs_admin -l #{device}").run_command.status
unless Mixlib::ShellOut.new("xfs_admin -l #{device}").run_command.exitstatus
Mixlib::ShellOut.new("mkfs.xfs -f -i size=512 #{device}").run_command
update = true
end
when 'ext4'
unless Mixlib::ShellOut.new("tune2fs -l #{device} | grep \"Filesystem volume name:\" | awk \'{print $4}\' | grep -v \"<none>\"").run_command.status
unless Mixlib::ShellOut.new("tune2fs -l #{device} | grep \"Filesystem volume name:\" | awk \'{print $4}\' | grep -v \"<none>\"").run_command.exitstatus
Mixlib::ShellOut.new("mkfs.ext4 #{device}").run_command
update = true
end