[openstack-puppet-modules] Update to upstream 2014.2.2
Lukas Bezdicka
social at fedoraproject.org
Fri Oct 31 14:30:44 UTC 2014
commit 5671f4352401a0105c7b598f6cc3fa0cd96e9818
Author: Lukas Bezdicka <lbezdick at redhat.com>
Date: Fri Oct 31 14:15:26 2014 +0100
Update to upstream 2014.2.2
.gitignore | 1 +
...-horizon-Change-default-documentation-URL.patch | 6 +-
0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch | 2 +-
0003-openstack-Set-default-charset-to-utf8.patch | 2 +-
0004-heat-Implement-Keystone-domain-creation.patch | 2 +-
... 0005-keystone-Add-manage_service-feature.patch | 10 +-
...figure-OVS-mechanism-agent-configs-in-its.patch | 272 ------
...tch => 0006-Fixed-firewalld-package-issue.patch | 2 +-
0006-neutron-Fixes-plugin.ini-error.patch | 54 --
0008-swift-Add-manage_service-feature.patch | 1004 --------------------
openstack-puppet-modules.spec | 19 +-
sources | 2 +-
12 files changed, 22 insertions(+), 1354 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1eca6d0..3ac6fe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/openstack-puppet-modules*/
/*.tar.gz
+/2014.2.2
diff --git a/0001-horizon-Change-default-documentation-URL.patch b/0001-horizon-Change-default-documentation-URL.patch
index 0afb769..1cc709a 100644
--- a/0001-horizon-Change-default-documentation-URL.patch
+++ b/0001-horizon-Change-default-documentation-URL.patch
@@ -1,4 +1,4 @@
-From 4d6c4dacdbd7a36884c8c8c763f879544adb7a43 Mon Sep 17 00:00:00 2001
+From 3a6885a160f7c8c42a526be224fd2b08a40eca63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Fri, 3 Oct 2014 19:18:45 +0200
Subject: [PATCH] [horizon] Change default documentation URL
@@ -11,10 +11,10 @@ Fixes: rhbz#1092019
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/horizon/manifests/init.pp b/horizon/manifests/init.pp
-index 985a564..64eb5af 100644
+index 2186628..a9fc9bc 100644
--- a/horizon/manifests/init.pp
+++ b/horizon/manifests/init.pp
-@@ -206,7 +206,7 @@ class horizon(
+@@ -210,7 +210,7 @@ class horizon(
$available_regions = undef,
$api_result_limit = 1000,
$log_level = 'INFO',
diff --git a/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
index 21a3c12..6f3229f 100644
--- a/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
+++ b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
@@ -1,4 +1,4 @@
-From 6d8051635341913a0c15fe6ff58f6ed25cdf7ad2 Mon Sep 17 00:00:00 2001
+From a1b207644341ad899beac54898c08af79f0d6d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Fri, 3 Oct 2014 19:26:49 +0200
Subject: [PATCH] [rabbitmq] Don't manage RabbitMQ repos
diff --git a/0003-openstack-Set-default-charset-to-utf8.patch b/0003-openstack-Set-default-charset-to-utf8.patch
index d2335e4..6879ca6 100644
--- a/0003-openstack-Set-default-charset-to-utf8.patch
+++ b/0003-openstack-Set-default-charset-to-utf8.patch
@@ -1,4 +1,4 @@
-From 7f049ff03795fe225547d91771310888fbccda27 Mon Sep 17 00:00:00 2001
+From 7679670e737f6c98a6f6e3297c6d86115678774e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Fri, 3 Oct 2014 19:56:51 +0200
Subject: [PATCH] [openstack] Set default charset to utf8
diff --git a/0004-heat-Implement-Keystone-domain-creation.patch b/0004-heat-Implement-Keystone-domain-creation.patch
index 666911d..1fba17c 100644
--- a/0004-heat-Implement-Keystone-domain-creation.patch
+++ b/0004-heat-Implement-Keystone-domain-creation.patch
@@ -1,4 +1,4 @@
-From 372310671f44be1ae6da81e74ce971ce3ce18a6a Mon Sep 17 00:00:00 2001
+From dfc3183eff1e245335b0e3e202a0f8b6e8ad96fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Fri, 3 Oct 2014 20:03:50 +0200
Subject: [PATCH] [heat] Implement Keystone domain creation
diff --git a/0007-keystone-Add-manage_service-feature.patch b/0005-keystone-Add-manage_service-feature.patch
similarity index 96%
rename from 0007-keystone-Add-manage_service-feature.patch
rename to 0005-keystone-Add-manage_service-feature.patch
index 785c818..083efd5 100644
--- a/0007-keystone-Add-manage_service-feature.patch
+++ b/0005-keystone-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From 683b386caf21c74c110773f76d7c6f1e4d715df2 Mon Sep 17 00:00:00 2001
+From 796bb9fabd745606217836553b713f21429a0375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Fri, 3 Oct 2014 20:32:27 +0200
Subject: [PATCH] [keystone] Add manage_service feature
@@ -16,7 +16,7 @@ Closes-bug: #1359823
4 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/keystone/manifests/init.pp b/keystone/manifests/init.pp
-index 55c88f2..4b81984 100644
+index 05e95b0..931e10c 100644
--- a/keystone/manifests/init.pp
+++ b/keystone/manifests/init.pp
@@ -38,7 +38,14 @@
@@ -35,7 +35,7 @@ index 55c88f2..4b81984 100644
#
# [*database_connection*]
# (optional) Url used to connect to database.
-@@ -273,6 +280,7 @@ class keystone(
+@@ -281,6 +288,7 @@ class keystone(
$ssl_cert_subject = '/C=US/ST=Unset/L=Unset/O=Unset/CN=localhost',
$cache_dir = '/var/cache/keystone',
$memcache_servers = false,
@@ -43,7 +43,7 @@ index 55c88f2..4b81984 100644
$enabled = true,
$database_connection = 'sqlite:////var/lib/keystone/keystone.db',
$database_idle_timeout = '200',
-@@ -597,10 +605,12 @@ class keystone(
+@@ -609,10 +617,12 @@ class keystone(
}
}
@@ -105,7 +105,7 @@ index 29d90b0..f7047bf 100644
:hasstatus => true,
:hasrestart => true
diff --git a/keystone/spec/classes/keystone_spec.rb b/keystone/spec/classes/keystone_spec.rb
-index c2e97b7..6d8e717 100644
+index 675d3a7..8df8548 100644
--- a/keystone/spec/classes/keystone_spec.rb
+++ b/keystone/spec/classes/keystone_spec.rb
@@ -41,6 +41,7 @@ describe 'keystone' do
diff --git a/0009-Fixed-firewalld-package-issue.patch b/0006-Fixed-firewalld-package-issue.patch
similarity index 97%
rename from 0009-Fixed-firewalld-package-issue.patch
rename to 0006-Fixed-firewalld-package-issue.patch
index c21a562..c6c08cf 100644
--- a/0009-Fixed-firewalld-package-issue.patch
+++ b/0006-Fixed-firewalld-package-issue.patch
@@ -1,4 +1,4 @@
-From f23383807ffccade34a818a6117685921070f6ec Mon Sep 17 00:00:00 2001
+From 2ab4c77b604c588e8dcdd6a17ead53f503727869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Fri, 24 Oct 2014 09:37:01 +0200
Subject: [PATCH] Fixed firewalld package issue
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 42836d1..d9d344b 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,23 +1,20 @@
Name: openstack-puppet-modules
-Version: 2014.2.1
-Release: 0.5%{?dist}
+Version: 2014.2.2
+Release: 1%{?dist}
Summary: Collection of Puppet modules for OpenStack deployment
License: ASL 2.0 and GPLv2 and GPLv3
URL: https://github.com/redhat-openstack
-Source0: https://github.com/redhat-openstack/openstack-puppet-modules/archive/%{name}-%{version}.tar.gz
+Source0: https://codeload.github.com/redhat-openstack/openstack-puppet-modules/legacy.tar.gz/2014.2.2
Patch0001: 0001-horizon-Change-default-documentation-URL.patch
Patch0002: 0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
Patch0003: 0003-openstack-Set-default-charset-to-utf8.patch
Patch0004: 0004-heat-Implement-Keystone-domain-creation.patch
-Patch0005: 0005-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch
-Patch0006: 0006-neutron-Fixes-plugin.ini-error.patch
-Patch0007: 0007-keystone-Add-manage_service-feature.patch
-Patch0008: 0008-swift-Add-manage_service-feature.patch
-Patch0009: 0009-Fixed-firewalld-package-issue.patch
+Patch0005: 0005-keystone-Add-manage_service-feature.patch
+Patch0006: 0006-Fixed-firewalld-package-issue.patch
BuildArch: noarch
Requires: rubygem-json
@@ -36,9 +33,6 @@ OpenStack via installers using Puppet configuration tool.
%patch0004 -p1
%patch0005 -p1
%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
find %{_builddir}/%{name}-%{version}/ -type f -name ".*" -exec rm {} +
find %{_builddir}/%{name}-%{version}/ -size 0 -exec rm {} +
@@ -106,6 +100,9 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Fri Oct 31 2014 Lukas Bezdicka <lbezdick at redhat.com> 2014.2.2-1
+- Update to upstream 2014.2.2
+
* Fri Oct 24 2014 Lukas Bezdicka <lbezdick at redhat.com> 2014.2.1-0.5
- Fixed firewalld package issue
diff --git a/sources b/sources
index 51f7d84..9aa6551 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8df76671e6e7c89450aa79f6c0ad23be openstack-puppet-modules-2014.2.1.tar.gz
+b9243204472c58ef928a01370b793941 2014.2.2
More information about the scm-commits
mailing list