[openstack-puppet-modules/f19] Sync with packstack-puppet-modules
Ben Nemec
bnemec at fedoraproject.org
Fri Nov 15 23:04:35 UTC 2013
commit ddb6766ec6043a32ee44cf8f0343347f2ac19015
Author: Ben Nemec <bnemec at redhat.com>
Date: Fri Nov 15 23:04:03 2013 +0000
Sync with packstack-puppet-modules
.gitignore | 10 ++++++++++
openstack-puppet-modules.spec | 30 +++++++++++++++++++++---------
sources | 18 ++++++++++--------
3 files changed, 41 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 328c8e0..5e37661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,13 @@
/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
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index de858c4..69fcb56 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,23 +1,25 @@
%global apache_commit a2d8e839c4c9c1cdd9ea9f733658dc83aa23c765
%global ceilometer_commit a908469b2d46a9eef6795539a2d9a528fbf6da84
-%global cinder_commit fa28def3fb63d1ca29b4030d229afaa2c8d3b017
+%global certmonger_commit 8a1dc65c3f59eed2f9bc852cc0563fb2a09f5fdd
+%global cinder_commit 9bd451830d124703ab4b50dcab10e0a697c85ad6
%global concat_commit 031bf261289dcbb32e63b053ed5b3a82117698c0
%global firewall_commit 6106fb5404480ac7c883bddd503e0fc9f2698750
-%global glance_commit 850bca13c71e069dfca7dff3b633ca7f746ead61
+%global glance_commit a79c1916813087f720946d0e153d9558d9f0a828
%global haproxy_commit f381510e940ee11feb044c1c728ba2e5af807c79
%global heat_commit 6d2dc044e12c4c687647cff8bc60c981d9ed5312
-%global horizon_commit 1dc40b2d4a8d27c5d0af6b7ad52efdc9b27d525d
+%global horizon_commit 632af6f8f0b5de9218b7ce7503d66954c493928d
%global inifile_commit fe9b0d5229ea37179a08c4b49239da9bc950acd1
-%global keystone_commit 6f54428601c673baba4e70049ecbc798bd9bad64
+%global keystone_commit bb67ef3e0a7c605cee97f9a8ccd13000290f9b39
%global memcached_commit 49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
%global mongodb_commit 3a0574a4a664cfcff197829eb70976c4862db57a
%global mysql_commit 83abc4556bbf6745708c08375649c9d71b6f66db
-%global neutron_commit b6b50a97e060261ce66817ba8255ae4d710e0009
-%global nova_commit 84303ef81cd17ce62cc991e019eb86c4373baa62
-%global openstack_commit a5f9a18c6819f39801bcee5f080e1ec27d30b718
+%global neutron_commit d6b77ea751f0e72885b8ee7c3acdd17e0826478e
+%global nova_commit a3cadd09e70f560b78d2dbd20a4ca6c187fe1531
+%global nssdb_commit b3799a9a7c62c3b5b7968f9860220a885b45fb8a
+%global openstack_commit 050fa67b230b320e096c3a66420f692cd1adf69b
%global pacemaker_commit 4d20ef0734062f8b792dcad59ede824211bea278
-%global qpid_commit fa4ec7ddb17f7c6e5a4b3dd63f4fadbe6b61c30d
+%global qpid_commit 587b0b51e807ce787410133da0fe27ee466a4a72
%global rsync_commit 357d51f3a6a22bc3da842736176c3510e507b4fb
%global ssh_commit d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
%global stdlib_commit 4d2558f383e18bbe322dd0feb073555491216ab4
@@ -32,7 +34,7 @@
Name: openstack-puppet-modules
Version: 2013.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
@@ -67,6 +69,8 @@ Source25: https://github.com/packstack/puppet-ceilometer/archive/%{ceilome
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
BuildArch: noarch
@@ -106,6 +110,8 @@ A collection of Puppet modules used to install and configure OpenStack.
%setup -c -q -T -D -a 26
%setup -c -q -T -D -a 27
%setup -c -q -T -D -a 28
+%setup -c -q -T -D -a 29
+%setup -c -q -T -D -a 30
find %{_builddir} -type f -name ".*" -exec rm {} +
find %{_builddir} -size 0 -exec rm {} +
@@ -149,6 +155,8 @@ cp -r puppet-ceilometer-%{ceilometer_commit} %{buildroot}/%{_datadir}/openstack-
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
rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncproxy.init
@@ -157,6 +165,10 @@ 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
+- 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
diff --git a/sources b/sources
index e4da6c9..1a99503 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,11 @@
d758f3151dafea43dd36e4d3608bef1f puppet-ceilometer-a908469b2d46a9eef6795539a2d9a528fbf6da84.tar.gz
-8fb2226f651f20476fd1b56b80a0dcf7 puppet-cinder-fa28def3fb63d1ca29b4030d229afaa2c8d3b017.tar.gz
+3c1e3967de442feb3b27f9ebaef054c2 puppet-certmonger-8a1dc65c3f59eed2f9bc852cc0563fb2a09f5fdd.tar.gz
+08c0ae359fee1121ab434c79348d511e puppet-cinder-9bd451830d124703ab4b50dcab10e0a697c85ad6.tar.gz
8cff08df8d7fe83817af8b4ba5b13227 puppet-concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
-b0752e18144e1896a9b2ca694e253b98 puppet-glance-850bca13c71e069dfca7dff3b633ca7f746ead61.tar.gz
+e01e8bc69623ead0fe1948dd6522f91e puppet-glance-a79c1916813087f720946d0e153d9558d9f0a828.tar.gz
ed3a9dbe31f92d07f4b9ce7e18d3b430 puppet-heat-6d2dc044e12c4c687647cff8bc60c981d9ed5312.tar.gz
-942396a4023a54aafa181c0e9f1cfa93 puppet-horizon-1dc40b2d4a8d27c5d0af6b7ad52efdc9b27d525d.tar.gz
-39af269c719c1e3b96caea6ebf6bcef4 puppet-keystone-6f54428601c673baba4e70049ecbc798bd9bad64.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
@@ -17,11 +18,12 @@ b0e06fb5bb1ba1d68830c990d3e0e209 puppetlabs-stdlib-4d2558f383e18bbe322dd0feb073
ad2529c2b5932c55392ac0fed0ab9ef5 puppetlabs-vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
5ebe0f1f25defa3acdab0b4682e49f52 puppetlabs-xinetd-bba48fad94c6538384173e60900a17c6f7ef7ca3.tar.gz
d91faa359ff81cc3e5bdc2a4217afff5 puppet-memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz
-b06c6e0e6111a6d885b7cf445adf61e3 puppet-neutron-b6b50a97e060261ce66817ba8255ae4d710e0009.tar.gz
-185fcb297fa2af8f145a0931f1029dac puppet-nova-84303ef81cd17ce62cc991e019eb86c4373baa62.tar.gz
-9505787c80e15ed83935b9a688924056 puppet-openstack-a5f9a18c6819f39801bcee5f080e1ec27d30b718.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
-afb420d1c1c6f5d3d4b47cf40761413c puppet-qpid-fa4ec7ddb17f7c6e5a4b3dd63f4fadbe6b61c30d.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
More information about the scm-commits
mailing list