[openstack-puppet-modules/f20] Synchronized modules

Martin Mágr mmagr at fedoraproject.org
Thu Feb 13 17:25:43 UTC 2014


commit 1d1617b1945a25448f8ed58c117ae2ab62c4ad0d
Author: Martin Magr <mmagr at redhat.com>
Date:   Thu Feb 13 18:26:01 2014 +0100

    Synchronized modules

 .gitignore                    |   75 +++++++----------
 openstack-puppet-modules.spec |  181 +++++++++++++++++++++--------------------
 sources                       |   63 +++++++-------
 3 files changed, 158 insertions(+), 161 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e37661..db1c2c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,32 @@
-/puppet-cinder-fa28def3fb63d1ca29b4030d229afaa2c8d3b017.tar.gz
-/puppet-concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
-/puppet-glance-850bca13c71e069dfca7dff3b633ca7f746ead61.tar.gz
-/puppet-horizon-1dc40b2d4a8d27c5d0af6b7ad52efdc9b27d525d.tar.gz
-/puppet-keystone-6f54428601c673baba4e70049ecbc798bd9bad64.tar.gz
-/puppetlabs-apache-fbab9a521dbd27a6cd77476327636003261d553c.tar.gz
-/puppetlabs-firewall-6106fb5404480ac7c883bddd503e0fc9f2698750.tar.gz
-/puppetlabs-haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz
-/puppetlabs-inifile-fe9b0d5229ea37179a08c4b49239da9bc950acd1.tar.gz
-/puppetlabs-mysql-8a4f8c76e662b008bb30ce723a8b30ef494b21a1.tar.gz
-/puppetlabs-rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz
-/puppetlabs-stdlib-4d2558f383e18bbe322dd0feb073555491216ab4.tar.gz
-/puppetlabs-sysctl-c4486acc2d66de857dbccd8b4b945ea803226705.tar.gz
-/puppetlabs-vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
-/puppetlabs-xinetd-fa8edb134b538b9a929f7e85e8bf9667f9acab8b.tar.gz
-/puppet-memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz
-/puppet-neutron-b6b50a97e060261ce66817ba8255ae4d710e0009.tar.gz
-/puppet-nova-84303ef81cd17ce62cc991e019eb86c4373baa62.tar.gz
-/puppet-openstack-a5f9a18c6819f39801bcee5f080e1ec27d30b718.tar.gz
-/puppet-qpid-fa4ec7ddb17f7c6e5a4b3dd63f4fadbe6b61c30d.tar.gz
-/puppet-ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz
-/puppet-swift-ee4a9d48599bce332d0d7bdf4f8c0bbb6d9c6f2e.tar.gz
-/puppet-tempest-93b691f7cbfa67599ee199bd79baf82243c17568.tar.gz
-/puppet-vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
-/puppet-vswitch-6e6b9462695e383423462d1321b1c0865524a408.tar.gz
-/puppet-ceilometer-a908469b2d46a9eef6795539a2d9a528fbf6da84.tar.gz
-/puppet-heat-6d2dc044e12c4c687647cff8bc60c981d9ed5312.tar.gz
-/puppetlabs-mongodb-3a0574a4a664cfcff197829eb70976c4862db57a.tar.gz
-/puppet-pacemaker-4d20ef0734062f8b792dcad59ede824211bea278.tar.gz
-/puppetlabs-apache-a2d8e839c4c9c1cdd9ea9f733658dc83aa23c765.tar.gz
-/puppetlabs-mysql-83abc4556bbf6745708c08375649c9d71b6f66db.tar.gz
-/puppetlabs-xinetd-bba48fad94c6538384173e60900a17c6f7ef7ca3.tar.gz
-/puppet-vswitch-06fd1ea9a7dbe5f5d236c5256b1de2db147e3bb2.tar.gz
-/puppet-certmonger-8a1dc65c3f59eed2f9bc852cc0563fb2a09f5fdd.tar.gz
-/puppet-cinder-9bd451830d124703ab4b50dcab10e0a697c85ad6.tar.gz
-/puppet-glance-a79c1916813087f720946d0e153d9558d9f0a828.tar.gz
-/puppet-horizon-632af6f8f0b5de9218b7ce7503d66954c493928d.tar.gz
-/puppet-keystone-bb67ef3e0a7c605cee97f9a8ccd13000290f9b39.tar.gz
-/puppet-neutron-d6b77ea751f0e72885b8ee7c3acdd17e0826478e.tar.gz
-/puppet-nova-a3cadd09e70f560b78d2dbd20a4ca6c187fe1531.tar.gz
-/puppet-nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
-/puppet-openstack-050fa67b230b320e096c3a66420f692cd1adf69b.tar.gz
-/puppet-qpid-587b0b51e807ce787410133da0fe27ee466a4a72.tar.gz
+/apache-a9017af0190bbfaf56cffbac042ca2a081198e89.tar.gz
+/ceilometer-0fb3b8f693ba4cc24bdcfb1f61de843343a13e75.tar.gz
+/certmonger-5fbf10fbbff4aed4db30e839c63c99b195e8425a.tar.gz
+/cinder-5da2beb74d7dc73b4f050f5fb474c473688d206f.tar.gz
+/concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
+/firewall-56fa4a46f4481dd5ac7d619b43b96d683ee4ac82.tar.gz
+/glance-5557c224f37c22b058c951d7494448981cb484a2.tar.gz
+/gluster-4b60e1f848d18b72c1ba959e1b2dd8708a30f605.tar.gz
+/haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz
+/heat-6d2dc044e12c4c687647cff8bc60c981d9ed5312.tar.gz
+/horizon-17ba6a73cec7f386922e6a914a120a829e225efc.tar.gz
+/inifile-fe9b0d5229ea37179a08c4b49239da9bc950acd1.tar.gz
+/keystone-bb67ef3e0a7c605cee97f9a8ccd13000290f9b39.tar.gz
+/memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz
+/mongodb-3f392925710f1758a95f1775d700b5fb787a003d.tar.gz
+/mysql-83abc4556bbf6745708c08375649c9d71b6f66db.tar.gz
+/neutron-1cc2b42ceb39b199d96945eb4e6e972e6b32a2b8.tar.gz
+/nova-0d405fe5198cbd34f1bd2acb42e058a916f1d663.tar.gz
+/nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
+/openstack-050fa67b230b320e096c3a66420f692cd1adf69b.tar.gz
+/pacemaker-0b16aea22c8a03ddadf42837bcf0990355f961ff.tar.gz
+/qpid-cb00785bf07041323559542b05d7a8b902de42fb.tar.gz
+/rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz
+/ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz
+/stdlib-4d2558f383e18bbe322dd0feb073555491216ab4.tar.gz
+/swift-03998109de1b4885af1c179e1e66e19525693981.tar.gz
+/sysctl-c4486acc2d66de857dbccd8b4b945ea803226705.tar.gz
+/tempest-44e258746cb0cf9a53f37122d510474aed39201e.tar.gz
+/vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
+/vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
+/vswitch-b642b844db6d7df1ced6f11abd641a0982e06363.tar.gz
+/xinetd-bba48fad94c6538384173e60900a17c6f7ef7ca3.tar.gz
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 69fcb56..29427a8 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,77 +1,78 @@
 
