[openstack-puppet-modules/f22] Update to upstream 2014.2.12

Lukas Bezdicka social at fedoraproject.org
Wed Mar 11 16:51:55 UTC 2015


commit 7e79b76a8c86e764b1b2e0d1f1a104e481d589eb
Author: Lukas Bezdicka <lbezdick at redhat.com>
Date:   Wed Mar 11 17:40:19 2015 +0100

    Update to upstream 2014.2.12

 0001-horizon-Change-default-documentation-URL.patch            |  2 +-
 0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch                |  2 +-
 0003-openstack-Set-default-charset-to-utf8.patch               |  2 +-
 0004-keystone-Add-manage_service-feature.patch                 |  2 +-
 0005-Add-manage_service-feature.patch                          |  2 +-
 0006-Fix-against-mongodb-2.6.5-from-epel.patch                 |  2 +-
 0007-Fix-support-for-Fedora-Rawhide.patch                      |  2 +-
 0008-Adds-filtering-for-BONDING-LACP.patch                     |  2 +-
 0009-JSON-was-invalid.patch                                    |  2 +-
 0010-Set-control_exchange-in-the-main-config-file.patch        |  2 +-
 ...-Configure-OVS-mechanism-agent-configs-in-its-config-.patch |  2 +-
 0012-Create-resource-cache-upon-creation.patch                 |  2 +-
 0013-Fix-rabbitmq-support.patch                                |  2 +-
 ...-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch |  2 +-
 0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch       |  2 +-
 ...-Changing-the-default-value-of-fastpath_flood-to-enab.patch |  2 +-
 openstack-puppet-modules.spec                                  | 10 +++++++---
 sources                                                        |  2 +-
 18 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/0001-horizon-Change-default-documentation-URL.patch b/0001-horizon-Change-default-documentation-URL.patch
index aeffed7..3144d11 100644
--- a/0001-horizon-Change-default-documentation-URL.patch
+++ b/0001-horizon-Change-default-documentation-URL.patch
@@ -1,4 +1,4 @@
-From d0018c70e718ce0cb3b34a026630b0a66e9972e2 Mon Sep 17 00:00:00 2001
+From edb03175ad717ff90b156f136c6c58cdc9469c13 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
diff --git a/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
index da2ab71..78689e5 100644
--- a/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
+++ b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
@@ -1,4 +1,4 @@
-From fd5574e61260b16619aa1668c8d65b158ba4c24a Mon Sep 17 00:00:00 2001
+From f20c5e20cd0e4184f16d5a34925b8efa7e8ffcfb 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 da574ed..6a26f8d 100644
--- a/0003-openstack-Set-default-charset-to-utf8.patch
+++ b/0003-openstack-Set-default-charset-to-utf8.patch
@@ -1,4 +1,4 @@
-From 62b097624d411275d727da99bd5f2f33ff268ffe Mon Sep 17 00:00:00 2001
+From 47c44e347aadea6f73259916cbef5b2c1493b84d 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-keystone-Add-manage_service-feature.patch b/0004-keystone-Add-manage_service-feature.patch
index 04660fc..e178582 100644
--- a/0004-keystone-Add-manage_service-feature.patch
+++ b/0004-keystone-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From 3e85b0406d84b22dd986233f1466ec26d7a03ece Mon Sep 17 00:00:00 2001
+From a3d75740c7be00ebd1b988754f2099a40237e435 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
diff --git a/0005-Add-manage_service-feature.patch b/0005-Add-manage_service-feature.patch
index 1ee7daa..cc3d37f 100644
--- a/0005-Add-manage_service-feature.patch
+++ b/0005-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From 7cba33122de4045f52ca88b1dc6053ee66c842c9 Mon Sep 17 00:00:00 2001
+From f5eb79dbc136627e58ab900e448039bc9d1e2562 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
 Date: Mon, 22 Sep 2014 15:50:38 +0200
 Subject: [PATCH] Add manage_service feature
diff --git a/0006-Fix-against-mongodb-2.6.5-from-epel.patch b/0006-Fix-against-mongodb-2.6.5-from-epel.patch
index e254375..e6fb65c 100644
--- a/0006-Fix-against-mongodb-2.6.5-from-epel.patch
+++ b/0006-Fix-against-mongodb-2.6.5-from-epel.patch
@@ -1,4 +1,4 @@
-From fa65712116ff5745710731ed511e52989fbcacf0 Mon Sep 17 00:00:00 2001
+From e8b32fbe71e102b4b650f477ceadafebf662a826 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ivan=20Ne=C4=8Das?= <inecas at redhat.com>
 Date: Tue, 25 Nov 2014 18:14:37 +0100
 Subject: [PATCH] Fix against mongodb 2.6.5 from epel
