[openstack-puppet-modules/el6-icehouse] Updated to most recent redhat-openstack/openstack-puppet-modules
Martin Mágr
mmagr at fedoraproject.org
Mon Apr 7 11:02:04 UTC 2014
commit f437bcc4c29260f8d0f79d6401033da4d40355f6
Author: Martin Magr <mmagr at redhat.com>
Date: Mon Apr 7 12:36:17 2014 +0200
Updated to most recent redhat-openstack/openstack-puppet-modules
.gitignore | 3 +++
heat.patch | 28 +++-------------------------
openstack-puppet-modules.spec | 27 ++++++++++++---------------
sources | 9 ++++-----
4 files changed, 22 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59dd751..0efe889 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,6 @@
/qpid-953028ba9abdf563bd95970ccf890237711072fb.tar.gz
/swift-e9b69499c943bfbb16c895611ebd4e90c16b377c.tar.gz
/pacemaker-dd832b77b2c90d5ad08319483e2bd471373bc375.tar.gz
+/gluster-8139b898583ddd6f1a71df235719faec8305d161.tar.gz
+/heat-a64082e4f8ec75ecadaf20a02678647a7af22fb6.tar.gz
+/neutron-55f952d3cf92a0bf960fc8f0b79e574438e44f73.tar.gz
diff --git a/heat.patch b/heat.patch
index 410c690..698b7af 100644
--- a/heat.patch
+++ b/heat.patch
@@ -1,35 +1,13 @@
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
-index 8441e60..2e35e43 100644
+index 30cc832..d1d7ceb 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
-@@ -21,7 +21,7 @@
- # Optional. Defaults to undef.
- #
- # [*charset*]
--# the database charset. Optional. Defaults to 'latin1'
-+# the database charset. Optional. Defaults to 'utf8'
- #
- class heat::db::mysql(
- $password = false,
@@ -29,7 +29,7 @@ class heat::db::mysql(
$user = 'heat',
$host = 'localhost',
$allowed_hosts = undef,
-- $charset = 'latin1'
-+ $charset = 'utf8'
+- $charset = 'latin1',
++ $charset = 'utf8',
) {
validate_string($password)
-diff --git a/spec/classes/heat_db_mysql_spec.rb b/spec/classes/heat_db_mysql_spec.rb
-index ae53a31..f4141be 100644
---- a/spec/classes/heat_db_mysql_spec.rb
-+++ b/spec/classes/heat_db_mysql_spec.rb
-@@ -14,7 +14,7 @@ describe 'heat::db::mysql' do
- :dbname => 'heat',
- :user => 'heat',
- :host => 'localhost',
-- :charset => 'latin1'
-+ :charset => 'utf8'
- }
- end
-
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 39c8fff..8c5eee7 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -6,16 +6,16 @@
%global concat_commit 031bf261289dcbb32e63b053ed5b3a82117698c0
%global firewall_commit 56fa4a46f4481dd5ac7d619b43b96d683ee4ac82
%global glance_commit 5557c224f37c22b058c951d7494448981cb484a2
-%global gluster_commit 4b60e1f848d18b72c1ba959e1b2dd8708a30f605
+%global gluster_commit 8139b898583ddd6f1a71df235719faec8305d161
%global haproxy_commit f381510e940ee11feb044c1c728ba2e5af807c79
-%global heat_commit 6d2dc044e12c4c687647cff8bc60c981d9ed5312
+%global heat_commit a64082e4f8ec75ecadaf20a02678647a7af22fb6
%global horizon_commit 17ba6a73cec7f386922e6a914a120a829e225efc
%global inifile_commit fe9b0d5229ea37179a08c4b49239da9bc950acd1
%global keystone_commit 688ff4379ed7437747ff8fdcd464096e24b4ebc6
%global memcached_commit 49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
%global mongodb_commit 3f392925710f1758a95f1775d700b5fb787a003d
%global mysql_commit 83abc4556bbf6745708c08375649c9d71b6f66db
-%global neutron_commit 1cc2b42ceb39b199d96945eb4e6e972e6b32a2b8
+%global neutron_commit 55f952d3cf92a0bf960fc8f0b79e574438e44f73
%global nova_commit 6c8a4bd5e1d67cce4c6e316c2ba43ed5a4dd4e59
%global nssdb_commit b3799a9a7c62c3b5b7968f9860220a885b45fb8a
%global openstack_commit c20039004cb39e78c93cd00f154c3b9ba6404951
@@ -35,9 +35,10 @@
%global xinetd_commit bba48fad94c6538384173e60900a17c6f7ef7ca3
+
Name: openstack-puppet-modules
Version: 2014.1
-Release: 5.6%{?dist}
+Release: 6%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
@@ -50,9 +51,9 @@ Source3: https://github.com/stackforge/puppet-cinder/archive/%{cinder_commit}/ci
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
+Source7: https://github.com/purpleidea/puppet-gluster/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
+Source9: https://github.com/stackforge/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/stackforge/puppet-keystone/archive/%{keystone_commit}/keystone-%{keystone_commit}.tar.gz
@@ -88,10 +89,6 @@ Patch6: openstack.patch
Patch7: cinder.patch
Patch8: keystone.patch
Patch9: nova.patch
-Patch10: 0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch
-Patch11: 0002-Change-dhcp_lease_duration-to-Havana-default-of-8640.patch
-Patch12: 0003-Do-not-create-symblic-link-for-cisco-plugin.patch
-Patch13: puppet-neutron-vlan_ranges.patch
BuildArch: noarch
@@ -136,6 +133,7 @@ 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
@@ -159,10 +157,6 @@ cd %{_builddir}/%{name}-%{version}/puppet-heat-%{heat_commit}
# puppet-neutron patches
cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
%patch5 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
# puppet-openstack patches
cd %{_builddir}/%{name}-%{version}/puppet-openstack-%{openstack_commit}
@@ -200,7 +194,7 @@ cp -r puppet-cinder-%{cinder_commit} %{buildroot}/%{_datadir}/openstack-puppet/m
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-openstack-storage-%{gluster_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/gluster
+cp -r puppet-gluster-%{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
@@ -235,6 +229,9 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Mon Apr 7 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-6
+- Synchronized modules with current master branch of redhat-openstack/openstack-puppet-modules
+
* Wed Apr 2 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-5.6
- Synchronized pacemaker with current master branch of redhat-openstack/openstack-puppet-modules
diff --git a/sources b/sources
index 3154223..86a3395 100644
--- a/sources
+++ b/sources
@@ -5,20 +5,20 @@ eabb902f6211f5b6818b05b656a45a7f cinder-164163a7a267ae4139e2d97bab1a385a6da2ac5
8cff08df8d7fe83817af8b4ba5b13227 concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
b03e741e508b7c3b378b89378bdada49 firewall-56fa4a46f4481dd5ac7d619b43b96d683ee4ac82.tar.gz
3c6661f772af84010a96a3fbbf8b0eab glance-5557c224f37c22b058c951d7494448981cb484a2.tar.gz
-e6543e3a78faf5d9d3a36cf3034bdcd7 gluster-4b60e1f848d18b72c1ba959e1b2dd8708a30f605.tar.gz
+5af048256fff3925423c07b8bbed0c26 gluster-8139b898583ddd6f1a71df235719faec8305d161.tar.gz
edef1e76ec9200bb1989302f19ea18b9 haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz
-ed3a9dbe31f92d07f4b9ce7e18d3b430 heat-6d2dc044e12c4c687647cff8bc60c981d9ed5312.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
ec424a377eccb43b25677c9d08d38e6d mysql-83abc4556bbf6745708c08375649c9d71b6f66db.tar.gz
-acf63db1d60b14e34e123b35d11ab076 neutron-1cc2b42ceb39b199d96945eb4e6e972e6b32a2b8.tar.gz
+3b3e5837f1770893c75eb623a5502d14 neutron-55f952d3cf92a0bf960fc8f0b79e574438e44f73.tar.gz
c02befefc2711d69270ea8dc573b463e nova-6c8a4bd5e1d67cce4c6e316c2ba43ed5a4dd4e59.tar.gz
ee40158527431488131f4331092b958c nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
b210832794c85b5f4e5aa75de0007b51 openstack-c20039004cb39e78c93cd00f154c3b9ba6404951.tar.gz
-2c63bba226ce4f96112f5d227ff8cc71 pacemaker-781499494dc3a5e5d00c84c273201bebaff9f2bf.tar.gz
+c665a89f5dffdef9790fba4c395c50a0 pacemaker-dd832b77b2c90d5ad08319483e2bd471373bc375.tar.gz
28c069a264720c8f5f8f4dd631cfc959 qpid-953028ba9abdf563bd95970ccf890237711072fb.tar.gz
e2b73c9ca16d412cd270d3bcdb06dacf rabbitmq-015bd788ccb495051a2db48e344a3a6aa3381076.tar.gz
b5d0c1c4cd711a3f762052813ad6a1bc rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz
@@ -32,4 +32,3 @@ ad2529c2b5932c55392ac0fed0ab9ef5 vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a
203d13bff413d180c5347364679be2a1 vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
b90ff502fa89e087b8892b695f8e380b vswitch-b642b844db6d7df1ced6f11abd641a0982e06363.tar.gz
5ebe0f1f25defa3acdab0b4682e49f52 xinetd-bba48fad94c6538384173e60900a17c6f7ef7ca3.tar.gz
-c665a89f5dffdef9790fba4c395c50a0 pacemaker-dd832b77b2c90d5ad08319483e2bd471373bc375.tar.gz
More information about the scm-commits
mailing list