-%global apache_commit      a2d8e839c4c9c1cdd9ea9f733658dc83aa23c765
-%global ceilometer_commit  a908469b2d46a9eef6795539a2d9a528fbf6da84
-%global certmonger_commit  8a1dc65c3f59eed2f9bc852cc0563fb2a09f5fdd
-%global cinder_commit      9bd451830d124703ab4b50dcab10e0a697c85ad6
-%global concat_commit      031bf261289dcbb32e63b053ed5b3a82117698c0
-%global firewall_commit    6106fb5404480ac7c883bddd503e0fc9f2698750
-%global glance_commit      a79c1916813087f720946d0e153d9558d9f0a828
-%global haproxy_commit     f381510e940ee11feb044c1c728ba2e5af807c79
-%global heat_commit        6d2dc044e12c4c687647cff8bc60c981d9ed5312
-%global horizon_commit     632af6f8f0b5de9218b7ce7503d66954c493928d
-%global inifile_commit     fe9b0d5229ea37179a08c4b49239da9bc950acd1
-%global keystone_commit    bb67ef3e0a7c605cee97f9a8ccd13000290f9b39
-%global memcached_commit   49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
-%global mongodb_commit     3a0574a4a664cfcff197829eb70976c4862db57a
-%global mysql_commit       83abc4556bbf6745708c08375649c9d71b6f66db
-%global neutron_commit     d6b77ea751f0e72885b8ee7c3acdd17e0826478e
-%global nova_commit        a3cadd09e70f560b78d2dbd20a4ca6c187fe1531
-%global nssdb_commit       b3799a9a7c62c3b5b7968f9860220a885b45fb8a
-%global openstack_commit   050fa67b230b320e096c3a66420f692cd1adf69b
-%global pacemaker_commit   4d20ef0734062f8b792dcad59ede824211bea278
-%global qpid_commit        587b0b51e807ce787410133da0fe27ee466a4a72
-%global rsync_commit       357d51f3a6a22bc3da842736176c3510e507b4fb
-%global ssh_commit         d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
-%global stdlib_commit      4d2558f383e18bbe322dd0feb073555491216ab4
-%global swift_commit       ee4a9d48599bce332d0d7bdf4f8c0bbb6d9c6f2e
-%global sysctl_commit      c4486acc2d66de857dbccd8b4b945ea803226705
-%global tempest_commit     93b691f7cbfa67599ee199bd79baf82243c17568
-%global vcsrepo_commit     6f7507a2a48ff0a58c7db026760a2eb84e382a77
-%global vlan_commit        c937de75c28e63fba8d8738ad6a5f2ede517e53d
-%global vswitch_commit     06fd1ea9a7dbe5f5d236c5256b1de2db147e3bb2
-%global xinetd_commit      bba48fad94c6538384173e60900a17c6f7ef7ca3
+%global apache_commit		a9017af0190bbfaf56cffbac042ca2a081198e89
+%global ceilometer_commit	0fb3b8f693ba4cc24bdcfb1f61de843343a13e75
+%global certmonger_commit	5fbf10fbbff4aed4db30e839c63c99b195e8425a
+%global cinder_commit		5da2beb74d7dc73b4f050f5fb474c473688d206f
+%global concat_commit		031bf261289dcbb32e63b053ed5b3a82117698c0
+%global firewall_commit		56fa4a46f4481dd5ac7d619b43b96d683ee4ac82
+%global glance_commit		5557c224f37c22b058c951d7494448981cb484a2
+%global gluster_commit		4b60e1f848d18b72c1ba959e1b2dd8708a30f605
+%global haproxy_commit		f381510e940ee11feb044c1c728ba2e5af807c79
+%global heat_commit		    6d2dc044e12c4c687647cff8bc60c981d9ed5312
+%global horizon_commit		17ba6a73cec7f386922e6a914a120a829e225efc
+%global inifile_commit		fe9b0d5229ea37179a08c4b49239da9bc950acd1
+%global keystone_commit		bb67ef3e0a7c605cee97f9a8ccd13000290f9b39
+%global memcached_commit	49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
+%global mongodb_commit		3f392925710f1758a95f1775d700b5fb787a003d
+%global mysql_commit		83abc4556bbf6745708c08375649c9d71b6f66db
+%global neutron_commit		1cc2b42ceb39b199d96945eb4e6e972e6b32a2b8
+%global nova_commit		    0d405fe5198cbd34f1bd2acb42e058a916f1d663
+%global nssdb_commit		b3799a9a7c62c3b5b7968f9860220a885b45fb8a
+%global openstack_commit	050fa67b230b320e096c3a66420f692cd1adf69b
+%global pacemaker_commit	0b16aea22c8a03ddadf42837bcf0990355f961ff
+%global qpid_commit		    cb00785bf07041323559542b05d7a8b902de42fb
+%global rsync_commit		357d51f3a6a22bc3da842736176c3510e507b4fb
+%global ssh_commit		    d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
+%global stdlib_commit		4d2558f383e18bbe322dd0feb073555491216ab4
+%global swift_commit		03998109de1b4885af1c179e1e66e19525693981
+%global sysctl_commit		c4486acc2d66de857dbccd8b4b945ea803226705
+%global tempest_commit		44e258746cb0cf9a53f37122d510474aed39201e
+%global vcsrepo_commit		6f7507a2a48ff0a58c7db026760a2eb84e382a77
+%global vlan_commit		    c937de75c28e63fba8d8738ad6a5f2ede517e53d
+%global vswitch_commit		b642b844db6d7df1ced6f11abd641a0982e06363
+%global xinetd_commit		bba48fad94c6538384173e60900a17c6f7ef7ca3
 
 
 Name:           openstack-puppet-modules
 Version:        2013.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Puppet modules used to deploy OpenStack
 License:        ASL 2.0 and GPLv2 and GPLv3
 
 URL:            https://github.com/redhat-openstack
 