diff --git a/0007-Fix-support-for-Fedora-Rawhide.patch b/0007-Fix-support-for-Fedora-Rawhide.patch
index 1fbae94..8297ecb 100644
--- a/0007-Fix-support-for-Fedora-Rawhide.patch
+++ b/0007-Fix-support-for-Fedora-Rawhide.patch
@@ -1,4 +1,4 @@
-From b2af78d33bdb9bf5b801c4ed32cb0196a99c6e11 Mon Sep 17 00:00:00 2001
+From 981959bae3861f6d31c7da293b6c214839933903 Mon Sep 17 00:00:00 2001
 From: Lukas Bezdicka <lbezdick at redhat.com>
 Date: Mon, 8 Dec 2014 13:02:02 -0500
 Subject: [PATCH] Fix support for Fedora Rawhide
diff --git a/0008-Adds-filtering-for-BONDING-LACP.patch b/0008-Adds-filtering-for-BONDING-LACP.patch
index e6dc836..64f9b25 100644
--- a/0008-Adds-filtering-for-BONDING-LACP.patch
+++ b/0008-Adds-filtering-for-BONDING-LACP.patch
@@ -1,4 +1,4 @@
-From 65a91e9e79684ce4e2bf28d39bda459e80ef1f92 Mon Sep 17 00:00:00 2001
+From a7fea696075a7337b13133b095ae6bd30da7db23 Mon Sep 17 00:00:00 2001
 From: Gilles Dubreuil <gilles at redhat.com>
 Date: Mon, 8 Dec 2014 15:39:04 +1100
 Subject: [PATCH] Adds filtering for BONDING (LACP)
diff --git a/0009-JSON-was-invalid.patch b/0009-JSON-was-invalid.patch
index a638619..84741d8 100644
--- a/0009-JSON-was-invalid.patch
+++ b/0009-JSON-was-invalid.patch
@@ -1,4 +1,4 @@
-From 13301ae591184a3fcc39d3f066455a17e388ab36 Mon Sep 17 00:00:00 2001
+From 1e66b5de62433d9f2667456c14c0a534cad10e08 Mon Sep 17 00:00:00 2001
 From: Gilles Dubreuil <gilles at redhat.com>
 Date: Fri, 12 Dec 2014 15:40:58 +1100
 Subject: [PATCH] JSON was invalid
diff --git a/0010-Set-control_exchange-in-the-main-config-file.patch b/0010-Set-control_exchange-in-the-main-config-file.patch
index 02729a2..6d04dcb 100644
--- a/0010-Set-control_exchange-in-the-main-config-file.patch
+++ b/0010-Set-control_exchange-in-the-main-config-file.patch
@@ -1,4 +1,4 @@
-From 4b1c8c24fb52259a3c5c7b74be06439eaae59958 Mon Sep 17 00:00:00 2001
+From 77c653de3e8c6da97f62f038fdb397ae23a950db Mon Sep 17 00:00:00 2001
 From: Solly Ross <sross at redhat.com>
 Date: Tue, 16 Dec 2014 15:40:19 -0500
 Subject: [PATCH] Set control_exchange in the main config file
diff --git a/0011-Configure-OVS-mechanism-agent-configs-in-its-config-.patch b/0011-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
index cb97d62..02e1431 100644
--- a/0011-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
+++ b/0011-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
@@ -1,4 +1,4 @@
-From e43a199969a1871a0cacfd381105bc6865782379 Mon Sep 17 00:00:00 2001
+From 8898951857fc429ad0850e2a95658ae964181dfd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= <mgagne at iweb.com>
 Date: Wed, 9 Jul 2014 20:44:07 -0400
 Subject: [PATCH] Configure OVS mechanism agent configs in its config file
diff --git a/0012-Create-resource-cache-upon-creation.patch b/0012-Create-resource-cache-upon-creation.patch
index 2ca0cd1..7c157b4 100644
--- a/0012-Create-resource-cache-upon-creation.patch
+++ b/0012-Create-resource-cache-upon-creation.patch
@@ -1,4 +1,4 @@
-From 876f486ea298f276e1363408a2b06f6c31e8250f Mon Sep 17 00:00:00 2001
+From 4d19b4f6bc6320dd6dd073e84fe22244a87587e1 Mon Sep 17 00:00:00 2001
 From: Colleen Murphy <colleen at puppetlabs.com>
 Date: Tue, 17 Feb 2015 00:17:40 -0800
 Subject: [PATCH] Create resource cache upon creation
