[openstack-puppet-modules] Sync with packstack-puppet-modules

[Ben Nemec]

commit 153008503f1c1ca3f9a87f9e12b9e9b02cc64ea7
Author: Ben Nemec <bnemec at redhat.com>
Date:   Thu Dec 5 20:39:09 2013 +0000

    Sync with packstack-puppet-modules

 .gitignore                    |    4 ++++
 openstack-puppet-modules.spec |   20 ++++++++++++++------
 sources                       |    4 ++++
 3 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 50e9d4a..ecd0ca1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,7 @@
 /puppet-ceilometer-0fb3b8f693ba4cc24bdcfb1f61de843343a13e75.tar.gz
 /puppet-certmonger-5fbf10fbbff4aed4db30e839c63c99b195e8425a.tar.gz
 /puppet-glance-5557c224f37c22b058c951d7494448981cb484a2.tar.gz
+/puppet-cinder-5da2beb74d7dc73b4f050f5fb474c473688d206f.tar.gz
+/puppet-neutron-3c3d3d52ae0d1a655c7f1b09158ad7c924f80279.tar.gz
+/puppet-openstack-storage-4b60e1f848d18b72c1ba959e1b2dd8708a30f605.tar.gz
+/puppet-pacemaker-0b16aea22c8a03ddadf42837bcf0990355f961ff.tar.gz
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index d1d04f8..60d56a1 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -2,10 +2,11 @@
 %global apache_commit      a2d8e839c4c9c1cdd9ea9f733658dc83aa23c765
 %global ceilometer_commit  0fb3b8f693ba4cc24bdcfb1f61de843343a13e75
 %global certmonger_commit  5fbf10fbbff4aed4db30e839c63c99b195e8425a
-%global cinder_commit      9bd451830d124703ab4b50dcab10e0a697c85ad6
+%global cinder_commit      5da2beb74d7dc73b4f050f5fb474c473688d206f
 %global concat_commit      031bf261289dcbb32e63b053ed5b3a82117698c0
 %global firewall_commit    6106fb5404480ac7c883bddd503e0fc9f2698750
 %global glance_commit      5557c224f37c22b058c951d7494448981cb484a2
+%global gluster_commit     4b60e1f848d18b72c1ba959e1b2dd8708a30f605
 %global haproxy_commit     f381510e940ee11feb044c1c728ba2e5af807c79
 %global heat_commit        6d2dc044e12c4c687647cff8bc60c981d9ed5312
 %global horizon_commit     632af6f8f0b5de9218b7ce7503d66954c493928d
@@ -14,11 +15,11 @@
 %global memcached_commit   49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
 %global mongodb_commit     3a0574a4a664cfcff197829eb70976c4862db57a
 %global mysql_commit       83abc4556bbf6745708c08375649c9d71b6f66db
-%global neutron_commit     d6b77ea751f0e72885b8ee7c3acdd17e0826478e
+%global neutron_commit     3c3d3d52ae0d1a655c7f1b09158ad7c924f80279
 %global nova_commit        a3cadd09e70f560b78d2dbd20a4ca6c187fe1531
 %global nssdb_commit       b3799a9a7c62c3b5b7968f9860220a885b45fb8a
 %global openstack_commit   050fa67b230b320e096c3a66420f692cd1adf69b
-%global pacemaker_commit   4d20ef0734062f8b792dcad59ede824211bea278
+%global pacemaker_commit   0b16aea22c8a03ddadf42837bcf0990355f961ff
 %global qpid_commit        587b0b51e807ce787410133da0fe27ee466a4a72
 %global rsync_commit       357d51f3a6a22bc3da842736176c3510e507b4fb
 %global ssh_commit         d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
@@ -34,7 +35,7 @@
 
 Name:           openstack-puppet-modules
 Version:        2013.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Puppet modules used to deploy OpenStack
 License:        ASL 2.0 and GPLv2 and GPLv3
 
@@ -71,6 +72,7 @@ Source27:       https://github.com/packstack/puppet-heat/archive/%{heat_commit}/
 Source28:       https://github.com/radez/puppet-pacemaker/archive/%{pacemaker_commit}/puppet-pacemaker-%{pacemaker_commit}.tar.gz
 Source29:       https://github.com/rcritten/puppet-certmonger/archive/%{certmonger_commit}/puppet-certmonger-%{certmonger_commit}.tar.gz
 Source30:       https://github.com/rcritten/puppet-nssdb/archive/%{nssdb_commit}/puppet-nssdb-%{nssdb_commit}.tar.gz
+Source31:       https://github.com/redhat-openstack/puppet-openstack-storage/archive/%{gluster_commit}/puppet-openstack-storage-%{gluster_commit}.tar.gz
 
 
 BuildArch:      noarch
@@ -112,6 +114,7 @@ A collection of Puppet modules used to install and configure OpenStack.
 %setup -c -q -T -D -a 28
 %setup -c -q -T -D -a 29
 %setup -c -q -T -D -a 30
