[puppet-gluster/el6] New upstream release
averi
averi at fedoraproject.org
Wed May 7 16:18:17 UTC 2014
commit 907c7cf0056c8356324857eeee20e2fd043aad49
Author: Andrea Veri <av at gnome.org>
Date: Wed May 7 18:18:13 2014 +0200
New upstream release
.gitignore | 1 +
puppet-gluster.spec | 13 +++--
sources | 2 +-
turn-off-repo-again-classes.patch | 92 +++++++++++++++++++++++++++++++++++++
4 files changed, 102 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 526d01c..231f788 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/puppet-gluster-0.0.2.tar.bz2
+/puppet-gluster-0.0.3.tar.bz2
diff --git a/puppet-gluster.spec b/puppet-gluster.spec
index c23b9a0..3c98cd7 100644
--- a/puppet-gluster.spec
+++ b/puppet-gluster.spec
@@ -1,10 +1,11 @@
Name: puppet-gluster
-Version: 0.0.2
-Release: 3%{?dist}
+Version: 0.0.3
+Release: 1%{?dist}
Summary: A Puppet module for GlusterFS
License: AGPLv3+
URL: https://github.com/purpleidea/puppet-gluster
Source0: https://download.gluster.org/pub/gluster/purpleidea/puppet-gluster/SOURCES/puppet-gluster-%{version}.tar.bz2
+Patch0: turn-off-repo-again-classes.patch
BuildArch: noarch
%if 0%{?fedora}
BuildRequires: pandoc, pandoc-pdf
@@ -26,8 +27,7 @@ This package contains the documentation for puppet-gluster.
%prep
%setup
-# Upstream poked for this change to happen on the next tarball.
-chmod +x files/xml.py
+%patch0 -p1
%build
rm -r puppet-gluster-documentation.pdf
@@ -57,7 +57,10 @@ cp -rp templates/ %{buildroot}/%{_datadir}/puppet/modules/gluster/templates
%endif
%changelog
-* Wed May 07 2014 Andrea Veri <andrea.veri at gmail.com> - 0.0.2-3
+* Wed May 07 2014 Andrea Veri <averi at fedoraproject.org> - 0.0.3-1
+- New upstream release.
+
+* Wed May 07 2014 Andrea Veri <averi at fedoraproject.org> - 0.0.2-3
- Add a Requires on puppetlabs-stdlib.
* Sat May 03 2014 Andrea Veri <averi at fedoraproject.org> - 0.0.2-2
diff --git a/sources b/sources
index 1e2e3b9..7afba58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1bf081af9404cf84bebcc22ff0f9dfd0 puppet-gluster-0.0.2.tar.bz2
+a89836e3996ba99f79a09c570d819834 puppet-gluster-0.0.3.tar.bz2
diff --git a/turn-off-repo-again-classes.patch b/turn-off-repo-again-classes.patch
new file mode 100644
index 0000000..3dbb565
--- /dev/null
+++ b/turn-off-repo-again-classes.patch
@@ -0,0 +1,92 @@
+diff -Nru puppet-gluster.orig/manifests/api.pp puppet-gluster/manifests/api.pp
+--- puppet-gluster.orig/manifests/api.pp 2014-05-07 18:08:19.607562139 +0200
++++ puppet-gluster/manifests/api.pp 2014-05-07 18:09:48.999286902 +0200
+@@ -16,7 +16,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ class gluster::api(
+- $repo = true, # are we using the automatic repo ?
++ $repo = false, # are we using the automatic repo ?
+ $version = '' # pick a specific version (defaults to latest)
+ ) {
+ $rname = "${version}" ? {
+diff -Nru puppet-gluster.orig/manifests/brick.pp puppet-gluster/manifests/brick.pp
+--- puppet-gluster.orig/manifests/brick.pp 2014-05-07 18:08:19.607562139 +0200
++++ puppet-gluster/manifests/brick.pp 2014-05-07 18:08:55.807665492 +0200
+@@ -40,7 +40,7 @@
+ $xfs_nobarrier = false,
+ $force = false, # if true, this will overwrite any xfs fs it sees, useful for rebuilding gluster and wiping data. NOTE: there are other safeties in place to stop this.
+ $areyousure = false, # do you allow puppet to do dangerous things ?
+- $again = true, # do we want to use Exec['again'] ?
++ $again = false, # do we want to use Exec['again'] ?
+ $comment = ''
+ ) {
+ include gluster::brick::base
+diff -Nru puppet-gluster.orig/manifests/mount/base.pp puppet-gluster/manifests/mount/base.pp
+--- puppet-gluster.orig/manifests/mount/base.pp 2014-05-07 18:08:19.608562169 +0200
++++ puppet-gluster/manifests/mount/base.pp 2014-05-07 18:09:56.893527554 +0200
+@@ -16,7 +16,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ class gluster::mount::base(
+- $repo = true, # add a repo automatically? true or false
++ $repo = false, # add a repo automatically? true or false
+ $version = '' # pick a specific version (defaults to latest)
+ ) {
+ include gluster::vardir
+diff -Nru puppet-gluster.orig/manifests/mount.pp puppet-gluster/manifests/mount.pp
+--- puppet-gluster.orig/manifests/mount.pp 2014-05-07 18:08:19.607562139 +0200
++++ puppet-gluster/manifests/mount.pp 2014-05-07 18:09:40.166017629 +0200
+@@ -22,7 +22,7 @@
+ # $suid = false, # mount with suid (true) or nosuid (false) # TODO: will this work with gluster ?
+ $mounted = true, # useful if we want to pull in the group
+ # defs, but not actually mount (testing)
+- $repo = true, # add a repo automatically? true or false
++ $repo = false, # add a repo automatically? true or false
+ $version = '', # pick a specific version (defaults to latest)
+ $ip = '', # you can specify which ip address to use (if multiple)
+ $shorewall = false
+diff -Nru puppet-gluster.orig/manifests/server.pp puppet-gluster/manifests/server.pp
+--- puppet-gluster.orig/manifests/server.pp 2014-05-07 18:08:19.608562169 +0200
++++ puppet-gluster/manifests/server.pp 2014-05-07 18:09:30.383719432 +0200
+@@ -21,7 +21,7 @@
+ $vrrp = false,
+ $password = '', # global vrrp password to use
+ $version = '', # pick a specific version (defaults to latest)
+- $repo = true, # add a repo automatically? true or false
++ $repo = false, # add a repo automatically? true or false
+ $baseport = '', # specify base port option as used in glusterd.vol file
+ $rpcauthallowinsecure = false, # needed in some setups in glusterd.vol
+ $shorewall = false,
+diff -Nru puppet-gluster.orig/manifests/simple.pp puppet-gluster/manifests/simple.pp
+--- puppet-gluster.orig/manifests/simple.pp 2014-05-07 18:08:19.607562139 +0200
++++ puppet-gluster/manifests/simple.pp 2014-05-07 18:08:43.240282437 +0200
+@@ -25,14 +25,14 @@
+ $vrrp = false,
+ $password = '', # global vrrp password to use
+ $version = '',
+- $repo = true,
++ $repo = false,
+ $count = 0, # 0 means build 1 brick, unless $brick_params exists...
+ $brick_params = {}, # this sets the brick count when $count is 0...
+ $brick_param_defaults = {}, # these always get used to build bricks
+ $brick_params_defaults = [], # array of hashes to use as brick count
+ $setgroup = '', # pick a volume property group to set, eg: virt
+ $ping = true, # use fping or not?
+- $again = true, # do we want to use Exec['again'] ?
++ $again = false, # do we want to use Exec['again'] ?
+ $baseport = '', # specify base port option as used in glusterd.vol file
+ $rpcauthallowinsecure = false, # needed in some setups in glusterd.vol
+ $shorewall = true
+diff -Nru puppet-gluster.orig/manifests/volume.pp puppet-gluster/manifests/volume.pp
+--- puppet-gluster.orig/manifests/volume.pp 2014-05-07 18:08:19.607562139 +0200
++++ puppet-gluster/manifests/volume.pp 2014-05-07 18:09:05.185951350 +0200
+@@ -27,7 +27,7 @@
+ $vip = '', # vip of the cluster (optional but recommended)
+ $ping = true, # do we want to include fping checks ?
+ $settle = true, # do we want to run settle checks ?
+- $again = true, # do we want to use Exec['again'] ?
++ $again = false, # do we want to use Exec['again'] ?
+ $start = undef # start volume ? true, false (stop it) or undef
+ ) {
+ include gluster::xml
More information about the scm-commits
mailing list