diff options
author | James Shubin <james@shubin.ca> | 2013-09-08 01:42:49 -0400 |
---|---|---|
committer | James Shubin <james@shubin.ca> | 2013-09-08 01:42:49 -0400 |
commit | 2b0f3e405917dce758a5ebd5e11093b97428666f (patch) | |
tree | 166c0ecff694091b8f33d1898c024022f78c4ead /manifests | |
parent | 24844a892c07001bb50eeb443005d3c2fe5d4025 (diff) | |
download | puppet-gluster-2b0f3e405917dce758a5ebd5e11093b97428666f.tar.gz puppet-gluster-2b0f3e405917dce758a5ebd5e11093b97428666f.tar.xz puppet-gluster-2b0f3e405917dce758a5ebd5e11093b97428666f.zip |
Remove redundant hosts specification in gluster::server()
At the moment, this is redundant, and not needed.
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/host.pp | 5 | ||||
-rw-r--r-- | manifests/server.pp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/manifests/host.pp b/manifests/host.pp index 7bd461d..a9bc10a 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -27,6 +27,8 @@ define gluster::host( #$vardir = $::gluster::vardir::module_vardir # with trailing slash $vardir = regsubst($::gluster::vardir::module_vardir, '\/$', '') + Gluster::Host[$name] -> Service['glusterd'] # glusterd requires host + # if we're on itself if ( "${fqdn}" == "${name}" ) { # don't purge the uuid file generated within @@ -55,6 +57,7 @@ define gluster::host( seltype => 'glusterd_var_lib_t', seluser => 'unconfined_u', ensure => present, + notify => Service['glusterd'], require => File['/var/lib/glusterd/'], } @@ -121,13 +124,13 @@ define gluster::host( # tag the file so it doesn't get removed by purge file { "/var/lib/glusterd/peers/${valid_uuid}": ensure => present, - notify => File['/var/lib/glusterd/peers/'], # propagate the notify up owner => root, group => root, # NOTE: this mode was found by inspecting the process mode => 600, # u=rw,go=r seltype => 'glusterd_var_lib_t', seluser => 'unconfined_u', + notify => File['/var/lib/glusterd/peers/'], # propagate the notify up } } } diff --git a/manifests/server.pp b/manifests/server.pp index 53d2161..4c521ab 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -16,7 +16,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. class gluster::server( - $hosts = [], # this should be a list of fqdn's # TODO: we could easily just setup gluster/shorewall by ip address instead of hostname! $ips = [], # this should be a list of ip's for each in hosts[] # TODO: i would have rather this happen with a local dns resolver, but I can't figure out how to make one! # NOTE: this can be overcome probably by using exported resources or dns names in shorewall (bad) $clients = [], # list of allowed client ip's #$vip = '', # vip of the cluster (optional but recommended) @@ -153,7 +152,6 @@ class gluster::server( ensure => running, # ensure it stays running hasstatus => false, # FIXME: BUG: https://bugzilla.redhat.com/show_bug.cgi?id=836007 hasrestart => true, # use restart, not start; stop - require => Gluster::Host[$hosts], } } |