Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional device support #68

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Berksfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ DEPENDENCIES
path: test/cookbooks/fake

GRAPH
ephemeral_lvm (3.0.0)
lvm (>= 4.0.0)
ephemeral_lvm (3.0.2)
lvm (>= 4.0.6)
now (>= 0.0.0)
fake (0.1.1)
lvm (4.0.5)
lvm (4.1.13)
now (1.0.0)
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Place the `ephemeral_lvm::default` in the runlist and the ephemeral devices will
* `node['ephemeral_lvm']['logical_volume_size']` - the size to be used for the ephemeral LVM. Default: `'100%VG'` - This will use all available space in the volume group.
* `node['ephemeral_lvm']['logical_volume_name']` - the name of the logical volume for ephemeral LVM. Default: `'ephemeral0'`
* `node['ephemeral_lvm']['stripe_size']` - the stripe size to be used for the ephemeral logical volume. Default: `512`
* `node['ephemeral_lvm']['additonal_devices']` - array of additional devices to add to stripe. Use if we are not finding them in metadata. default: []

# Recipes

Expand Down
3 changes: 3 additions & 0 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@

# Whether to wipe signatures on any existing drives
default['ephemeral_lvm']['wipe_signatures'] = false

# Array of devices to force into the ephemeral device list
default['ephemeral_lvm']['additonal_devices'] = []
1 change: 1 addition & 0 deletions libraries/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def self.gce_ephemeral_devices?(cloud, node)
#
def self.get_ephemeral_devices(cloud, node)
ephemeral_devices = []
ephemeral_devices.concat node['ephemeral_lvm']['additonal_devices']
# Detects the ephemeral disks available on the instance.
#
# If the cloud plugin supports block device mapping on the node, obtain the
Expand Down
4 changes: 2 additions & 2 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
license 'Apache 2.0'
description 'Configures available ephemeral devices on a cloud server'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '3.0.1'
version '3.0.2'
issues_url 'https://github.com/rightscale-cookbooks/ephemeral_lvm/issues' if respond_to?(:issues_url)
source_url 'https://github.com/rightscale-cookbooks/ephemeral_lvm' if respond_to?(:source_url)
chef_version '>= 12.0' if respond_to?(:chef_version)
Expand All @@ -15,7 +15,7 @@
supports 'debian'

depends 'now'
depends 'lvm', '>= 4.0'
depends 'lvm', '>= 4.0.6'

recipe 'ephemeral_lvm::default', 'Sets up ephemeral devices on a cloud server'

Expand Down