[openstack-puppet-modules: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/openstack-puppet-modules
Martin Mágr
mmagr at fedoraproject.org
Thu Feb 13 11:20:06 UTC 2014
commit fa1a938d9ef8a0ebed6a2d5ea05426a798e50444
Merge: a7c9adb 1530085
Author: Martin Magr <mmagr at redhat.com>
Date: Thu Feb 13 12:20:23 2014 +0100
Merge branch 'master' of ssh://pkgs.fedoraproject.org/openstack-puppet-modules
Conflicts:
.gitignore
openstack-puppet-modules.spec
sources
.gitignore | 33 ---------------------------------
openstack-puppet-modules.spec | 17 +++++++++++++++--
2 files changed, 15 insertions(+), 35 deletions(-)
---
diff --cc .gitignore
index 6158f9d,ecd0ca1..792046c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,65 -1,50 +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
-/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
+/apache-a9017af0190bbfaf56cffbac042ca2a081198e89.tar.gz
+/ceilometer-91045b3be907b074cb1e0165b269d439aee43a26.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-c20039004cb39e78c93cd00f154c3b9ba6404951.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 --cc openstack-puppet-modules.spec
index 8d0c8d1,60d56a1..e1c300b
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@@ -41,40 -41,40 +41,39 @@@ License: ASL 2.0 and GPLv2 and G
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
-Source31: https://github.com/redhat-openstack/puppet-openstack-storage/archive/%{gluster_commit}/puppet-openstack-storage-%{gluster_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
@@@ -126,39 -129,38 +128,38 @@@ find %{_builddir} \( -name "*.rb" -o -n
%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-openstack-storage-%{gluster_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/gluster
+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
@@@ -167,10 -169,17 +168,22 @@@
%changelog
++
+* Wed Feb 12 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-1
+- Synchronized modules with current master branch of Packstack
+ and openstack-puppet-modules-repo (https://github.com/redhat-openstack/openstack-puppet-modules)
+
+ * 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
+
+ * 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
+
* Fri Oct 25 2013 Martin Mágr <mmagr at redhat.com> - 2013.2-4
- Added puppet-ceilometer, puppetlabs-mongodb, puppet-heat and puppet-pacemaker
- Synchronized modules with current state in package packstack-modules-puppet
More information about the scm-commits
mailing list