-Source0:        https://github.com/stackforge/puppet-glance/archive/%{glance_commit}/puppet-glance-%{glance_commit}.tar.gz
-Source1:        https://github.com/stackforge/puppet-neutron/archive/%{neutron_commit}/puppet-neutron-%{neutron_commit}.tar.gz
-Source2:        https://github.com/stackforge/puppet-keystone/archive/%{keystone_commit}/puppet-keystone-%{keystone_commit}.tar.gz
-Source3:        https://github.com/stackforge/puppet-nova/archive/%{nova_commit}/puppet-nova-%{nova_commit}.tar.gz
-Source4:        https://github.com/stackforge/puppet-swift/archive/%{swift_commit}/puppet-swift-%{swift_commit}.tar.gz
-Source5:        https://github.com/stackforge/puppet-cinder/archive/%{cinder_commit}/puppet-cinder-%{cinder_commit}.tar.gz
-Source6:        https://github.com/stackforge/puppet-horizon/archive/%{horizon_commit}/puppet-horizon-%{horizon_commit}.tar.gz
-Source7:        https://github.com/stackforge/puppet-openstack/archive/%{openstack_commit}/puppet-openstack-%{openstack_commit}.tar.gz
-Source8:        https://github.com/stackforge/puppet-tempest/archive/%{tempest_commit}/puppet-tempest-%{tempest_commit}.tar.gz
-Source9:        https://github.com/puppetlabs/puppetlabs-rsync/archive/%{rsync_commit}/puppetlabs-rsync-%{rsync_commit}.tar.gz
-Source10:       https://github.com/puppetlabs/puppetlabs-stdlib/archive/%{stdlib_commit}/puppetlabs-stdlib-%{stdlib_commit}.tar.gz
-Source11:       https://github.com/puppetlabs/puppetlabs-sysctl/archive/%{sysctl_commit}/puppetlabs-sysctl-%{sysctl_commit}.tar.gz
-Source12:       https://github.com/puppetlabs/puppetlabs-haproxy/archive/%{haproxy_commit}/puppetlabs-haproxy-%{haproxy_commit}.tar.gz
-Source13:       https://github.com/puppetlabs/puppetlabs-inifile/archive/%{inifile_commit}/puppetlabs-inifile-%{inifile_commit}.tar.gz
-Source14:       https://github.com/puppetlabs/puppetlabs-vcsrepo/archive/%{vcsrepo_commit}/puppetlabs-vcsrepo-%{vcsrepo_commit}.tar.gz
-Source15:       https://github.com/packstack/puppetlabs-xinetd/archive/%{xinetd_commit}/puppetlabs-xinetd-%{xinetd_commit}.tar.gz
-Source16:       https://github.com/packstack/puppetlabs-apache/archive/%{apache_commit}/puppetlabs-apache-%{apache_commit}.tar.gz
-Source17:       https://github.com/packstack/puppetlabs-mysql/archive/%{mysql_commit}/puppetlabs-mysql-%{mysql_commit}.tar.gz
-Source18:       https://github.com/packstack/puppet-vswitch/archive/%{vswitch_commit}/puppet-vswitch-%{vswitch_commit}.tar.gz
-Source19:       https://github.com/packstack/puppet-qpid/archive/%{qpid_commit}/puppet-qpid-%{qpid_commit}.tar.gz
-Source20:       https://github.com/derekhiggins/puppet-vlan/archive/%{vlan_commit}/puppet-vlan-%{vlan_commit}.tar.gz
-Source21:       https://github.com/saz/puppet-ssh/archive/%{ssh_commit}/puppet-ssh-%{ssh_commit}.tar.gz
-Source22:       https://github.com/saz/puppet-memcached/archive/%{memcached_commit}/puppet-memcached-%{memcached_commit}.tar.gz
-Source23:       https://github.com/lstanden/puppetlabs-firewall/archive/%{firewall_commit}/puppetlabs-firewall-%{firewall_commit}.tar.gz
-Source24:       https://github.com/ripienaar/puppet-concat/archive/%{concat_commit}/puppet-concat-%{concat_commit}.tar.gz
-Source25:       https://github.com/packstack/puppet-ceilometer/archive/%{ceilometer_commit}/puppet-ceilometer-%{ceilometer_commit}.tar.gz
-Source26:       https://github.com/puppetlabs/puppetlabs-mongodb/archive/%{mongodb_commit}/puppetlabs-mongodb-%{mongodb_commit}.tar.gz
-Source27:       https://github.com/packstack/puppet-heat/archive/%{heat_commit}/puppet-heat-%{heat_commit}.tar.gz
-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
-
+Source0:	https://github.com/puppetlabs/puppetlabs-apache/archive/%{apache_commit}/apache-%{apache_commit}.tar.gz
+Source1:	https://github.com/stackforge/puppet-ceilometer/archive/%{ceilometer_commit}/ceilometer-%{ceilometer_commit}.tar.gz
+Source2:	https://github.com/rcritten/puppet-certmonger/archive/%{certmonger_commit}/certmonger-%{certmonger_commit}.tar.gz
+Source3:	https://github.com/stackforge/puppet-cinder/archive/%{cinder_commit}/cinder-%{cinder_commit}.tar.gz
+Source4:	https://github.com/ripienaar/puppet-concat/archive/%{concat_commit}/concat-%{concat_commit}.tar.gz
+Source5:	https://github.com/puppetlabs/puppetlabs-firewall/archive/%{firewall_commit}/firewall-%{firewall_commit}.tar.gz
+Source6:	https://github.com/stackforge/puppet-glance/archive/%{glance_commit}/glance-%{glance_commit}.tar.gz
+Source7:	https://github.com/redhat-openstack/puppet-openstack-storage/archive/%{gluster_commit}/gluster-%{gluster_commit}.tar.gz
+Source8:	https://github.com/puppetlabs/puppetlabs-haproxy/archive/%{haproxy_commit}/haproxy-%{haproxy_commit}.tar.gz
+Source9:	https://github.com/packstack/puppet-heat/archive/%{heat_commit}/heat-%{heat_commit}.tar.gz
+Source10:	https://github.com/stackforge/puppet-horizon/archive/%{horizon_commit}/horizon-%{horizon_commit}.tar.gz
+Source11:	https://github.com/puppetlabs/puppetlabs-inifile/archive/%{inifile_commit}/inifile-%{inifile_commit}.tar.gz
+Source12:	https://github.com/packstack/puppet-keystone/archive/%{keystone_commit}/keystone-%{keystone_commit}.tar.gz
+Source13:	https://github.com/saz/puppet-memcached/archive/%{memcached_commit}/memcached-%{memcached_commit}.tar.gz
+Source14:	https://github.com/puppetlabs/puppetlabs-mongodb/archive/%{mongodb_commit}/mongodb-%{mongodb_commit}.tar.gz
+Source15:	https://github.com/packstack/puppetlabs-mysql/archive/%{mysql_commit}/mysql-%{mysql_commit}.tar.gz
+Source16:	https://github.com/stackforge/puppet-neutron/archive/%{neutron_commit}/neutron-%{neutron_commit}.tar.gz
+Source17:	https://github.com/stackforge/puppet-nova/archive/%{nova_commit}/nova-%{nova_commit}.tar.gz
+Source18:	https://github.com/rcritten/puppet-nssdb/archive/%{nssdb_commit}/nssdb-%{nssdb_commit}.tar.gz
+Source19:	https://github.com/stackforge/puppet-openstack/archive/%{openstack_commit}/openstack-%{openstack_commit}.tar.gz
+Source20:	https://github.com/radez/puppet-pacemaker/archive/%{pacemaker_commit}/pacemaker-%{pacemaker_commit}.tar.gz
+Source21:	https://github.com/dprince/puppet-qpid/archive/%{qpid_commit}/qpid-%{qpid_commit}.tar.gz
+Source22:	https://github.com/puppetlabs/puppetlabs-rsync/archive/%{rsync_commit}/rsync-%{rsync_commit}.tar.gz
+Source23:	https://github.com/saz/puppet-ssh/archive/%{ssh_commit}/ssh-%{ssh_commit}.tar.gz
+Source24:	https://github.com/puppetlabs/puppetlabs-stdlib/archive/%{stdlib_commit}/stdlib-%{stdlib_commit}.tar.gz
+Source25:	https://github.com/stackforge/puppet-swift/archive/%{swift_commit}/swift-%{swift_commit}.tar.gz
+Source26:	https://github.com/puppetlabs/puppetlabs-sysctl/archive/%{sysctl_commit}/sysctl-%{sysctl_commit}.tar.gz
+Source27:	https://github.com/stackforge/puppet-tempest/archive/%{tempest_commit}/tempest-%{tempest_commit}.tar.gz
+Source28:	https://github.com/puppetlabs/puppetlabs-vcsrepo/archive/%{vcsrepo_commit}/vcsrepo-%{vcsrepo_commit}.tar.gz
+Source29:	https://github.com/derekhiggins/puppet-vlan/archive/%{vlan_commit}/vlan-%{vlan_commit}.tar.gz
+Source30:	https://github.com/stackforge/puppet-vswitch/archive/%{vswitch_commit}/vswitch-%{vswitch_commit}.tar.gz
+Source31:	https://github.com/packstack/puppetlabs-xinetd/archive/%{xinetd_commit}/xinetd-%{xinetd_commit}.tar.gz
 
 BuildArch:      noarch
 
