[openstack-puppet-modules] Updated to latest redhat-openstack/openstack-puppet-modules

[Martin Mágr]

commit d56acce0284afffe75c1faa5b793392365c5d4d5
Author: Martin Magr <mmagr at redhat.com>
Date:   Fri Mar 21 10:15:44 2014 +0100

    Updated to latest redhat-openstack/openstack-puppet-modules

 .gitignore                    |    3 +++
 openstack-puppet-modules.spec |   26 +++++++++++++++++++++-----
 sources                       |    6 +++---
 3 files changed, 27 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6651e57..5eb2459 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,6 @@
 /swift-8a7c88d8ac3d795f6c2bc65918256995e3a6e603.tar.gz
 /puppet-ceilometer-91045b3be907b074cb1e0165b269d439aee43a26.tar.gz
 /staging-887275d8fb20e148c6f9eb327f1f6c8ea5ee280f.tar.gz
+/pacemaker-781499494dc3a5e5d00c84c273201bebaff9f2bf.tar.gz
+/qpid-953028ba9abdf563bd95970ccf890237711072fb.tar.gz
+/swift-e9b69499c943bfbb16c895611ebd4e90c16b377c.tar.gz
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 5d43381..d88f2aa 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -19,14 +19,14 @@
 %global nova_commit		    6c8a4bd5e1d67cce4c6e316c2ba43ed5a4dd4e59
 %global nssdb_commit		b3799a9a7c62c3b5b7968f9860220a885b45fb8a
 %global openstack_commit	c20039004cb39e78c93cd00f154c3b9ba6404951
-%global pacemaker_commit	0b16aea22c8a03ddadf42837bcf0990355f961ff
-%global qpid_commit		    cb00785bf07041323559542b05d7a8b902de42fb
+%global pacemaker_commit	781499494dc3a5e5d00c84c273201bebaff9f2bf
+%global qpid_commit		    953028ba9abdf563bd95970ccf890237711072fb
 %global rabbitmq_commit		015bd788ccb495051a2db48e344a3a6aa3381076
 %global rsync_commit		357d51f3a6a22bc3da842736176c3510e507b4fb
 %global ssh_commit		    d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
 %global staging_commit		887275d8fb20e148c6f9eb327f1f6c8ea5ee280f
 %global stdlib_commit		4d2558f383e18bbe322dd0feb073555491216ab4
-%global swift_commit		8a7c88d8ac3d795f6c2bc65918256995e3a6e603
+%global swift_commit		e9b69499c943bfbb16c895611ebd4e90c16b377c
 %global sysctl_commit		c4486acc2d66de857dbccd8b4b945ea803226705
 %global tempest_commit		44e258746cb0cf9a53f37122d510474aed39201e
 %global vcsrepo_commit		6f7507a2a48ff0a58c7db026760a2eb84e382a77
@@ -78,7 +78,9 @@ Source31:	https://github.com/derekhiggins/puppet-vlan/archive/%{vlan_commit}/vla
 Source32:	https://github.com/stackforge/puppet-vswitch/archive/%{vswitch_commit}/vswitch-%{vswitch_commit}.tar.gz
 Source33:	https://github.com/packstack/puppetlabs-xinetd/archive/%{xinetd_commit}/xinetd-%{xinetd_commit}.tar.gz
 
-Patch0:     compute_driver.patch
+Patch0:     mariadb.patch
+Patch1:     apache24.patch
+Patch2:     compute_driver.patch
 
 BuildArch:      noarch
 
@@ -123,9 +125,17 @@ A collection of Puppet modules used to install and configure OpenStack.
 %setup -c -q -T -D -a 32
 %setup -c -q -T -D -a 33
 
+# puppetlabs-apache patches
+cd %{_builddir}/%{name}-%{version}/puppetlabs-apache-%{apache_commit}
+%patch1 -p1
+
+# puppetlabs-mysql patches
+cd %{_builddir}/%{name}-%{version}/puppetlabs-mysql-%{mysql_commit}
+%patch0 -p1
+
 # puppet-nova patches
 cd %{_builddir}/%{name}-%{version}/puppet-nova-%{nova_commit}
-%patch0 -p1
+%patch2 -p1
 
 find %{_builddir} -type f -name ".*" -exec rm {} +
 find %{_builddir} -size 0 -exec rm {} +
@@ -182,6 +192,12 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
 
 
 %changelog
+* Fri Mar 21 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-5
+- Synchronized modules with current master branch of redhat-openstack/openstack-puppet-modules
+
+* Thu Mar 20 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-4
+- Added mariadb.patch, apache24.patch
+
 * Mon Mar 17 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-3
 - Added compute_driver.patch (rhbz#1044606)
 
diff --git a/sources b/sources
index 777fde0..ccba0fd 100644
--- a/sources
+++ b/sources
@@ -18,14 +18,14 @@ acf63db1d60b14e34e123b35d11ab076  neutron-1cc2b42ceb39b199d96945eb4e6e972e6b32a2
 c02befefc2711d69270ea8dc573b463e  nova-6c8a4bd5e1d67cce4c6e316c2ba43ed5a4dd4e59.tar.gz
 ee40158527431488131f4331092b958c  nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
 b210832794c85b5f4e5aa75de0007b51  openstack-c20039004cb39e78c93cd00f154c3b9ba6404951.tar.gz
-80bd9a317ba3010387fe5ce097eaec05  pacemaker-0b16aea22c8a03ddadf42837bcf0990355f961ff.tar.gz
-267700e971735b7b1c25c7fa25c86269  qpid-cb00785bf07041323559542b05d7a8b902de42fb.tar.gz
+2c63bba226ce4f96112f5d227ff8cc71  pacemaker-781499494dc3a5e5d00c84c273201bebaff9f2bf.tar.gz
+28c069a264720c8f5f8f4dd631cfc959  qpid-953028ba9abdf563bd95970ccf890237711072fb.tar.gz
 e2b73c9ca16d412cd270d3bcdb06dacf  rabbitmq-015bd788ccb495051a2db48e344a3a6aa3381076.tar.gz
 b5d0c1c4cd711a3f762052813ad6a1bc  rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz
 1a50e27c52661099d075556242a4a26e  ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz
 387ad714db76de1e17b810b9db930f3f  staging-887275d8fb20e148c6f9eb327f1f6c8ea5ee280f.tar.gz
 b0e06fb5bb1ba1d68830c990d3e0e209  stdlib-4d2558f383e18bbe322dd0feb073555491216ab4.tar.gz
-ee9fa4b25c5eb2925f2375041aae016c  swift-8a7c88d8ac3d795f6c2bc65918256995e3a6e603.tar.gz
+40e3880094154a236bbcaf84b8e894b0  swift-e9b69499c943bfbb16c895611ebd4e90c16b377c.tar.gz
 9f332abf798b359d5f6d732a8b8fe95a  sysctl-c4486acc2d66de857dbccd8b4b945ea803226705.tar.gz
 94bdd18f8975f0e9d70ae48c1cdc62c6  tempest-44e258746cb0cf9a53f37122d510474aed39201e.tar.gz
 ad2529c2b5932c55392ac0fed0ab9ef5  vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz