From 7ce84623ad1e6d999d21000ef58816a660a505fe Mon Sep 17 00:00:00 2001 From: Werner Buck Date: Mon, 30 Mar 2015 14:44:18 +0200 Subject: [PATCH 1/4] Fix bugs. Upgrade gluster to 3.6 and use the ppa. --- ChangeLog | 4 ++++ manifests/client.pp | 6 +++++- manifests/mount.pp | 1 + manifests/peer.pp | 2 +- manifests/ppa.pp | 10 ++++++++++ manifests/server.pp | 4 +++- manifests/volume.pp | 2 +- 7 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 manifests/ppa.pp diff --git a/ChangeLog b/ChangeLog index 229ef3b..505bbf9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-02-25 - 0.0.3.1 +* Fix bugs +* Use ubuntu ppa for glusterfs 3.6 + 2013-05-24 - 0.0.3 * Update README and use markdown. * Change to 2-space indent. diff --git a/manifests/client.pp b/manifests/client.pp index 1088e1e..49c271f 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -4,7 +4,11 @@ # class glusterfs::client { - package { 'glusterfs-fuse': ensure => installed } + require glusterfs::ppa + + package { 'glusterfs-client': + ensure => installed, + } } diff --git a/manifests/mount.pp b/manifests/mount.pp index 649a602..39bddd5 100644 --- a/manifests/mount.pp +++ b/manifests/mount.pp @@ -20,6 +20,7 @@ device => $device, fstype => 'glusterfs', options => $options, + remounts => false, require => Package['glusterfs-fuse'], } diff --git a/manifests/peer.pp b/manifests/peer.pp index 028cd30..9a7af4b 100644 --- a/manifests/peer.pp +++ b/manifests/peer.pp @@ -8,7 +8,7 @@ exec { "/usr/sbin/gluster peer probe ${title}": unless => "/bin/egrep '^hostname.+=${title}$' /var/lib/glusterd/peers/*", - require => Service['glusterd'], + require => Service['glusterfs-server'], } } diff --git a/manifests/ppa.pp b/manifests/ppa.pp new file mode 100644 index 0000000..c0676db --- /dev/null +++ b/manifests/ppa.pp @@ -0,0 +1,10 @@ +class glusterfs::ppa { + + include apt + + apt::ppa { 'ppa:gluster/glusterfs-3.6': + } + +} + + diff --git a/manifests/server.pp b/manifests/server.pp index 1aad37e..1986e24 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -18,9 +18,11 @@ $peers = [] ) { + require glusterfs::ppa + # Main package and service it provides package { 'glusterfs-server': ensure => installed } - service { 'glusterd': + service { 'glusterfs-server': enable => true, ensure => running, hasstatus => true, diff --git a/manifests/volume.pp b/manifests/volume.pp index 7a6ae2b..3dae016 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -18,7 +18,7 @@ } exec { "/usr/sbin/gluster volume start ${title}": - unless => "[ \"`gluster volume info ${title} | egrep '^Status:'`\" = 'Status: Started' ]", + unless => "gluster volume info ${title} | /bin/grep '^Status: Started' > /dev/null", path => [ '/usr/sbin', '/usr/bin', '/sbin', '/bin' ], require => Exec["gluster volume create ${title}"], } From 121baa21958d5f76797d156bfc4be86b1499897f Mon Sep 17 00:00:00 2001 From: Werner Buck Date: Tue, 31 Mar 2015 10:36:54 +0200 Subject: [PATCH 2/4] Use glusterfs-client instead of glusterfs-fuse --- manifests/mount.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/mount.pp b/manifests/mount.pp index 39bddd5..da0320c 100644 --- a/manifests/mount.pp +++ b/manifests/mount.pp @@ -21,7 +21,7 @@ fstype => 'glusterfs', options => $options, remounts => false, - require => Package['glusterfs-fuse'], + require => Package['glusterfs-client'], } } From fafbc92a9cf1d7f554fea8ecc9f41029dce6e7ea Mon Sep 17 00:00:00 2001 From: Werner Buck Date: Thu, 9 Apr 2015 12:57:08 +0200 Subject: [PATCH 3/4] Add class parameters for ppa and ensure for package --- manifests/ppa.pp | 6 ++++-- manifests/server.pp | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/manifests/ppa.pp b/manifests/ppa.pp index c0676db..20b3418 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -1,8 +1,10 @@ -class glusterfs::ppa { +class glusterfs::ppa( + $ppa = 'ppa:gluster/glusterfs-3.4' +) { include apt - apt::ppa { 'ppa:gluster/glusterfs-3.6': + apt::ppa { $ppa: } } diff --git a/manifests/server.pp b/manifests/server.pp index 1986e24..37b9ad6 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -15,13 +15,14 @@ # } # class glusterfs::server ( - $peers = [] + $peers = [], + $ensure = 'installed' ) { require glusterfs::ppa # Main package and service it provides - package { 'glusterfs-server': ensure => installed } + package { 'glusterfs-server': ensure => $installed } service { 'glusterfs-server': enable => true, ensure => running, From 287c7f9d3be1e58692b4653e6246cb551a58fb88 Mon Sep 17 00:00:00 2001 From: Werner Buck Date: Wed, 22 Apr 2015 09:53:01 +0200 Subject: [PATCH 4/4] Use -q --- manifests/volume.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/volume.pp b/manifests/volume.pp index 3dae016..a96ccd1 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -18,7 +18,7 @@ } exec { "/usr/sbin/gluster volume start ${title}": - unless => "gluster volume info ${title} | /bin/grep '^Status: Started' > /dev/null", + unless => "gluster volume info ${title} | grep -q '^Status: Started'", path => [ '/usr/sbin', '/usr/bin', '/sbin', '/bin' ], require => Exec["gluster volume create ${title}"], }