diff options
author | James Shubin <james@shubin.ca> | 2014-03-08 01:06:22 -0500 |
---|---|---|
committer | James Shubin <james@shubin.ca> | 2014-03-16 22:39:07 -0400 |
commit | dd44a559d820c19f6df1cc66019fa8fb7cecb2c1 (patch) | |
tree | 3b04dfb85e78f6b79d826e05ff2cef8651b7b279 /manifests/volume/property | |
parent | 2dd6acd1eeffbfdcf0436847ee115310198526f4 (diff) | |
download | puppet-gluster-dd44a559d820c19f6df1cc66019fa8fb7cecb2c1.tar.gz puppet-gluster-dd44a559d820c19f6df1cc66019fa8fb7cecb2c1.tar.xz puppet-gluster-dd44a559d820c19f6df1cc66019fa8fb7cecb2c1.zip |
Add support for volume set groups.
This adds support for setting volume set groups which are groups of
properties that are set all at once on a volume. This is managed in a
clever way, so that if the definition of what a certain group contains
gets updated by the package manager, your volumes will get updated too,
on the next puppet run.
Diffstat (limited to 'manifests/volume/property')
-rw-r--r-- | manifests/volume/property/data.pp | 7 | ||||
-rw-r--r-- | manifests/volume/property/group.pp | 60 |
2 files changed, 64 insertions, 3 deletions
diff --git a/manifests/volume/property/data.pp b/manifests/volume/property/data.pp index 0ebd2c9..e876b5d 100644 --- a/manifests/volume/property/data.pp +++ b/manifests/volume/property/data.pp @@ -20,6 +20,7 @@ class gluster::volume::property::data() { # expected type $etypes = { # FIXME: the empty '' strings need to be filled in... + # FIXME: some of the 'string' values could probably be booleans # Allow a comma separated list of addresses and/or hostnames to connect to the server. By default, all connections are allowed. 'auth.allow' => 'array', # default: (null) @@ -73,7 +74,7 @@ class gluster::volume::property::data() { 'cluster.quorum-count' => '', # default: (null) # If value is "fixed" only allow writes if quorum-count bricks are present. If value is "auto" only allow writes if more than half of bricks, or exactly half including the first, are present. - 'cluster.quorum-type' => '', # default: none + 'cluster.quorum-type' => 'string', # default: none # readdir(p) will not failover if this option is off 'cluster.readdir-failover' => 'onoff', # default: on @@ -106,7 +107,7 @@ class gluster::volume::property::data() { 'cluster.server-quorum-ratio' => '', # default: (null) # If set to server, enables the specified volume to participate in quorum. - 'cluster.server-quorum-type' => '', # default: (null) + 'cluster.server-quorum-type' => 'string', # default: (null) # Size of the stripe unit that would be read from or written to the striped servers. 'cluster.stripe-block-size' => '', # default: 128KB @@ -154,7 +155,7 @@ class gluster::volume::property::data() { 'network.ping-timeout' => 'integer', # default: 42 # If enabled, in open() and creat() calls, O_DIRECT flag will be filtered at the client protocol level so server will still continue to cache the file. This works similar to NFS's behavior of O_DIRECT - 'network.remote-dio' => '', # default: disable + 'network.remote-dio' => 'string', # default: disable # XXX: this appears twice # Specifies the window size for tcp socket. diff --git a/manifests/volume/property/group.pp b/manifests/volume/property/group.pp new file mode 100644 index 0000000..8901553 --- /dev/null +++ b/manifests/volume/property/group.pp @@ -0,0 +1,60 @@ +# GlusterFS module by James +# Copyright (C) 2012-2013+ James Shubin +# Written by James Shubin <james@shubin.ca> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# NOTE: The most well known group is 'virt', and is a collection of properties. +# NOTE: This type is particularly useful, because if you've set a certain group +# for your volume, and your package updates the group properties, then this can +# notice those changes and keep your volume in sync with the latest properties! +# NOTE: This intentionally conflicts with properties that are defined manually. +# NOTE: this does the equivalent of: gluster volume set <VOLNAME> group <GROUP> + +define gluster::volume::property::group( +) { + include gluster::xml + include gluster::vardir + include gluster::volume::property + + #$vardir = $::gluster::vardir::module_vardir # with trailing slash + $vardir = regsubst($::gluster::vardir::module_vardir, '\/$', '') + + $split = split($name, '#') # do some $name parsing + $volume = $split[0] # volume name + $group = $split[1] # group name + + if ! ( "${volume}#${group}" == "${name}" ) { + fail('The property $name must match a $volume#$group pattern.') + } + + $groups = split($gluster_property_groups, ',') # fact + + if ! ("${group}" in $groups) { + fail("The group named '${group}' is not available.") + } + + # read the fact that comes from the data in: /var/lib/glusterd/groups/* + $group_data_string = getvar("gluster_property_group_${name}") # fact! + # each element in this list is a key=value string + $group_data_list = split("${group_data_string}", ',') + # split into the correct hash to create all the properties + $group_data_yaml = inline_template("<%= @group_data_list.inject(Hash.new) { |h,i| { '${volume}#'+((i.split('=').length == 2) ? i.split('=')[0] : '') => {'value' => ((i.split('=').length == 2) ? i.split('=')[1] : '')} }.merge(h) }.to_yaml %>") + # build into a hash + $group_data_hash = parseyaml($group_data_yaml) + # create the properties + create_resources('gluster::volume::property', $group_data_hash) +} + +# vim: ts=8 |