diff --git a/0013-Fix-rabbitmq-support.patch b/0013-Fix-rabbitmq-support.patch
index 0c49d6e..4881b48 100644
--- a/0013-Fix-rabbitmq-support.patch
+++ b/0013-Fix-rabbitmq-support.patch
@@ -1,4 +1,4 @@
-From 61053e81f63b4dc7ca6da5679a5ebd481626e8f5 Mon Sep 17 00:00:00 2001
+From 392a324f58f244b8f2ff5d97f8528a2c7254390c Mon Sep 17 00:00:00 2001
 From: Lukas Bezdicka <lbezdick at redhat.com>
 Date: Mon, 23 Feb 2015 15:00:31 +0100
 Subject: [PATCH] Fix rabbitmq support
diff --git a/0014-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch b/0014-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
index 4cfa70f..1a92470 100644
--- a/0014-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
+++ b/0014-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
@@ -1,4 +1,4 @@
-From 8ea9dc52eb3429d9110cb8eed192f372e61f7443 Mon Sep 17 00:00:00 2001
+From f89cc1dbd9f6448eccb6a0621e9f5a0515e115a6 Mon Sep 17 00:00:00 2001
 From: Lukas Bezdicka <lbezdick at redhat.com>
 Date: Fri, 2 Jan 2015 22:49:10 +0100
 Subject: [PATCH] Switch to TLSv1 as SSLv3 is considered insecure and is
diff --git a/0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch b/0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch
index 41b76a2..8627f98 100644
--- a/0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch
+++ b/0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch
@@ -1,4 +1,4 @@
-From 7fcb23d74f420273ee0fcddb374c325696ca8097 Mon Sep 17 00:00:00 2001
+From 4e056fef03ceeaf638dfa6652e5034ecc2fa2c39 Mon Sep 17 00:00:00 2001
 From: Dulanjalie Ganegedara <ddhanapa at cisco.com>
 Date: Thu, 12 Feb 2015 16:31:52 -0800
 Subject: [PATCH] Adding portdb and fastpath_flood to n1kv.conf
diff --git a/0016-Changing-the-default-value-of-fastpath_flood-to-enab.patch b/0016-Changing-the-default-value-of-fastpath_flood-to-enab.patch
index 6fd5365..41430ac 100644
--- a/0016-Changing-the-default-value-of-fastpath_flood-to-enab.patch
+++ b/0016-Changing-the-default-value-of-fastpath_flood-to-enab.patch
@@ -1,4 +1,4 @@
-From 71a5c90f92082fa84ee6c2bbaca39b2735fc3e1f Mon Sep 17 00:00:00 2001
+From a99777085c2b529065a41c6340396900de3f2d97 Mon Sep 17 00:00:00 2001
 From: Dulanjalie Ganegedara <ddhanapa at cisco.com>
 Date: Wed, 25 Feb 2015 08:43:17 -0800
 Subject: [PATCH] Changing the default value of fastpath_flood to enable
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index b90b7ec..f4c70e3 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,7 +1,7 @@
 
 Name:           openstack-puppet-modules
-Version:        2014.2.11
-Release:        2%{?dist}
+Version:        2014.2.12
+Release:        1%{?dist}
 Summary:        Collection of Puppet modules for OpenStack deployment
 License:        ASL 2.0 and GPLv2 and GPLv3
 
@@ -90,7 +90,7 @@ cp -r memcached %{buildroot}/%{_datadir}/openstack-puppet/modules/memcached
 cp -r module-data %{buildroot}/%{_datadir}/openstack-puppet/modules/module-data
 cp -r mongodb %{buildroot}/%{_datadir}/openstack-puppet/modules/mongodb
 cp -r mysql %{buildroot}/%{_datadir}/openstack-puppet/modules/mysql
-cp -r n1k-vsm %{buildroot}/%{_datadir}/openstack-puppet/modules/n1k-vsm
+cp -r n1k_vsm %{buildroot}/%{_datadir}/openstack-puppet/modules/n1k_vsm
 cp -r nagios %{buildroot}/%{_datadir}/openstack-puppet/modules/nagios
 cp -r neutron %{buildroot}/%{_datadir}/openstack-puppet/modules/neutron
 cp -r nova %{buildroot}/%{_datadir}/openstack-puppet/modules/nova
@@ -126,6 +126,10 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
 
 
 %changelog
+* Wed Mar 11 2015 Lukas Bezdicka <lbezdick at redhat.com> - 2014.2.12-1
+-  Updated to release 2014.2.12
+- n1k_vsm      2a42723f5a9d7dbfa00edf944ac5dec2bff6d9ea
+
 * Tue Mar 10 2015 Iván Chavero <ichavero at redhat.com> 2014.2.11-2
 - Added 0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch
 - Added 0016-Changing-the-default-value-of-fastpath_flood-to-enab.patch
diff --git a/sources b/sources
index 5e290dc..5ab5d72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f7b96da20e82f98468efacc961b7a44  2014.2.11.tar.gz
+a9a561948d52098dbce9553b624f7dfb  2014.2.12.tar.gz


More information about the scm-commits mailing list