[openstack-puppet-modules/f22] Update to upstream 2014.2.10
Lukas Bezdicka
social at fedoraproject.org
Wed Feb 11 11:02:58 UTC 2015
commit 4483917d216c1e6c172a696ef5a6d30252b54fc8
Author: Lukas Bezdicka <lbezdick at redhat.com>
Date: Wed Feb 11 11:57:10 2015 +0100
Update to upstream 2014.2.10
...-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-heat-Implement-Keystone-domain-creation.patch | 341 --------------------
... 0004-keystone-Add-manage_service-feature.patch | 6 +-
...VS-mechanism-agent-configs-in-its-config-.patch | 2 +-
....patch => 0006-Add-manage_service-feature.patch | 2 +-
... 0007-Fix-against-mongodb-2.6.5-from-epel.patch | 2 +-
...ch => 0008-Fix-support-for-Fedora-Rawhide.patch | 2 +-
...h => 0009-Adds-filtering-for-BONDING-LACP.patch | 2 +-
...as-invalid.patch => 0010-JSON-was-invalid.patch | 2 +-
...nfigure-auth-via-conf-file-not-paste-file.patch | 2 +-
...-control_exchange-in-the-main-config-file.patch | 2 +-
...ort-Neutron.patch => 0013-Support-Neutron.patch | 2 +-
..._ssl_-parameters-optional-when-rabbit_use.patch | 148 +++++++++
...LSv1-as-SSLv3-is-considered-insecure-and-.patch | 82 +++++
...d-Ironic-support-into-nova-puppet-modules.patch | 2 +-
...x-Ironic-modules-so-services-properly-run.patch | 215 ------------
0017-Deprecate-support-for-Fedora-18.patch | 52 ---
0017-Fix-prefetch-refresh-for-providers.patch | 84 +++++
0018-Automates-generation-of-NFS-config-file.patch | 162 ---------
openstack-puppet-modules.spec | 37 ++-
sources | 2 +-
23 files changed, 350 insertions(+), 805 deletions(-)
---
diff --git a/0001-horizon-Change-default-documentation-URL.patch b/0001-horizon-Change-default-documentation-URL.patch
index 42c14c9..6c44c6b 100644
--- a/0001-horizon-Change-default-documentation-URL.patch
+++ b/0001-horizon-Change-default-documentation-URL.patch
@@ -1,4 +1,4 @@
-From 5b0a428e8ced45c1cd83f3ae8fcd0133b78686b7 Mon Sep 17 00:00:00 2001
+From 82ec48214a6d29f6eb3d7dca60db1458e4a2e875 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 f62e5f7..c207c26 100644
--- a/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
+++ b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
@@ -1,4 +1,4 @@
-From 542705b5ef129dabb4194d56ba82a3c2fbb25715 Mon Sep 17 00:00:00 2001
+From 17bf7e482c1fddd92e2d10f146871343aadbac0f 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 5e0c8e9..d551b87 100644
--- a/0003-openstack-Set-default-charset-to-utf8.patch
+++ b/0003-openstack-Set-default-charset-to-utf8.patch
@@ -1,4 +1,4 @@
-From 86bc0cfe0fb57f226fa22af4f4a37ad8d4910cfe Mon Sep 17 00:00:00 2001
+From b918c515967d11adc37e110978cfed390e19bd07 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/0005-keystone-Add-manage_service-feature.patch b/0004-keystone-Add-manage_service-feature.patch
similarity index 97%
rename from 0005-keystone-Add-manage_service-feature.patch
rename to 0004-keystone-Add-manage_service-feature.patch
index 0f46a0e..ddd2215 100644
--- a/0005-keystone-Add-manage_service-feature.patch
+++ b/0004-keystone-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From 238ba533d31c5aa172205d44aebc7d942d9a73fb Mon Sep 17 00:00:00 2001
+From 08c5bcc85662885bb62be0a00fb17645f41e22ac 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, 36 insertions(+), 10 deletions(-)
diff --git a/keystone/manifests/init.pp b/keystone/manifests/init.pp
-index 53d2de3..705a829 100644
+index 15836d5..6faa34b 100644
--- a/keystone/manifests/init.pp
+++ b/keystone/manifests/init.pp
@@ -63,7 +63,13 @@
@@ -104,7 +104,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 1cfa3e8..d653c5b 100644
+index 7ccd0be..2b6d22e 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/0006-Configure-OVS-mechanism-agent-configs-in-its-config-.patch b/0005-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
similarity index 99%
rename from 0006-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
rename to 0005-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
index 0cdc73a..ca3e5d1 100644
--- a/0006-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
+++ b/0005-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
@@ -1,4 +1,4 @@
-From 65502820e6d766ba110f6f58b6089f435675ad4d Mon Sep 17 00:00:00 2001
+From 7c4b494dd4966b914a50d6c9e1f5f88aaa9a4460 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/0007-Add-manage_service-feature.patch b/0006-Add-manage_service-feature.patch
similarity index 99%
rename from 0007-Add-manage_service-feature.patch
rename to 0006-Add-manage_service-feature.patch
index 38293fc..3882a53 100644
--- a/0007-Add-manage_service-feature.patch
+++ b/0006-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From 926bba128547e2d3892e69e2b5956391fc2ded84 Mon Sep 17 00:00:00 2001
+From 28a20642294523a0b42d9404185a1f90c4370d90 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/0008-Fix-against-mongodb-2.6.5-from-epel.patch b/0007-Fix-against-mongodb-2.6.5-from-epel.patch
similarity index 95%
rename from 0008-Fix-against-mongodb-2.6.5-from-epel.patch
rename to 0007-Fix-against-mongodb-2.6.5-from-epel.patch
index 9956f38..23d5359 100644
--- a/0008-Fix-against-mongodb-2.6.5-from-epel.patch
+++ b/0007-Fix-against-mongodb-2.6.5-from-epel.patch
@@ -1,4 +1,4 @@
-From c0a0e1613a1a1dd00ed9ee2a060d35c2308c2805 Mon Sep 17 00:00:00 2001
+From 6072fa1fa5974daf23c5f222c1145a07414f5b3c 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/0009-Fix-support-for-Fedora-Rawhide.patch b/0008-Fix-support-for-Fedora-Rawhide.patch
similarity index 97%
rename from 0009-Fix-support-for-Fedora-Rawhide.patch
rename to 0008-Fix-support-for-Fedora-Rawhide.patch
index ab7de1b..f60cfc8 100644
--- a/0009-Fix-support-for-Fedora-Rawhide.patch
+++ b/0008-Fix-support-for-Fedora-Rawhide.patch
@@ -1,4 +1,4 @@
-From 8175584afaeceb8239a14344da8534a935a3d296 Mon Sep 17 00:00:00 2001
+From 91378e08eaf7b733956a0cdb57431c75ed1e84c7 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/0010-Adds-filtering-for-BONDING-LACP.patch b/0009-Adds-filtering-for-BONDING-LACP.patch
similarity index 97%
rename from 0010-Adds-filtering-for-BONDING-LACP.patch
rename to 0009-Adds-filtering-for-BONDING-LACP.patch
index 438bdc7..a4ee6ce 100644
--- a/0010-Adds-filtering-for-BONDING-LACP.patch
+++ b/0009-Adds-filtering-for-BONDING-LACP.patch
@@ -1,4 +1,4 @@
-From c78b2c7a57d83285fcecacee633be5c8c1547279 Mon Sep 17 00:00:00 2001
+From 1e2179ae1b7ff6a61a0058943c4d3f0f87a14206 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/0011-JSON-was-invalid.patch b/0010-JSON-was-invalid.patch
similarity index 94%
rename from 0011-JSON-was-invalid.patch
rename to 0010-JSON-was-invalid.patch
index 414f445..cab4023 100644
--- a/0011-JSON-was-invalid.patch
+++ b/0010-JSON-was-invalid.patch
@@ -1,4 +1,4 @@
-From d087c904325b621f97d9874db7b6c33b42368990 Mon Sep 17 00:00:00 2001
+From d1e8116c8b6f49fd052685b0cb2cf53cd949aba1 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/0012-Configure-auth-via-conf-file-not-paste-file.patch b/0011-Configure-auth-via-conf-file-not-paste-file.patch
similarity index 98%
rename from 0012-Configure-auth-via-conf-file-not-paste-file.patch
rename to 0011-Configure-auth-via-conf-file-not-paste-file.patch
index 031c3fd..15273d4 100644
--- a/0012-Configure-auth-via-conf-file-not-paste-file.patch
+++ b/0011-Configure-auth-via-conf-file-not-paste-file.patch
@@ -1,4 +1,4 @@
-From efd6feb2a8c5aa16958af7eef31a7b29ab3340c4 Mon Sep 17 00:00:00 2001
+From ffc268a5d45b92300ad9d9854d5558f72bdb4385 Mon Sep 17 00:00:00 2001
From: Solly Ross <sross at redhat.com>
Date: Tue, 16 Dec 2014 15:31:29 -0500
Subject: [PATCH] Configure auth via conf file, not paste file
diff --git a/0013-Set-control_exchange-in-the-main-config-file.patch b/0012-Set-control_exchange-in-the-main-config-file.patch
similarity index 95%
rename from 0013-Set-control_exchange-in-the-main-config-file.patch
rename to 0012-Set-control_exchange-in-the-main-config-file.patch
index 3c156ec..c79268e 100644
--- a/0013-Set-control_exchange-in-the-main-config-file.patch
+++ b/0012-Set-control_exchange-in-the-main-config-file.patch
@@ -1,4 +1,4 @@
-From 57615207994659b9cd212a75488b13024f814171 Mon Sep 17 00:00:00 2001
+From 6ce65e7c4c26f4729739d674140608de7ac59537 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/0014-Support-Neutron.patch b/0013-Support-Neutron.patch
similarity index 96%
rename from 0014-Support-Neutron.patch
rename to 0013-Support-Neutron.patch
index 688f46a..d42ae9c 100644
--- a/0014-Support-Neutron.patch
+++ b/0013-Support-Neutron.patch
@@ -1,4 +1,4 @@
-From 39441fbbb20871e7e4610dbf96a6f8345bb38edf Mon Sep 17 00:00:00 2001
+From 150e4a19160e709d26be6be4cb0eacf209e5dfa2 Mon Sep 17 00:00:00 2001
From: Solly Ross <sross at redhat.com>
Date: Tue, 16 Dec 2014 15:42:00 -0500
Subject: [PATCH] Support Neutron
diff --git a/0014-Makes-kombu_ssl_-parameters-optional-when-rabbit_use.patch b/0014-Makes-kombu_ssl_-parameters-optional-when-rabbit_use.patch
new file mode 100644
index 0000000..8ead756
--- /dev/null
+++ b/0014-Makes-kombu_ssl_-parameters-optional-when-rabbit_use.patch
@@ -0,0 +1,148 @@
+From 363d6932bca1a00ab2f37060a5bce4d0356eadd3 Mon Sep 17 00:00:00 2001
+From: Lukas Bezdicka <lbezdick at redhat.com>
+Date: Mon, 2 Feb 2015 13:36:00 +0100
+Subject: [PATCH] Makes kombu_ssl_* parameters optional when rabbit_use_ssl =>
+ true
+
+The kombu_ssl_* parameters should not be required when rabbit_use_ssl => true
+Rather, rabbit_use_ssl must be set to true if the kombu_ssl_* parameters are
+used.
+
+Change-Id: I1b2cbb15a7778c3d072409c43b39d1f41b7b48b6
+Closes-Bug: 1356083
+(cherry picked from commit 15b0a7dc825b1182f9e0e35c109ed7a6aaa51fd7)
+---
+ glance/manifests/notify/rabbitmq.pp | 41 ++++++++++++----------
+ glance/spec/classes/glance_notify_rabbitmq_spec.rb | 15 +++++---
+ 2 files changed, 33 insertions(+), 23 deletions(-)
+
+diff --git a/glance/manifests/notify/rabbitmq.pp b/glance/manifests/notify/rabbitmq.pp
+index cfe973b..1fc4012 100644
+--- a/glance/manifests/notify/rabbitmq.pp
++++ b/glance/manifests/notify/rabbitmq.pp
+@@ -60,18 +60,6 @@ class glance::notify::rabbitmq(
+ $amqp_durable_queues_real = $amqp_durable_queues
+ }
+
+- if $rabbit_use_ssl {
+- if !$kombu_ssl_ca_certs {
+- fail('The kombu_ssl_ca_certs parameter is required when rabbit_use_ssl is set to true')
+- }
+- if !$kombu_ssl_certfile {
+- fail('The kombu_ssl_certfile parameter is required when rabbit_use_ssl is set to true')
+- }
+- if !$kombu_ssl_keyfile {
+- fail('The kombu_ssl_keyfile parameter is required when rabbit_use_ssl is set to true')
+- }
+- }
+-
+ if $rabbit_hosts {
+ glance_api_config {
+ 'DEFAULT/rabbit_hosts': value => join($rabbit_hosts, ',');
+@@ -98,19 +86,34 @@ class glance::notify::rabbitmq(
+ }
+
+ if $rabbit_use_ssl {
+- glance_api_config {
+- 'DEFAULT/kombu_ssl_ca_certs': value => $kombu_ssl_ca_certs;
+- 'DEFAULT/kombu_ssl_certfile': value => $kombu_ssl_certfile;
+- 'DEFAULT/kombu_ssl_keyfile': value => $kombu_ssl_keyfile;
+- 'DEFAULT/kombu_ssl_version': value => $kombu_ssl_version;
++ glance_api_config { 'DEFAULT/kombu_ssl_version': value => $kombu_ssl_version }
++
++ if $kombu_ssl_ca_certs {
++ glance_api_config { 'DEFAULT/kombu_ssl_ca_certs': value => $kombu_ssl_ca_certs }
++ } else {
++ glance_api_config { 'DEFAULT/kombu_ssl_ca_certs': ensure => absent}
++ }
++
++ if $kombu_ssl_certfile {
++ glance_api_config { 'DEFAULT/kombu_ssl_certfile': value => $kombu_ssl_certfile }
++ } else {
++ glance_api_config { 'DEFAULT/kombu_ssl_certfile': ensure => absent}
++ }
++
++ if $kombu_ssl_keyfile {
++ glance_api_config { 'DEFAULT/kombu_ssl_keyfile': value => $kombu_ssl_keyfile }
++ } else {
++ glance_api_config { 'DEFAULT/kombu_ssl_keyfile': ensure => absent}
+ }
+ } else {
+ glance_api_config {
++ 'DEFAULT/kombu_ssl_version': ensure => absent;
+ 'DEFAULT/kombu_ssl_ca_certs': ensure => absent;
+ 'DEFAULT/kombu_ssl_certfile': ensure => absent;
+ 'DEFAULT/kombu_ssl_keyfile': ensure => absent;
+- 'DEFAULT/kombu_ssl_version': ensure => absent;
++ }
++ if ($kombu_ssl_keyfile or $kombu_ssl_certfile or $kombu_ssl_ca_certs) {
++ notice('Configuration of certificates with $rabbit_use_ssl == false is a useless config')
+ }
+ }
+-
+ }
+diff --git a/glance/spec/classes/glance_notify_rabbitmq_spec.rb b/glance/spec/classes/glance_notify_rabbitmq_spec.rb
+index 224aa02..1b75082 100644
+--- a/glance/spec/classes/glance_notify_rabbitmq_spec.rb
++++ b/glance/spec/classes/glance_notify_rabbitmq_spec.rb
+@@ -28,18 +28,24 @@ describe 'glance::notify::rabbitmq' do
+ it { should contain_glance_api_config('DEFAULT/rabbit_notification_topic').with_value('notifications') }
+ end
+
+- describe 'when passing params' do
++ describe 'when passing params and use ssl' do
+ let :params do
+ {
+ :rabbit_password => 'pass',
+ :rabbit_userid => 'guest2',
+ :rabbit_host => 'localhost2',
+ :rabbit_port => '5673',
++ :rabbit_use_ssl => true,
+ :rabbit_durable_queues => true,
+ }
+ it { should contain_glance_api_config('DEFAULT/rabbit_userid').with_value('guest2') }
+ it { should contain_glance_api_config('DEFAULT/rabbit_host').with_value('localhost2') }
+ it { should contain_glance_api_config('DEFAULT/rabbit_port').with_value('5673') }
++ it { should contain_glance_api_config('DEFAULT/rabbit_use_ssl').with_value('true') }
++ it { should contain_glance_api_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent') }
++ it { should contain_glance_api_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent') }
++ it { should contain_glance_api_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent') }
++ it { should contain_glance_api_config('DEFAULT/kombu_ssl_version').with_value('TLSv1') }
+ it { should contain_glance_api_config('DEFAULT/rabbit_durable_queues').with_value('true') }
+ end
+ end
+@@ -47,7 +53,7 @@ describe 'glance::notify::rabbitmq' do
+ describe 'with rabbit ssl cert parameters' do
+ let :params do
+ {
+- :rabbit_password => 'pass',
++ :rabbit_password => 'pass',
+ :rabbit_use_ssl => 'true',
+ :kombu_ssl_ca_certs => '/etc/ca.cert',
+ :kombu_ssl_certfile => '/etc/certfile',
+@@ -55,8 +61,7 @@ describe 'glance::notify::rabbitmq' do
+ :kombu_ssl_version => 'TLSv1',
+ }
+ end
+-
+- it { should contain_glance_api_config('DEFAULT/rabbit_use_ssl').with_value('true') }
++ it { should contain_glance_api_config('DEFAULT/rabbit_use_ssl').with_value(true) }
+ it { should contain_glance_api_config('DEFAULT/kombu_ssl_ca_certs').with_value('/etc/ca.cert') }
+ it { should contain_glance_api_config('DEFAULT/kombu_ssl_certfile').with_value('/etc/certfile') }
+ it { should contain_glance_api_config('DEFAULT/kombu_ssl_keyfile').with_value('/etc/key') }
+@@ -89,6 +94,7 @@ describe 'glance::notify::rabbitmq' do
+ :rabbit_userid => 'guest2',
+ :rabbit_host => 'localhost2',
+ :rabbit_port => '5673',
++ :rabbit_use_ssl => true,
+ :rabbit_durable_queues => true,
+ }
+ end
+@@ -96,6 +102,7 @@ describe 'glance::notify::rabbitmq' do
+ it { should contain_glance_api_config('DEFAULT/rabbit_host').with_value('localhost2') }
+ it { should contain_glance_api_config('DEFAULT/rabbit_port').with_value('5673') }
+ it { should contain_glance_api_config('DEFAULT/rabbit_hosts').with_value('localhost2:5673') }
++ it { should contain_glance_api_config('DEFAULT/rabbit_use_ssl').with_value('true') }
+ it { should contain_glance_api_config('DEFAULT/amqp_durable_queues').with_value('true') }
+ end
+
diff --git a/0015-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch b/0015-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
new file mode 100644
index 0000000..c9647c1
--- /dev/null
+++ b/0015-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
@@ -0,0 +1,82 @@
+From a7873c3dbca5702e7c65acfe1b7d8f99f37b35c9 Mon Sep 17 00:00:00 2001
+From: Lukas Bezdicka <lbezdick at redhat.com>
+Date: Fri, 2 Jan 2015 20:07:25 +0100
+Subject: [PATCH] Switch to TLSv1 as SSLv3 is considered insecure and is
+ disabled by default
+
+Rabbitmq won't talk to us anymore if we try to use SSLv3 as it disabled
+support for SSLv3. Openstack components use python's openssl
+implementation which does not support TLSv1.1 and TLSv1.2 yet so we
+just switch to TLSv1. Support for newer TLS should come with python
+2.7.9+
+
+Closes-Bug: #1409667
+Change-Id: I3834decbc73a97a627023b132324a6c4aec2468a
+(cherry picked from commit 7b801ad37ac36e5eddd3d844e3f483edcfa38442)
+---
+ cinder/manifests/init.pp | 4 ++--
+ cinder/spec/classes/cinder_spec.rb | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cinder/manifests/init.pp b/cinder/manifests/init.pp
+index 1080b3b..d18eceb 100644
+--- a/cinder/manifests/init.pp
++++ b/cinder/manifests/init.pp
+@@ -50,7 +50,7 @@
+ # (optional) SSL version to use (valid only if SSL enabled).
+ # Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be
+ # available on some distributions.
+-# Defaults to 'SSLv3'
++# Defaults to 'TLSv1'
+ #
+ # [amqp_durable_queues]
+ # Use durable queues in amqp.
+@@ -123,7 +123,7 @@ class cinder (
+ $kombu_ssl_ca_certs = undef,
+ $kombu_ssl_certfile = undef,
+ $kombu_ssl_keyfile = undef,
+- $kombu_ssl_version = 'SSLv3',
++ $kombu_ssl_version = 'TLSv1',
+ $amqp_durable_queues = false,
+ $qpid_hostname = 'localhost',
+ $qpid_port = '5672',
+diff --git a/cinder/spec/classes/cinder_spec.rb b/cinder/spec/classes/cinder_spec.rb
+index 4dea2e4..e64ff67 100644
+--- a/cinder/spec/classes/cinder_spec.rb
++++ b/cinder/spec/classes/cinder_spec.rb
+@@ -202,7 +202,7 @@ describe 'cinder' do
+ :kombu_ssl_ca_certs => '/path/to/ssl/ca/certs',
+ :kombu_ssl_certfile => '/path/to/ssl/cert/file',
+ :kombu_ssl_keyfile => '/path/to/ssl/keyfile',
+- :kombu_ssl_version => 'SSLv3'
++ :kombu_ssl_version => 'TLSv1'
+ })
+ end
+
+@@ -211,7 +211,7 @@ describe 'cinder' do
+ should contain_cinder_config('DEFAULT/kombu_ssl_ca_certs').with_value('/path/to/ssl/ca/certs')
+ should contain_cinder_config('DEFAULT/kombu_ssl_certfile').with_value('/path/to/ssl/cert/file')
+ should contain_cinder_config('DEFAULT/kombu_ssl_keyfile').with_value('/path/to/ssl/keyfile')
+- should contain_cinder_config('DEFAULT/kombu_ssl_version').with_value('SSLv3')
++ should contain_cinder_config('DEFAULT/kombu_ssl_version').with_value('TLSv1')
+ end
+ end
+
+@@ -227,7 +227,7 @@ describe 'cinder' do
+ should contain_cinder_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent')
+ should contain_cinder_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent')
+ should contain_cinder_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent')
+- should contain_cinder_config('DEFAULT/kombu_ssl_version').with_value('SSLv3')
++ should contain_cinder_config('DEFAULT/kombu_ssl_version').with_value('TLSv1')
+ end
+ end
+
+@@ -238,7 +238,7 @@ describe 'cinder' do
+ :kombu_ssl_ca_certs => 'undef',
+ :kombu_ssl_certfile => 'undef',
+ :kombu_ssl_keyfile => 'undef',
+- :kombu_ssl_version => 'SSLv3'
++ :kombu_ssl_version => 'TLSv1'
+ })
+ end
+
diff --git a/0015-Add-Ironic-support-into-nova-puppet-modules.patch b/0016-Add-Ironic-support-into-nova-puppet-modules.patch
similarity index 98%
rename from 0015-Add-Ironic-support-into-nova-puppet-modules.patch
rename to 0016-Add-Ironic-support-into-nova-puppet-modules.patch
index 6fef39c..51b29a5 100644
--- a/0015-Add-Ironic-support-into-nova-puppet-modules.patch
+++ b/0016-Add-Ironic-support-into-nova-puppet-modules.patch
@@ -1,4 +1,4 @@
-From feafe7f16e293307e045bda5f323315340f9cc03 Mon Sep 17 00:00:00 2001
+From 52393f27c1ca84288450eafd3312c3d499cda2ca Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise at redhat.com>
Date: Fri, 19 Dec 2014 07:45:23 -0500
Subject: [PATCH] Add Ironic support into nova puppet modules
diff --git a/0017-Fix-prefetch-refresh-for-providers.patch b/0017-Fix-prefetch-refresh-for-providers.patch
new file mode 100644
index 0000000..7577881
--- /dev/null
+++ b/0017-Fix-prefetch-refresh-for-providers.patch
@@ -0,0 +1,84 @@
+From 83c106b8e91ceb603bb1f88852c7481ac5c7c356 Mon Sep 17 00:00:00 2001
+From: Javier Pena <jpena at redhat.com>
+Date: Wed, 11 Feb 2015 11:08:07 +0100
+Subject: [PATCH] Fix prefetch refresh for providers
+
+The instance method for most providers did only gather instances
+during the first execution. After that, usage of ||= prevented it
+from gathering them again, which broke cases like creating a tenant
+and then trying to fetch that tenant's id for other usage.
+
+Change-Id: I5a9767383438549e354429632f8c1a7e569aa8fb
+---
+ keystone/lib/puppet/provider/keystone_endpoint/openstack.rb | 2 +-
+ keystone/lib/puppet/provider/keystone_role/openstack.rb | 2 +-
+ keystone/lib/puppet/provider/keystone_service/openstack.rb | 2 +-
+ keystone/lib/puppet/provider/keystone_tenant/openstack.rb | 2 +-
+ keystone/lib/puppet/provider/keystone_user/openstack.rb | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb b/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
+index fadb25f..434742e 100644
+--- a/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
++++ b/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
+@@ -108,7 +108,7 @@ Puppet::Type.type(:keystone_endpoint).provide(
+ end
+
+ def instance(name)
+- @instances ||= instances.select { |instance| instance[:name] == name }.first || {}
++ @instances = instances.select { |instance| instance[:name] == name }.first || {}
+ end
+
+ def flush
+diff --git a/keystone/lib/puppet/provider/keystone_role/openstack.rb b/keystone/lib/puppet/provider/keystone_role/openstack.rb
+index 50a2cbb..3f44fd3 100644
+--- a/keystone/lib/puppet/provider/keystone_role/openstack.rb
++++ b/keystone/lib/puppet/provider/keystone_role/openstack.rb
+@@ -46,7 +46,7 @@ Puppet::Type.type(:keystone_role).provide(
+ end
+
+ def instance(name)
+- @instances ||= instances.select { |instance| instance[:name] == name }.first || {}
++ @instances = instances.select { |instance| instance[:name] == name }.first || {}
+ end
+
+ end
+diff --git a/keystone/lib/puppet/provider/keystone_service/openstack.rb b/keystone/lib/puppet/provider/keystone_service/openstack.rb
+index e9bed96..b4be984 100644
+--- a/keystone/lib/puppet/provider/keystone_service/openstack.rb
++++ b/keystone/lib/puppet/provider/keystone_service/openstack.rb
+@@ -82,7 +82,7 @@ Puppet::Type.type(:keystone_service).provide(
+ end
+
+ def instance(name)
+- @instances ||= instances.select { |instance| instance[:name] == name }.first || {}
++ @instances = instances.select { |instance| instance[:name] == name }.first || {}
+ end
+
+ def flush
+diff --git a/keystone/lib/puppet/provider/keystone_tenant/openstack.rb b/keystone/lib/puppet/provider/keystone_tenant/openstack.rb
+index b0a6361..0ee3b55 100644
+--- a/keystone/lib/puppet/provider/keystone_tenant/openstack.rb
++++ b/keystone/lib/puppet/provider/keystone_tenant/openstack.rb
+@@ -83,7 +83,7 @@ Puppet::Type.type(:keystone_tenant).provide(
+ end
+
+ def instance(name)
+- @instances ||= instances.select { |instance| instance[:name] == name }.first || {}
++ @instances = instances.select { |instance| instance[:name] == name }.first || {}
+ end
+
+ def flush
+diff --git a/keystone/lib/puppet/provider/keystone_user/openstack.rb b/keystone/lib/puppet/provider/keystone_user/openstack.rb
+index f91b3b0..3a87f04 100644
+--- a/keystone/lib/puppet/provider/keystone_user/openstack.rb
++++ b/keystone/lib/puppet/provider/keystone_user/openstack.rb
+@@ -195,7 +195,7 @@ Puppet::Type.type(:keystone_user).provide(
+ end
+
+ def instance(name)
+- @instances ||= instances.select { |instance| instance[:name] == name }.first || {}
++ @instances = instances.select { |instance| instance[:name] == name }.first || {}
+ end
+
+ def set_project(newproject)
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 3b34cc2..5b6b842 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,7 +1,7 @@
Name: openstack-puppet-modules
-Version: 2014.2.9
-Release: 2%{?dist}
+Version: 2014.2.10
+Release: 1%{?dist}
Summary: Collection of Puppet modules for OpenStack deployment
License: ASL 2.0 and GPLv2 and GPLv3
@@ -12,21 +12,20 @@ Source0: https://github.com/redhat-openstack/openstack-puppet-modules/arc
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-keystone-Add-manage_service-feature.patch
-Patch0006: 0006-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
-Patch0007: 0007-Add-manage_service-feature.patch
-Patch0008: 0008-Fix-against-mongodb-2.6.5-from-epel.patch
-Patch0009: 0009-Fix-support-for-Fedora-Rawhide.patch
-Patch0010: 0010-Adds-filtering-for-BONDING-LACP.patch
-Patch0011: 0011-JSON-was-invalid.patch
-Patch0012: 0012-Configure-auth-via-conf-file-not-paste-file.patch
-Patch0013: 0013-Set-control_exchange-in-the-main-config-file.patch
-Patch0014: 0014-Support-Neutron.patch
-Patch0015: 0015-Add-Ironic-support-into-nova-puppet-modules.patch
-Patch0016: 0016-Fix-Ironic-modules-so-services-properly-run.patch
-Patch0017: 0017-Deprecate-support-for-Fedora-18.patch
-Patch0018: 0018-Automates-generation-of-NFS-config-file.patch
+Patch0004: 0004-keystone-Add-manage_service-feature.patch
+Patch0005: 0005-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
+Patch0006: 0006-Add-manage_service-feature.patch
+Patch0007: 0007-Fix-against-mongodb-2.6.5-from-epel.patch
+Patch0008: 0008-Fix-support-for-Fedora-Rawhide.patch
+Patch0009: 0009-Adds-filtering-for-BONDING-LACP.patch
+Patch0010: 0010-JSON-was-invalid.patch
+Patch0011: 0011-Configure-auth-via-conf-file-not-paste-file.patch
+Patch0012: 0012-Set-control_exchange-in-the-main-config-file.patch
+Patch0013: 0013-Support-Neutron.patch
+Patch0014: 0014-Makes-kombu_ssl_-parameters-optional-when-rabbit_use.patch
+Patch0015: 0015-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
+Patch0016: 0016-Add-Ironic-support-into-nova-puppet-modules.patch
+Patch0017: 0017-Fix-prefetch-refresh-for-providers.patch
BuildArch: noarch
Requires: rubygem-json
@@ -56,7 +55,6 @@ OpenStack via installers using Puppet configuration tool.
%patch0015 -p1
%patch0016 -p1
%patch0017 -p1
-%patch0018 -p1
find %{_builddir}/%{name}-%{version}/ -type f -name ".*" -exec rm {} +
find %{_builddir}/%{name}-%{version}/ -size 0 -exec rm {} +
@@ -130,6 +128,9 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Wed Feb 11 2015 Lukas Bezdicka <lbezdick at redhat.com> 2014.2.10-1
+- Update to upstream 2014.2.10
+
* Tue Jan 20 2015 Gael Chamoulaud <gchamoul at redhat.com> 2014.2.9-2
- Update to upstream 2014.2.9
diff --git a/sources b/sources
index 6abb4cc..35d2304 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0872f01b5ee0a97f8523b837cbdd4517 2014.2.9.tar.gz
+986630899afee072685a919cce836ab3 2014.2.10.tar.gz
More information about the scm-commits
mailing list