@@ -112,6 +113,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 {} +
@@ -126,37 +128,38 @@ find %{_builddir} \( -name "*.rb" -o -name "*.erb" \) -exec chmod -x {} + -exec
 %install
 rm -rf %{buildroot}
 install -d -m 0755 %{buildroot}/%{_datadir}/openstack-puppet/modules/
+cp -r puppetlabs-apache-%{apache_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/apache
+cp -r puppet-ceilometer-%{ceilometer_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/ceilometer
+cp -r puppet-certmonger-%{certmonger_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/certmonger
+cp -r puppet-cinder-%{cinder_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/cinder
+cp -r puppetlabs-concat-%{concat_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/concat
+cp -r puppetlabs-firewall-%{firewall_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/firewall
 cp -r puppet-glance-%{glance_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/glance
-cp -r puppet-neutron-%{neutron_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/neutron
+cp -r puppet-openstack-storage-%{gluster_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/gluster
+cp -r puppetlabs-haproxy-%{haproxy_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/haproxy
+cp -r puppet-heat-%{heat_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/heat
+cp -r puppet-horizon-%{horizon_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/horizon
+cp -r puppetlabs-inifile-%{inifile_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/inifile
 cp -r puppet-keystone-%{keystone_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/keystone
+cp -r puppet-memcached-%{memcached_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/memcached
+cp -r puppetlabs-mongodb-%{mongodb_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/mongodb
+cp -r puppetlabs-mysql-%{mysql_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/mysql
+cp -r puppet-neutron-%{neutron_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/neutron
 cp -r puppet-nova-%{nova_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/nova
-cp -r puppet-swift-%{swift_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/swift
-cp -r puppet-cinder-%{cinder_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/cinder
-cp -r puppet-horizon-%{horizon_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/horizon
-cp -r puppet-tempest-%{tempest_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/tempest
+cp -r puppet-nssdb-%{nssdb_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/nssdb
 cp -r puppet-openstack-%{openstack_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/openstack
+cp -r puppet-pacemaker-%{pacemaker_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/pacemaker
+cp -r puppet-qpid-%{qpid_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/qpid
 cp -r puppetlabs-rsync-%{rsync_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/rsync
+cp -r puppet-ssh-%{ssh_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/ssh
 cp -r puppetlabs-stdlib-%{stdlib_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/stdlib
+cp -r puppet-swift-%{swift_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/swift
 cp -r puppetlabs-sysctl-%{sysctl_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/sysctl
-cp -r puppetlabs-haproxy-%{haproxy_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/haproxy
-cp -r puppetlabs-inifile-%{inifile_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/inifile
+cp -r puppet-tempest-%{tempest_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/tempest
 cp -r puppetlabs-vcsrepo-%{vcsrepo_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/vcsrepo
-cp -r puppetlabs-xinetd-%{xinetd_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/xinetd
-cp -r puppetlabs-apache-%{apache_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/apache
-cp -r puppetlabs-mysql-%{mysql_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/mysql
-cp -r puppet-vswitch-%{vswitch_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/vswitch
-cp -r puppet-qpid-%{qpid_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/qpid
 cp -r puppet-vlan-%{vlan_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/vlan
-cp -r puppet-ssh-%{ssh_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/ssh
-cp -r puppet-memcached-%{memcached_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/memcached
-cp -r puppetlabs-firewall-%{firewall_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/firewall
-cp -r puppetlabs-concat-%{concat_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/concat
-cp -r puppet-ceilometer-%{ceilometer_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/ceilometer
-cp -r puppetlabs-mongodb-%{mongodb_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/mongodb
-cp -r puppet-heat-%{heat_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/heat
-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-vswitch-%{vswitch_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/vswitch
+cp -r puppetlabs-xinetd-%{xinetd_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/xinetd
 rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncproxy.init
 
 
@@ -165,7 +168,11 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
 
 
 %changelog
-* Fri Nov 15 2013 Ben Nemec <bnemec at redhat.com> - 2012.2-5
+* Thu Feb 13 2014 Martin Mágr <mmagr at redhat.com> - 2013.2-6
+- Synchronized modules with current havana branch of Packstack
+  and openstack-puppet-modules-repo (https://github.com/redhat-openstack/openstack-puppet-modules)
+
+* 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 1a99503..8b47e12 100644
--- a/sources
+++ b/sources
@@ -1,31 +1,32 @@
-d758f3151dafea43dd36e4d3608bef1f  puppet-ceilometer-a908469b2d46a9eef6795539a2d9a528fbf6da84.tar.gz
-3c1e3967de442feb3b27f9ebaef054c2  puppet-certmonger-8a1dc65c3f59eed2f9bc852cc0563fb2a09f5fdd.tar.gz
-08c0ae359fee1121ab434c79348d511e  puppet-cinder-9bd451830d124703ab4b50dcab10e0a697c85ad6.tar.gz
-8cff08df8d7fe83817af8b4ba5b13227  puppet-concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
-e01e8bc69623ead0fe1948dd6522f91e  puppet-glance-a79c1916813087f720946d0e153d9558d9f0a828.tar.gz
-ed3a9dbe31f92d07f4b9ce7e18d3b430  puppet-heat-6d2dc044e12c4c687647cff8bc60c981d9ed5312.tar.gz
-1cb31d231ed3c620fde3bc8572f00fae  puppet-horizon-632af6f8f0b5de9218b7ce7503d66954c493928d.tar.gz
-c4b0b4a165328d7b445b150b3935dc64  puppet-keystone-bb67ef3e0a7c605cee97f9a8ccd13000290f9b39.tar.gz
-bda491154090acbf198c6336e2b54503  puppetlabs-apache-a2d8e839c4c9c1cdd9ea9f733658dc83aa23c765.tar.gz
-91f1b46ad95a5b74ab08a29a0ed80fed  puppetlabs-firewall-6106fb5404480ac7c883bddd503e0fc9f2698750.tar.gz
-edef1e76ec9200bb1989302f19ea18b9  puppetlabs-haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz
-b92cb5bb97ea2c2ccdd6fbd361cbb2e7  puppetlabs-inifile-fe9b0d5229ea37179a08c4b49239da9bc950acd1.tar.gz
-b209afac5f2c8913a0c7535b40a5dfb9  puppetlabs-mongodb-3a0574a4a664cfcff197829eb70976c4862db57a.tar.gz
-ec424a377eccb43b25677c9d08d38e6d  puppetlabs-mysql-83abc4556bbf6745708c08375649c9d71b6f66db.tar.gz
-b5d0c1c4cd711a3f762052813ad6a1bc  puppetlabs-rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz
-b0e06fb5bb1ba1d68830c990d3e0e209  puppetlabs-stdlib-4d2558f383e18bbe322dd0feb073555491216ab4.tar.gz
-9f332abf798b359d5f6d732a8b8fe95a  puppetlabs-sysctl-c4486acc2d66de857dbccd8b4b945ea803226705.tar.gz
-ad2529c2b5932c55392ac0fed0ab9ef5  puppetlabs-vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
-5ebe0f1f25defa3acdab0b4682e49f52  puppetlabs-xinetd-bba48fad94c6538384173e60900a17c6f7ef7ca3.tar.gz
-d91faa359ff81cc3e5bdc2a4217afff5  puppet-memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.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
-639ce8b14bfac5f61d4c2a12be4db930  puppet-pacemaker-4d20ef0734062f8b792dcad59ede824211bea278.tar.gz
-d36f9e908659d7c5483b43fc172a80dd  puppet-qpid-587b0b51e807ce787410133da0fe27ee466a4a72.tar.gz
-1a50e27c52661099d075556242a4a26e  puppet-ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz
-9ec496f9b11a8e2f367cd2b91f8268ad  puppet-swift-ee4a9d48599bce332d0d7bdf4f8c0bbb6d9c6f2e.tar.gz
-85911e67e14169b6e458edc1dec80098  puppet-tempest-93b691f7cbfa67599ee199bd79baf82243c17568.tar.gz
-203d13bff413d180c5347364679be2a1  puppet-vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
-37418ac451b8fdceb9ae71ba3cff8373  puppet-vswitch-06fd1ea9a7dbe5f5d236c5256b1de2db147e3bb2.tar.gz
+ba319ac85d1a39dd4d7ae0c1ebeaccf8  apache-a9017af0190bbfaf56cffbac042ca2a081198e89.tar.gz
+53eb8ab7c95aa9217ff5955d3112062f  ceilometer-0fb3b8f693ba4cc24bdcfb1f61de843343a13e75.tar.gz
+35c3c53f442b591a4da3bfa75610069d  certmonger-5fbf10fbbff4aed4db30e839c63c99b195e8425a.tar.gz
+e46898ce54302900dc82cb5ad8fc5d54  cinder-5da2beb74d7dc73b4f050f5fb474c473688d206f.tar.gz
+8cff08df8d7fe83817af8b4ba5b13227  concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
+b03e741e508b7c3b378b89378bdada49  firewall-56fa4a46f4481dd5ac7d619b43b96d683ee4ac82.tar.gz
+3c6661f772af84010a96a3fbbf8b0eab  glance-5557c224f37c22b058c951d7494448981cb484a2.tar.gz
+e6543e3a78faf5d9d3a36cf3034bdcd7  gluster-4b60e1f848d18b72c1ba959e1b2dd8708a30f605.tar.gz
+edef1e76ec9200bb1989302f19ea18b9  haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz
+ed3a9dbe31f92d07f4b9ce7e18d3b430  heat-6d2dc044e12c4c687647cff8bc60c981d9ed5312.tar.gz
+4b24a19668635cc11f7578f17ab12ebe  horizon-17ba6a73cec7f386922e6a914a120a829e225efc.tar.gz
+b92cb5bb97ea2c2ccdd6fbd361cbb2e7  inifile-fe9b0d5229ea37179a08c4b49239da9bc950acd1.tar.gz
+c4b0b4a165328d7b445b150b3935dc64  keystone-bb67ef3e0a7c605cee97f9a8ccd13000290f9b39.tar.gz
+d91faa359ff81cc3e5bdc2a4217afff5  memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz
+25f400100566e0a10580b84835126631  mongodb-3f392925710f1758a95f1775d700b5fb787a003d.tar.gz
+ec424a377eccb43b25677c9d08d38e6d  mysql-83abc4556bbf6745708c08375649c9d71b6f66db.tar.gz
+acf63db1d60b14e34e123b35d11ab076  neutron-1cc2b42ceb39b199d96945eb4e6e972e6b32a2b8.tar.gz
+bd55ee6d22cfe27ead60268f9c1e4b54  nova-0d405fe5198cbd34f1bd2acb42e058a916f1d663.tar.gz
+ee40158527431488131f4331092b958c  nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
+b22438d376700d7a53c9f10e34a02711  openstack-050fa67b230b320e096c3a66420f692cd1adf69b.tar.gz
+80bd9a317ba3010387fe5ce097eaec05  pacemaker-0b16aea22c8a03ddadf42837bcf0990355f961ff.tar.gz
+267700e971735b7b1c25c7fa25c86269  qpid-cb00785bf07041323559542b05d7a8b902de42fb.tar.gz
+b5d0c1c4cd711a3f762052813ad6a1bc  rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz
+1a50e27c52661099d075556242a4a26e  ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz
+b0e06fb5bb1ba1d68830c990d3e0e209  stdlib-4d2558f383e18bbe322dd0feb073555491216ab4.tar.gz
+4095051aab8b6e9d962d85fdbc144578  swift-03998109de1b4885af1c179e1e66e19525693981.tar.gz
+9f332abf798b359d5f6d732a8b8fe95a  sysctl-c4486acc2d66de857dbccd8b4b945ea803226705.tar.gz
+94bdd18f8975f0e9d70ae48c1cdc62c6  tempest-44e258746cb0cf9a53f37122d510474aed39201e.tar.gz
+ad2529c2b5932c55392ac0fed0ab9ef5  vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
+203d13bff413d180c5347364679be2a1  vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
+b90ff502fa89e087b8892b695f8e380b  vswitch-b642b844db6d7df1ced6f11abd641a0982e06363.tar.gz
+5ebe0f1f25defa3acdab0b4682e49f52  xinetd-bba48fad94c6538384173e60900a17c6f7ef7ca3.tar.gz


More information about the scm-commits mailing list