+%setup -c -q -T -D -a 31
 
 find %{_builddir} -type f -name ".*" -exec rm {} +
 find %{_builddir} -size 0 -exec rm {} +
@@ -157,6 +160,7 @@ cp -r puppet-heat-%{heat_commit} %{buildroot}/%{_datadir}/openstack-puppet/modul
 cp -r puppet-pacemaker-%{pacemaker_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/pacemaker
 cp -r puppet-certmonger-%{certmonger_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/certmonger
 cp -r puppet-nssdb-%{nssdb_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/nssdb
+cp -r puppet-openstack-storage-%{gluster_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/gluster
 rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncproxy.init
 
 
@@ -165,10 +169,14 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
 
 
 %changelog
-* Fri Nov 15 2013 Ben Nemec <bnemec at redhat.com> - 2012.2-6
+* Thu Dec 05 2013 Ben Nemec <bnemec at redhat.com> - 2013.2-7
+- Added puppet-openstack-storage
 - Synchronized modules with current state in package packstack-modules-puppet
 
-* Fri Nov 15 2013 Ben Nemec <bnemec at redhat.com> - 2012.2-5
+* Wed Dec 04 2013 Ben Nemec <bnemec at redhat.com> - 2013.2-6
+- Synchronized modules with current state in package packstack-modules-puppet
+
+* Fri Nov 15 2013 Ben Nemec <bnemec at redhat.com> - 2013.2-5
 - Added puppet-certmonger and puppet-nssdb
 - Synchronized modules with current state in package packstack-modules-puppet
 
diff --git a/sources b/sources
index 4a41dda..e95c53a 100644
--- a/sources
+++ b/sources
@@ -2,6 +2,7 @@
 d758f3151dafea43dd36e4d3608bef1f  puppet-ceilometer-a908469b2d46a9eef6795539a2d9a528fbf6da84.tar.gz
 35c3c53f442b591a4da3bfa75610069d  puppet-certmonger-5fbf10fbbff4aed4db30e839c63c99b195e8425a.tar.gz
 3c1e3967de442feb3b27f9ebaef054c2  puppet-certmonger-8a1dc65c3f59eed2f9bc852cc0563fb2a09f5fdd.tar.gz
+e46898ce54302900dc82cb5ad8fc5d54  puppet-cinder-5da2beb74d7dc73b4f050f5fb474c473688d206f.tar.gz
 08c0ae359fee1121ab434c79348d511e  puppet-cinder-9bd451830d124703ab4b50dcab10e0a697c85ad6.tar.gz
 8cff08df8d7fe83817af8b4ba5b13227  puppet-concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
 3c6661f772af84010a96a3fbbf8b0eab  puppet-glance-5557c224f37c22b058c951d7494448981cb484a2.tar.gz
@@ -21,10 +22,13 @@ b0e06fb5bb1ba1d68830c990d3e0e209  puppetlabs-stdlib-4d2558f383e18bbe322dd0feb073
 ad2529c2b5932c55392ac0fed0ab9ef5  puppetlabs-vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
 5ebe0f1f25defa3acdab0b4682e49f52  puppetlabs-xinetd-bba48fad94c6538384173e60900a17c6f7ef7ca3.tar.gz
 d91faa359ff81cc3e5bdc2a4217afff5  puppet-memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz
+1507f1015ad8b1bd4bc4df9587f39fc0  puppet-neutron-3c3d3d52ae0d1a655c7f1b09158ad7c924f80279.tar.gz
 538ae95df56c93b93e688cc2d6f07ec5  puppet-neutron-d6b77ea751f0e72885b8ee7c3acdd17e0826478e.tar.gz
 e24d64e2e839474b9d0defbc1dbd6ef6  puppet-nova-a3cadd09e70f560b78d2dbd20a4ca6c187fe1531.tar.gz
 ee40158527431488131f4331092b958c  puppet-nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
 b22438d376700d7a53c9f10e34a02711  puppet-openstack-050fa67b230b320e096c3a66420f692cd1adf69b.tar.gz
+e6543e3a78faf5d9d3a36cf3034bdcd7  puppet-openstack-storage-4b60e1f848d18b72c1ba959e1b2dd8708a30f605.tar.gz
+80bd9a317ba3010387fe5ce097eaec05  puppet-pacemaker-0b16aea22c8a03ddadf42837bcf0990355f961ff.tar.gz
 639ce8b14bfac5f61d4c2a12be4db930  puppet-pacemaker-4d20ef0734062f8b792dcad59ede824211bea278.tar.gz
 d36f9e908659d7c5483b43fc172a80dd  puppet-qpid-587b0b51e807ce787410133da0fe27ee466a4a72.tar.gz
 1a50e27c52661099d075556242a4a26e  puppet-ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz