[openstack-puppet-modules/icehouse-epel7] Synchronized modules with current master branch
Ivan Chavero
ichavero at fedoraproject.org
Sat May 24 01:33:59 UTC 2014
commit 09992d5543869e72d7bdfd31e2836e9ed41b0dfc
Author: Ivan Chavero <ichavero at redhat.com>
Date: Fri May 23 19:26:52 2014 -0600
Synchronized modules with current master branch
Synchronized modules with current master branch of
redhat-openstack/openstack-puppet-modules
Removed glance.patch since the changes are now upstream
glance.patch | 26 ---------------------
openstack-puppet-modules.spec | 51 ++++++++++++++++++++---------------------
sources | 36 -----------------------------
3 files changed, 25 insertions(+), 88 deletions(-)
---
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 738dec8..d192aa6 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,13 +1,13 @@
%global apache_commit bbf9278b24931444022aa67140d3505b748151da
-%global ceilometer_commit 91045b3be907b074cb1e0165b269d439aee43a26
+%global ceilometer_commit 55cbdace1730a3cb0af780ab9f7be703ac873eab
%global certmonger_commit 5fbf10fbbff4aed4db30e839c63c99b195e8425a
%global cinder_commit 164163a7a267ae4139e2d97bab1a385a6da2ac5f
%global common_commit 2c0ed2844c606fd806bde0c02e47e79c88fab4a9
%global concat_commit 031bf261289dcbb32e63b053ed5b3a82117698c0
%global firewall_commit c147a624fb3dba7df625d0d7571b1b6669bcfca5
-%global galera_commit 22380ea649debf277735171b6a07900df4ba691c
-%global glance_commit 5557c224f37c22b058c951d7494448981cb484a2
+%global galera_commit 3b0a3c99419c3407e5d880213d62159c42713668
+%global glance_commit cb0daf02d7a991be642e62294912d93b036c6a5a
%global gluster_commit 80c2b13448c97c70a4b4bc0e402e00ecb5d681d5
%global haproxy_commit f381510e940ee11feb044c1c728ba2e5af807c79
%global heat_commit a64082e4f8ec75ecadaf20a02678647a7af22fb6
@@ -16,7 +16,7 @@
%global keystone_commit 688ff4379ed7437747ff8fdcd464096e24b4ebc6
%global memcached_commit 49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
%global mongodb_commit 3f392925710f1758a95f1775d700b5fb787a003d
-%global mysql_commit 3b27d6956bf49531a5fa886f8624e20f1ef692ba
+%global mysql_commit 54588506e6d82bbd079739799a3fa50696a83a01
%global neutron_commit 66c436bc2f06c5a71d79c674697394a11ec227f9
%global nova_commit 1e77a9d48a85a3ae6d30993b3c887f58e4a5973c
%global nssdb_commit b3799a9a7c62c3b5b7968f9860220a885b45fb8a
@@ -40,7 +40,7 @@
Name: openstack-puppet-modules
Version: 2014.1
-Release: 11.1%{?dist}
+Release: 12%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
@@ -85,15 +85,14 @@ Source35: https://github.com/stackforge/puppet-vswitch/archive/%{vswitch_commit}
Source36: https://github.com/packstack/puppetlabs-xinetd/archive/%{xinetd_commit}/xinetd-%{xinetd_commit}.tar.gz
Patch0: compute_driver.patch
-Patch1: glance.patch
-Patch2: heat.patch
-Patch3: openstack.patch
-Patch4: cinder.patch
-Patch5: keystone.patch
-Patch6: nova.patch
-Patch7: 0001-Use-lioadm-as-iscsi-helper-on-RHEL-7.patch
-Patch8: 0001-Quickfix-to-remove-duplication-with-ceilometer-agent.patch
-Patch9: puppetlabs-firewall-pull-request-337.patch
+Patch1: heat.patch
+Patch2: openstack.patch
+Patch3: cinder.patch
+Patch4: keystone.patch
+Patch5: nova.patch
+Patch6: 0001-Use-lioadm-as-iscsi-helper-on-RHEL-7.patch
+Patch7: 0001-Quickfix-to-remove-duplication-with-ceilometer-agent.patch
+Patch8: puppetlabs-firewall-pull-request-337.patch
BuildArch: noarch
Requires: rubygem-json
@@ -144,33 +143,29 @@ A collection of Puppet modules used to install and configure OpenStack.
# puppet-nova patches
cd %{_builddir}/%{name}-%{version}/puppet-nova-%{nova_commit}
%patch0 -p1
-%patch6 -p1
-%patch8 -p1
-
-# puppet-glance patches
-cd %{_builddir}/%{name}-%{version}/puppet-glance-%{glance_commit}
-%patch1 -p1
+%patch5 -p1
+%patch7 -p1
# puppet-heat patches
cd %{_builddir}/%{name}-%{version}/puppet-heat-%{heat_commit}
-%patch2 -p1
+%patch1 -p1
# puppet-openstack patches
cd %{_builddir}/%{name}-%{version}/puppet-openstack-%{openstack_commit}
-%patch3 -p1
+%patch2 -p1
# puppet-cinder patches
cd %{_builddir}/%{name}-%{version}/puppet-cinder-%{cinder_commit}
-%patch4 -p1
-%patch7 -p1
+%patch3 -p1
+%patch6 -p1
# puppet-keystone patches
cd %{_builddir}/%{name}-%{version}/puppet-keystone-%{keystone_commit}
-%patch5 -p1
+%patch4 -p1
# puppetlabs-firewall patches
cd %{_builddir}/%{name}-%{version}/puppetlabs-firewall-%{firewall_commit}
-%patch9 -p1
+%patch8 -p1
find %{_builddir}/%{name}-%{version}/ -type f -name ".*" -exec rm {} +
@@ -231,6 +226,10 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Fri May 23 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-12
+- Synchronized modules with current master branch of redhat-openstack/openstack-puppet-modules
+- Removed glance.patch since the changes are now upstream
+
* Fri May 16 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-11.1
- Added missing puppetlabs-firewall-pull-request-337.patch
diff --git a/sources b/sources
index 1b6165e..d7b1fd4 100644
--- a/sources
+++ b/sources
@@ -1,37 +1 @@
-390ce952e348614338df23de3d1d2974 apache-bbf9278b24931444022aa67140d3505b748151da.tar.gz
-e4a1a89deaa829c5515a6bde12ebb4f4 ceilometer-91045b3be907b074cb1e0165b269d439aee43a26.tar.gz
-35c3c53f442b591a4da3bfa75610069d certmonger-5fbf10fbbff4aed4db30e839c63c99b195e8425a.tar.gz
-eabb902f6211f5b6818b05b656a45a7f cinder-164163a7a267ae4139e2d97bab1a385a6da2ac5f.tar.gz
-6e70f75bbb494957eb64e5b71f835bd3 common-2c0ed2844c606fd806bde0c02e47e79c88fab4a9.tar.gz
-8cff08df8d7fe83817af8b4ba5b13227 concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
-3c338845ca69b093a065cae1c35996c0 firewall-c147a624fb3dba7df625d0d7571b1b6669bcfca5.tar.gz
-b88807cc59fe4e3450675e2f3979b309 galera-22380ea649debf277735171b6a07900df4ba691c.tar.gz
-3c6661f772af84010a96a3fbbf8b0eab glance-5557c224f37c22b058c951d7494448981cb484a2.tar.gz
-7d21112588ba43525f2006fd65a00b07 gluster-80c2b13448c97c70a4b4bc0e402e00ecb5d681d5.tar.gz
-edef1e76ec9200bb1989302f19ea18b9 haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz
-4dc6a108d2474aa9dd38a8d44914858c heat-a64082e4f8ec75ecadaf20a02678647a7af22fb6.tar.gz
-4b24a19668635cc11f7578f17ab12ebe horizon-17ba6a73cec7f386922e6a914a120a829e225efc.tar.gz
-b92cb5bb97ea2c2ccdd6fbd361cbb2e7 inifile-fe9b0d5229ea37179a08c4b49239da9bc950acd1.tar.gz
-63063035247258a08875e17cddecfb3f keystone-688ff4379ed7437747ff8fdcd464096e24b4ebc6.tar.gz
-d91faa359ff81cc3e5bdc2a4217afff5 memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz
-25f400100566e0a10580b84835126631 mongodb-3f392925710f1758a95f1775d700b5fb787a003d.tar.gz
-858c4da1350cef91ad84df37f4a80879 mysql-3b27d6956bf49531a5fa886f8624e20f1ef692ba.tar.gz
-e5a5e314c4b96d79d467cd0afa72b60f neutron-66c436bc2f06c5a71d79c674697394a11ec227f9.tar.gz
-2f0d23068f0eb1916755787b1d7bb9ae nova-1e77a9d48a85a3ae6d30993b3c887f58e4a5973c.tar.gz
-ee40158527431488131f4331092b958c nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
-b210832794c85b5f4e5aa75de0007b51 openstack-c20039004cb39e78c93cd00f154c3b9ba6404951.tar.gz
-8a56f0deff38aaffff3fb56a35dbfef9 pacemaker-21950c9b5e619a3cb02f01f66cd4cb33d209a690.tar.gz
-625ce5ea3a37e0d1e4a0b1c09b6495ff puppet-07ec49d1f67a498b31b4f164678a76c464e129c4.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
-4e4a07838966a58f90eab3c5b8e4baea stdlib-62e8c1d76902e6f22cb9f7b3abd43e757b4130a3.tar.gz
-40e3880094154a236bbcaf84b8e894b0 swift-e9b69499c943bfbb16c895611ebd4e90c16b377c.tar.gz
-9f332abf798b359d5f6d732a8b8fe95a sysctl-c4486acc2d66de857dbccd8b4b945ea803226705.tar.gz
-94bdd18f8975f0e9d70ae48c1cdc62c6 tempest-44e258746cb0cf9a53f37122d510474aed39201e.tar.gz
-ad2529c2b5932c55392ac0fed0ab9ef5 vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
-203d13bff413d180c5347364679be2a1 vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
-d0808da5ad0ac1227a2d2d78ff66a9b1 vswitch-a20f6355f048d2cb6206222b2d045b41ac875db4.tar.gz
5ebe0f1f25defa3acdab0b4682e49f52 xinetd-bba48fad94c6538384173e60900a17c6f7ef7ca3.tar.gz
More information about the scm-commits
mailing list