social pushed to openstack-puppet-modules (f22). "Update to upstream 2014.2.14 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 14:09:35 UTC 2015
>From 139573995287e8ef25bda9d23699465ebcf7b47c Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick at redhat.com>
Date: Thu, 2 Apr 2015 16:05:27 +0200
Subject: Update to upstream 2014.2.14
Resolves: 1207701
diff --git a/0001-horizon-Change-default-documentation-URL.patch b/0001-horizon-Change-default-documentation-URL.patch
index 5d208ee..ed19844 100644
--- a/0001-horizon-Change-default-documentation-URL.patch
+++ b/0001-horizon-Change-default-documentation-URL.patch
@@ -1,4 +1,4 @@
-From fc607e3c8bf8cdeed03f5b78fcca8e96ea9e099a Mon Sep 17 00:00:00 2001
+From 7bd7c607499cfeb4cf04d7d1440be853af3ef260 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 ff96993..3ad86a2 100644
--- a/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
+++ b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
@@ -1,4 +1,4 @@
-From fa277d8ebf2515de39bf9b66b74d2351d2b76bf3 Mon Sep 17 00:00:00 2001
+From 0eb93c4efdcb3f7e3cd82a070ab2d841955e1f41 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 320fcc9..8f27243 100644
--- a/0003-openstack-Set-default-charset-to-utf8.patch
+++ b/0003-openstack-Set-default-charset-to-utf8.patch
@@ -1,4 +1,4 @@
-From 569fc71c40b246472e3a3aff30b23dc64c55266f Mon Sep 17 00:00:00 2001
+From 219715097d077881159b9761eb0d0c29925f857b 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 e4fcb4e..a459c10 100644
--- a/0004-keystone-Add-manage_service-feature.patch
+++ b/0004-keystone-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From b3e9db018cbacb0db297d7ac22436e82197793bd Mon Sep 17 00:00:00 2001
+From f712a5c5ba746cadcd38d4f3806d9b50775fb937 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 a247524..cdc8472 100644
--- a/0005-Add-manage_service-feature.patch
+++ b/0005-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From 1eff16db78dfe8776cc7887ad5dcad7f33c2621f Mon Sep 17 00:00:00 2001
+From 966a11fef53ea38f1f22e987231d0567c5787c0b 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 4ff4e5b..8365f8e 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 c47a76ea50e1debe2a62e43eb65393c21c528f58 Mon Sep 17 00:00:00 2001
+From b0dde7c040da36b67c2f3254a6391f97e200e14e 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 73947bf..b0e06bc 100644
--- a/0007-Fix-support-for-Fedora-Rawhide.patch
+++ b/0007-Fix-support-for-Fedora-Rawhide.patch
@@ -1,4 +1,4 @@
-From 1f395570c8a94240d7fd495afbdb0bcc271a094b Mon Sep 17 00:00:00 2001
+From d848ab8b0f816ccd5c3adfbd687675f7f9d953bc 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 7d51684..9844ec0 100644
--- a/0008-Adds-filtering-for-BONDING-LACP.patch
+++ b/0008-Adds-filtering-for-BONDING-LACP.patch
@@ -1,4 +1,4 @@
-From f4c3d4b1d31b04ec6cdcc203b5de27ff15aaa5e1 Mon Sep 17 00:00:00 2001
+From 963a88564ba004dd3649a4032dff53dbdeb2af91 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 c7fc0fe..724ee6a 100644
--- a/0009-JSON-was-invalid.patch
+++ b/0009-JSON-was-invalid.patch
@@ -1,4 +1,4 @@
-From d7aebb7f16a2dda165ed6fd6c2f298bea9a5fe4a Mon Sep 17 00:00:00 2001
+From cec512442b9ee66b625ee91d7bd30b7d7f22c19e 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 c3b19dd..403cc9c 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 8a45f7eb9a2b978a9b5279b7a38fb5630a1b4ba6 Mon Sep 17 00:00:00 2001
+From 341775674f1eb451781bc46759614f053709ec2f 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 6fe8dc9..c772031 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 5ec947b90d5c625aad213875a685f41be96e3444 Mon Sep 17 00:00:00 2001
+From 3650330294a1696ce14d96710aa30301de6cb972 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
deleted file mode 100644
index fd2a1c6..0000000
--- a/0012-Create-resource-cache-upon-creation.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From f78405bb89a14ffb4aa8bbfb51ecf447857a43a8 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
-
-Currently, the keystone providers ignore the output of the create
-command even though it provides much-needed information. This is a
-problem because if during the course of the puppet run that
-information is needed again, it must make another API request for it.
-This is especially problematic with the neutron providers, which
-instead of looking up the information via the API, look it up in the
-catalog. Since a keystone resource does not specify its ID upon
-creation, it reports it as nil, causing the neutron providers to
-silently fail when they need the ID of a keystone resource.
-
-This patch corrects the problem by saving the output from the create
-command in the @instance variable so that it is known to that
-resource and can be retrieved by other resources.
-
-Alternative to https://review.openstack.org/#/c/154812/
-
-Change-Id: I2090f5f4a94a6ae21bf71ac0f1b33caaa602e0bc
-Closes-bug: 1421573
-(cherry picked from commit 9a32c026ae28b56ac29edc658832fe4691ebe44e)
----
- 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 +-
- keystone/lib/puppet/provider/openstack.rb | 2 +-
- .../spec/unit/provider/keystone_endpoint/openstack_spec.rb | 11 ++++++++++-
- keystone/spec/unit/provider/keystone_role/openstack_spec.rb | 3 ++-
- .../spec/unit/provider/keystone_service/openstack_spec.rb | 8 +++++++-
- .../spec/unit/provider/keystone_tenant/openstack_spec.rb | 6 +++++-
- keystone/spec/unit/provider/keystone_user/openstack_spec.rb | 12 ++++++++++--
- 11 files changed, 40 insertions(+), 12 deletions(-)
-
-diff --git a/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb b/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
-index fadb25f..4c1ad12 100644
---- a/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
-+++ b/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
-@@ -30,7 +30,7 @@ Puppet::Type.type(:keystone_endpoint).provide(
- properties << '--adminurl'
- properties << resource[:admin_url]
- end
-- request('endpoint', 'create', name, resource[:auth], properties)
-+ @instance = request('endpoint', 'create', name, resource[:auth], properties)
- end
-
- def exists?
-diff --git a/keystone/lib/puppet/provider/keystone_role/openstack.rb b/keystone/lib/puppet/provider/keystone_role/openstack.rb
-index 50a2cbb..106058a 100644
---- a/keystone/lib/puppet/provider/keystone_role/openstack.rb
-+++ b/keystone/lib/puppet/provider/keystone_role/openstack.rb
-@@ -9,7 +9,7 @@ Puppet::Type.type(:keystone_role).provide(
-
- def create
- properties = []
-- request('role', 'create', resource[:name], resource[:auth], properties)
-+ @instance = request('role', 'create', resource[:name], resource[:auth], properties)
- end
-
- def exists?
-diff --git a/keystone/lib/puppet/provider/keystone_service/openstack.rb b/keystone/lib/puppet/provider/keystone_service/openstack.rb
-index e9bed96..92e002d 100644
---- a/keystone/lib/puppet/provider/keystone_service/openstack.rb
-+++ b/keystone/lib/puppet/provider/keystone_service/openstack.rb
-@@ -22,7 +22,7 @@ Puppet::Type.type(:keystone_service).provide(
- properties << '--type'
- properties << resource[:type]
- end
-- request('service', 'create', resource[:name], resource[:auth], properties)
-+ @instance = request('service', 'create', resource[:name], resource[:auth], properties)
- end
-
- def exists?
-diff --git a/keystone/lib/puppet/provider/keystone_tenant/openstack.rb b/keystone/lib/puppet/provider/keystone_tenant/openstack.rb
-index b0a6361..7e330f8 100644
---- a/keystone/lib/puppet/provider/keystone_tenant/openstack.rb
-+++ b/keystone/lib/puppet/provider/keystone_tenant/openstack.rb
-@@ -23,7 +23,7 @@ Puppet::Type.type(:keystone_tenant).provide(
- properties << '--description'
- properties << resource[:description]
- end
-- request('project', 'create', resource[:name], resource[:auth], properties)
-+ @instance = request('project', 'create', resource[:name], resource[:auth], properties)
- end
-
- def exists?
-diff --git a/keystone/lib/puppet/provider/keystone_user/openstack.rb b/keystone/lib/puppet/provider/keystone_user/openstack.rb
-index f91b3b0..1b5af76 100644
---- a/keystone/lib/puppet/provider/keystone_user/openstack.rb
-+++ b/keystone/lib/puppet/provider/keystone_user/openstack.rb
-@@ -32,7 +32,7 @@ Puppet::Type.type(:keystone_user).provide(
- properties << '--email'
- properties << resource[:email]
- end
-- request('user', 'create', resource[:name], resource[:auth], properties)
-+ @instance = request('user', 'create', resource[:name], resource[:auth], properties)
- end
-
- def exists?
-diff --git a/keystone/lib/puppet/provider/openstack.rb b/keystone/lib/puppet/provider/openstack.rb
-index d1cc3e0..7d960e7 100644
---- a/keystone/lib/puppet/provider/openstack.rb
-+++ b/keystone/lib/puppet/provider/openstack.rb
-@@ -62,7 +62,7 @@ class Puppet::Provider::Openstack < Puppet::Provider
- end
- hash
- end
-- elsif(action == 'show')
-+ elsif(action == 'show' || action == 'create')
- rv = {}
- # shell output is name="value"\nid="value2"\ndescription="value3" etc.
- openstack(service, action, '--format', 'shell', args).split("\n").each do |line|
-diff --git a/keystone/spec/unit/provider/keystone_endpoint/openstack_spec.rb b/keystone/spec/unit/provider/keystone_endpoint/openstack_spec.rb
-index 7113458..a0ac752 100644
---- a/keystone/spec/unit/provider/keystone_endpoint/openstack_spec.rb
-+++ b/keystone/spec/unit/provider/keystone_endpoint/openstack_spec.rb
-@@ -40,7 +40,16 @@ describe provider_class do
- "1cb05cfed7c24279be884ba4f6520262","foo","bar","","http://127.0.0.1:5000/v2.0","http://127.0.0.1:5001/v2.0","http://127.0.0.1:5002/v2.0"
- ')
- provider.class.stubs(:openstack)
-- .with('endpoint', 'create', [['bar', '--region', 'foo', '--publicurl', 'http://127.0.0.1:5000/v2.0', '--internalurl', 'http://127.0.0.1:5001/v2.0', '--adminurl', 'http://127.0.0.1:5002/v2.0', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .with('endpoint', 'create', '--format', 'shell', [['bar', '--region', 'foo', '--publicurl', 'http://127.0.0.1:5000/v2.0', '--internalurl', 'http://127.0.0.1:5001/v2.0', '--adminurl', 'http://127.0.0.1:5002/v2.0', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .returns('adminurl="http://127.0.0.1:5002/v2.0"
-+id="3a5c4378981e4112a0d44902a43e16ef"
-+internalurl="http://127.0.0.1:5001/v2.0"
-+publicurl="http://127.0.0.1:5000/v2.0"
-+region="foo"
-+service_id="8137d72980fd462192f276585a002426"
-+service_name="bar"
-+service_type="test"
-+')
- provider.create
- expect(provider.exists?).to be_truthy
- end
-diff --git a/keystone/spec/unit/provider/keystone_role/openstack_spec.rb b/keystone/spec/unit/provider/keystone_role/openstack_spec.rb
-index effbabe..179574f 100644
---- a/keystone/spec/unit/provider/keystone_role/openstack_spec.rb
-+++ b/keystone/spec/unit/provider/keystone_role/openstack_spec.rb
-@@ -37,7 +37,8 @@ describe provider_class do
- "1cb05cfed7c24279be884ba4f6520262","foo"
- ')
- provider.class.stubs(:openstack)
-- .with('role', 'create', [['foo', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .with('role', 'create', '--format', 'shell', [['foo', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .returns('name="foo"')
- provider.create
- expect(provider.exists?).to be_truthy
- end
-diff --git a/keystone/spec/unit/provider/keystone_service/openstack_spec.rb b/keystone/spec/unit/provider/keystone_service/openstack_spec.rb
-index d7110d2..5b9814f 100644
---- a/keystone/spec/unit/provider/keystone_service/openstack_spec.rb
-+++ b/keystone/spec/unit/provider/keystone_service/openstack_spec.rb
-@@ -39,7 +39,13 @@ describe provider_class do
- "1cb05cfed7c24279be884ba4f6520262","foo","foo","foo"
- ')
- provider.class.stubs(:openstack)
-- .with('service', 'create', [['foo', '--description', 'foo', '--type', 'foo', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .with('service', 'create', '--format', 'shell', [['foo', '--description', 'foo', '--type', 'foo', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .returns('description="foo"
-+enabled="True"
-+id="8f0dd4c0abc44240998fbb3f5089ecbf"
-+name="foo"
-+type="foo"
-+')
- provider.create
- expect(provider.exists?).to be_truthy
- end
-diff --git a/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb b/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
-index e65b970..11861fc 100644
---- a/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
-+++ b/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
-@@ -39,7 +39,11 @@ describe provider_class do
- "1cb05cfed7c24279be884ba4f6520262","foo","foo",True
- ')
- provider.class.stubs(:openstack)
-- .with('project', 'create', [['foo', '--enable', '--description', 'foo', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .with('project', 'create', '--format', 'shell', [['foo', '--enable', '--description', 'foo', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .returns('description="foo"
-+enabled="True"
-+name="foo"
-+')
- provider.create
- expect(provider.exists?).to be_truthy
- end
-diff --git a/keystone/spec/unit/provider/keystone_user/openstack_spec.rb b/keystone/spec/unit/provider/keystone_user/openstack_spec.rb
-index c7f832b..447187c 100644
---- a/keystone/spec/unit/provider/keystone_user/openstack_spec.rb
-+++ b/keystone/spec/unit/provider/keystone_user/openstack_spec.rb
-@@ -41,7 +41,14 @@ describe provider_class do
- "1cb05cfed7c24279be884ba4f6520262","foo","foo","foo at example.com",True
- ')
- provider.class.stubs(:openstack)
-- .with('user', 'create', [['foo', '--enable', '--password', 'foo', '--project', 'foo', '--email', 'foo at example.com', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .with('user', 'create', '--format', 'shell', [['foo', '--enable', '--password', 'foo', '--project', 'foo', '--email', 'foo at example.com', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .returns('email="foo at example.com"
-+enabled="True"
-+id="12b23f07d4a3448d8189521ab09610b0"
-+name="foo"
-+project_id="5e2001b2248540f191ff22627dc0c2d7"
-+username="foo"
-+')
- provider.create
- expect(provider.exists?).to be_truthy
- end
-@@ -162,7 +169,8 @@ describe provider_class do
- .with('role', 'show', '--format', 'shell', [['_member_', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
- .raises(Puppet::ExecutionFailure, 'no such role _member_')
- provider.class.expects(:openstack)
-- .with('role', 'create', [['_member_', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .with('role', 'create', '--format', 'shell', [['_member_', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-+ .returns('name="_member_"')
- provider.class.expects(:openstack)
- .with('role', 'add', [['_member_', '--project', 'bar', '--user', 'foo', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
- provider.tenant=('bar')
diff --git a/0012-Fix-rabbitmq-support.patch b/0012-Fix-rabbitmq-support.patch
new file mode 100644
index 0000000..b363512
--- /dev/null
+++ b/0012-Fix-rabbitmq-support.patch
@@ -0,0 +1,308 @@
+From 1055239987472da2974fa5f6989cee09853faafb 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
+
+Ironic was missing SSL and amqp_durable_queues for
+rabbitmq.
+
+Change-Id: Iadc7ac8481d52d7764345d50b5d3ffd9bc31999f
+---
+ ironic/manifests/init.pp | 112 ++++++++++++++++++++++++++++----
+ ironic/spec/classes/ironic_init_spec.rb | 84 ++++++++++++++++++++++--
+ 2 files changed, 179 insertions(+), 17 deletions(-)
+
+diff --git a/ironic/manifests/init.pp b/ironic/manifests/init.pp
+index 90cbe22..2df9f81 100644
+--- a/ironic/manifests/init.pp
++++ b/ironic/manifests/init.pp
+@@ -44,15 +44,62 @@
+ # [*control_exchange*]
+ # (optional) What RPC queue/exchange to use
+ # Defaults to openstack
+-
++#
+ # [*rpc_backend*]
+ # (optional) what rpc/queuing service to use
+ # Defaults to impl_kombu (rabbitmq)
+ #
+-# [*rabbit_password*]
+ # [*rabbit_host*]
++# (Optional) IP or hostname of the rabbit server.
++# Defaults to 'localhost'
++#
+ # [*rabbit_port*]
+-# [*rabbit_user*]
++# (Optional) Port of the rabbit server.
++# Defaults to 5672.
++#
++# [*rabbit_hosts*]
++# (Optional) Array of host:port (used with HA queues).
++# If defined, will remove rabbit_host & rabbit_port parameters from config
++# Defaults to undef.
++#
++# [*rabbit_userid*]
++# (Optional) User to connect to the rabbit server.
++# Defaults to 'guest'
++#
++# [*rabbit_password*]
++# (Optional) Password to connect to the rabbit_server.
++# Defaults to empty.
++#
++# [*rabbit_virtual_host*]
++# (Optional) Virtual_host to use.
++# Defaults to '/'
++#
++# [*rabbit_use_ssl*]
++# (optional) Connect over SSL for RabbitMQ
++# Defaults to false
++#
++# [*kombu_ssl_ca_certs*]
++# (optional) SSL certification authority file (valid only if SSL enabled).
++# Defaults to undef
++#
++# [*kombu_ssl_certfile*]
++# (optional) SSL cert file (valid only if SSL enabled).
++# Defaults to undef
++#
++# [*kombu_ssl_keyfile*]
++# (optional) SSL key file (valid only if SSL enabled).
++# Defaults to undef
++#
++# [*kombu_ssl_version*]
++# (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 'TLSv1'
++#
++# [*amqp_durable_queues*]
++# Use durable queues in amqp.
++# (Optional) Defaults to false.
++#
+ # [*rabbit_virtual_host*]
+ # (optional) Various rabbitmq settings
+ #
+@@ -123,12 +170,20 @@ class ironic (
+ $auth_strategy = 'keystone',
+ $control_exchange = 'openstack',
+ $rpc_backend = 'ironic.openstack.common.rpc.impl_kombu',
+- $rabbit_password = false,
++ $rabbit_hosts = false,
++ $rabbit_virtual_host = '/',
+ $rabbit_host = 'localhost',
++ $rabbit_port = 5672,
+ $rabbit_hosts = false,
+- $rabbit_port = '5672',
+- $rabbit_user = 'guest',
+ $rabbit_virtual_host = '/',
++ $rabbit_userid = 'guest',
++ $rabbit_password = false,
++ $rabbit_use_ssl = false,
++ $kombu_ssl_ca_certs = undef,
++ $kombu_ssl_certfile = undef,
++ $kombu_ssl_keyfile = undef,
++ $kombu_ssl_version = 'TLSv1',
++ $amqp_durable_queues = false,
+ $qpid_hostname = 'localhost',
+ $qpid_port = '5672',
+ $qpid_username = 'guest',
+@@ -219,7 +274,6 @@ class ironic (
+ 'DEFAULT/verbose': value => $verbose;
+ 'DEFAULT/debug': value => $debug;
+ 'DEFAULT/auth_strategy': value => $auth_strategy;
+- 'DEFAULT/control_exchange': value => $control_exchange;
+ 'DEFAULT/rpc_backend': value => $rpc_backend;
+ 'database/connection': value => $database_connection, secret => true;
+ 'database/idle_timeout': value => $database_idle_timeout;
+@@ -240,12 +294,25 @@ class ironic (
+ }
+
+ if $rpc_backend == 'ironic.openstack.common.rpc.impl_kombu' {
++
+ if ! $rabbit_password {
+ fail('When rpc_backend is rabbitmq, you must set rabbit password')
+ }
++
++ ironic_config {
++ 'DEFAULT/rabbit_userid': value => $rabbit_userid;
++ 'DEFAULT/rabbit_password': value => $rabbit_password, secret => true;
++ 'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
++ 'DEFAULT/rabbit_use_ssl': value => $rabbit_use_ssl;
++ 'DEFAULT/control_exchange': value => $control_exchange;
++ 'DEFAULT/amqp_durable_queues': value => $amqp_durable_queues;
++ }
++
+ if $rabbit_hosts {
+ ironic_config { 'DEFAULT/rabbit_hosts': value => join($rabbit_hosts, ',') }
+ ironic_config { 'DEFAULT/rabbit_ha_queues': value => true }
++ ironic_config { 'DEFAULT/rabbit_host': ensure => absent }
++ ironic_config { 'DEFAULT/rabbit_port': ensure => absent }
+ } else {
+ ironic_config { 'DEFAULT/rabbit_host': value => $rabbit_host }
+ ironic_config { 'DEFAULT/rabbit_port': value => $rabbit_port }
+@@ -253,10 +320,33 @@ class ironic (
+ ironic_config { 'DEFAULT/rabbit_ha_queues': value => false }
+ }
+
+- ironic_config {
+- 'DEFAULT/rabbit_userid': value => $rabbit_user;
+- 'DEFAULT/rabbit_password': value => $rabbit_password, secret => true;
+- 'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
++ if $rabbit_use_ssl {
++ ironic_config { 'DEFAULT/kombu_ssl_version': value => $kombu_ssl_version }
++
++ if $kombu_ssl_ca_certs {
++ ironic_config { 'DEFAULT/kombu_ssl_ca_certs': value => $kombu_ssl_ca_certs }
++ } else {
++ ironic_config { 'DEFAULT/kombu_ssl_ca_certs': ensure => absent}
++ }
++
++ if $kombu_ssl_certfile {
++ ironic_config { 'DEFAULT/kombu_ssl_certfile': value => $kombu_ssl_certfile }
++ } else {
++ ironic_config { 'DEFAULT/kombu_ssl_certfile': ensure => absent}
++ }
++
++ if $kombu_ssl_keyfile {
++ ironic_config { 'DEFAULT/kombu_ssl_keyfile': value => $kombu_ssl_keyfile }
++ } else {
++ ironic_config { 'DEFAULT/kombu_ssl_keyfile': ensure => absent}
++ }
++ } else {
++ ironic_config {
++ '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;
++ }
+ }
+ }
+
+diff --git a/ironic/spec/classes/ironic_init_spec.rb b/ironic/spec/classes/ironic_init_spec.rb
+index 5c2f6ee..4aeea8f 100644
+--- a/ironic/spec/classes/ironic_init_spec.rb
++++ b/ironic/spec/classes/ironic_init_spec.rb
+@@ -29,7 +29,7 @@ describe 'ironic' do
+ :rabbit_host => '127.0.0.1',
+ :rabbit_port => 5672,
+ :rabbit_hosts => false,
+- :rabbit_user => 'guest',
++ :rabbit_userid => 'guest',
+ :rabbit_password => 'guest',
+ :rabbit_virtual_host => '/',
+ :database_connection => 'sqlite:////var/lib/ironic/ironic.sqlite',
+@@ -46,6 +46,9 @@ describe 'ironic' do
+
+ context 'and if rabbit_host parameter is provided' do
+ it_configures 'a ironic base installation'
++ it_configures 'with SSL disabled'
++ it_configures 'with SSL enabled without kombu'
++ it_configures 'with SSL enabled with kombu'
+ end
+
+ context 'and if rabbit_hosts parameter is provided' do
+@@ -123,7 +126,7 @@ describe 'ironic' do
+ end
+
+ it 'configures credentials for rabbit' do
+- should contain_ironic_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_user] )
++ should contain_ironic_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] )
+ should contain_ironic_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] )
+ should contain_ironic_config('DEFAULT/rabbit_virtual_host').with_value( params[:rabbit_virtual_host] )
+ should contain_ironic_config('DEFAULT/rabbit_password').with_secret( true )
+@@ -150,8 +153,8 @@ describe 'ironic' do
+
+ shared_examples_for 'rabbit HA with a single virtual host' do
+ it 'in ironic.conf' do
+- should_not contain_ironic_config('DEFAULT/rabbit_host')
+- should_not contain_ironic_config('DEFAULT/rabbit_port')
++ should contain_ironic_config('DEFAULT/rabbit_host').with_ensure('absent')
++ should contain_ironic_config('DEFAULT/rabbit_port').with_ensure('absent')
+ should contain_ironic_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts] )
+ should contain_ironic_config('DEFAULT/rabbit_ha_queues').with_value(true)
+ end
+@@ -159,13 +162,82 @@ describe 'ironic' do
+
+ shared_examples_for 'rabbit HA with multiple hosts' do
+ it 'in ironic.conf' do
+- should_not contain_ironic_config('DEFAULT/rabbit_host')
+- should_not contain_ironic_config('DEFAULT/rabbit_port')
++ should contain_ironic_config('DEFAULT/rabbit_host').with_ensure('absent')
++ should contain_ironic_config('DEFAULT/rabbit_port').with_ensure('absent')
+ should contain_ironic_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') )
+ should contain_ironic_config('DEFAULT/rabbit_ha_queues').with_value(true)
+ end
+ end
+
++ shared_examples_for 'with SSL enabled with kombu' do
++ before do
++ params.merge!(
++ :rabbit_use_ssl => true,
++ :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 => 'TLSv1'
++ )
++ end
++
++ it do
++ should contain_ironic_config('DEFAULT/rabbit_use_ssl').with_value('true')
++ should contain_ironic_config('DEFAULT/kombu_ssl_ca_certs').with_value('/path/to/ssl/ca/certs')
++ should contain_ironic_config('DEFAULT/kombu_ssl_certfile').with_value('/path/to/ssl/cert/file')
++ should contain_ironic_config('DEFAULT/kombu_ssl_keyfile').with_value('/path/to/ssl/keyfile')
++ should contain_ironic_config('DEFAULT/kombu_ssl_version').with_value('TLSv1')
++ end
++ end
++
++ shared_examples_for 'with SSL enabled without kombu' do
++ before do
++ params.merge!(
++ :rabbit_use_ssl => true,
++ )
++ end
++
++ it do
++ should contain_ironic_config('DEFAULT/rabbit_use_ssl').with_value('true')
++ should contain_ironic_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent')
++ should contain_ironic_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent')
++ should contain_ironic_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent')
++ should contain_ironic_config('DEFAULT/kombu_ssl_version').with_value('TLSv1')
++ end
++ end
++
++ shared_examples_for 'with SSL disabled' do
++ before do
++ params.merge!(
++ :rabbit_use_ssl => false,
++ :kombu_ssl_ca_certs => 'undef',
++ :kombu_ssl_certfile => 'undef',
++ :kombu_ssl_keyfile => 'undef',
++ :kombu_ssl_version => 'TLSv1'
++ )
++ end
++
++ it do
++ should contain_ironic_config('DEFAULT/rabbit_use_ssl').with_value('false')
++ should contain_ironic_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent')
++ should contain_ironic_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent')
++ should contain_ironic_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent')
++ should contain_ironic_config('DEFAULT/kombu_ssl_version').with_ensure('absent')
++ end
++ end
++
++
++ shared_examples_for 'with amqp_durable_queues disabled' do
++ it { should contain_ironic_config('DEFAULT/amqp_durable_queues').with_value(false) }
++ end
++
++ shared_examples_for 'with amqp_durable_queues enabled' do
++ before do
++ params.merge( :amqp_durable_queues => true )
++ end
++
++ it { should contain_ironic_config('DEFAULT/amqp_durable_queues').with_value(true) }
++ end
++
+ shared_examples_for 'with syslog disabled' do
+ it { should contain_ironic_config('DEFAULT/use_syslog').with_value(false) }
+ end
diff --git a/0013-Changing-the-default-value-of-fastpath_flood-to-enab.patch b/0013-Changing-the-default-value-of-fastpath_flood-to-enab.patch
new file mode 100644
index 0000000..93899c0
--- /dev/null
+++ b/0013-Changing-the-default-value-of-fastpath_flood-to-enab.patch
@@ -0,0 +1,79 @@
+From db640aca13015c3c2f28d71602a0f915ae31e7bf 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
+
+Current default value of fastpath_flood in nexus1000v is set to disable.
+Cisco1000v handles broadcast floods and unknown pkts in fastpath(KLM) by default.
+Thus this variable need to be set to enale as the default.
+
+Change-Id: If18ba553b70a896f0d9e38113831445bf3a08cbe
+Closes-Bug: 1425589
+(cherry picked from commit c90b465001b82005f656cc8af08e87111c884089)
+---
+ neutron/manifests/agents/n1kv_vem.pp | 4 ++--
+ neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/neutron/manifests/agents/n1kv_vem.pp b/neutron/manifests/agents/n1kv_vem.pp
+index dc740c0..6366b41 100644
+--- a/neutron/manifests/agents/n1kv_vem.pp
++++ b/neutron/manifests/agents/n1kv_vem.pp
+@@ -97,7 +97,7 @@
+ #
+ # [*fastpath_flood*]
+ # (optional) Handle broadcast floods and unknown pkts in fastpath(KLM)
+-# Defaults to disable
++# Defaults to enable
+ #
+ class neutron::agents::n1kv_vem (
+ $n1kv_vsm_ip = '127.0.0.1',
+@@ -113,7 +113,7 @@ class neutron::agents::n1kv_vem (
+ $enable = true,
+ $manage_service = true,
+ $portdb = 'ovs',
+- $fastpath_flood = 'disable'
++ $fastpath_flood = 'enable'
+ ) {
+
+ include neutron::params
+diff --git a/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
+index 4eeee17..68863ef 100644
+--- a/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
++++ b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
+@@ -68,7 +68,7 @@ describe 'neutron::agents::n1kv_vem' do
+ :n1kv_vsm_domain_id => 900,
+ :host_mgmt_intf => 'eth9',
+ :portdb => 'ovs',
+- :fastpath_flood => 'disable'
++ :fastpath_flood => 'enable'
+ }
+ end
+ it do
+@@ -87,7 +87,7 @@ describe 'neutron::agents::n1kv_vem' do
+ should contain_file('/etc/n1kv/n1kv.conf') \
+ .with_content(/^node-type compute/)
+ should contain_file('/etc/n1kv/n1kv.conf') \
+- .with_content(/^fastpath-flood disable/)
++ .with_content(/^fastpath-flood enable/)
+ end
+ end
+
+@@ -122,14 +122,14 @@ describe 'neutron::agents::n1kv_vem' do
+ context 'verify fastpath_flood' do
+ let :params do
+ {
+- :fastpath_flood => 'enable',
++ :fastpath_flood => 'disable',
+ }
+ end
+ it do
+ should contain_file('/etc/n1kv/n1kv.conf') \
+- .with_content(/^fastpath-flood enable/)
++ .with_content(/^fastpath-flood disable/)
+ should contain_file('/etc/n1kv/n1kv.conf') \
+- .without_content(/^fastpath-flood disable/)
++ .without_content(/^fastpath-flood enable/)
+ end
+ end
+
diff --git a/0013-Fix-rabbitmq-support.patch b/0013-Fix-rabbitmq-support.patch
deleted file mode 100644
index a9c606f..0000000
--- a/0013-Fix-rabbitmq-support.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-From c0e6736030560a150e55c0da385af0af93cb5156 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
-
-Ironic was missing SSL and amqp_durable_queues for
-rabbitmq.
-
-Change-Id: Iadc7ac8481d52d7764345d50b5d3ffd9bc31999f
----
- ironic/manifests/init.pp | 112 ++++++++++++++++++++++++++++----
- ironic/spec/classes/ironic_init_spec.rb | 84 ++++++++++++++++++++++--
- 2 files changed, 179 insertions(+), 17 deletions(-)
-
-diff --git a/ironic/manifests/init.pp b/ironic/manifests/init.pp
-index 90cbe22..2df9f81 100644
---- a/ironic/manifests/init.pp
-+++ b/ironic/manifests/init.pp
-@@ -44,15 +44,62 @@
- # [*control_exchange*]
- # (optional) What RPC queue/exchange to use
- # Defaults to openstack
--
-+#
- # [*rpc_backend*]
- # (optional) what rpc/queuing service to use
- # Defaults to impl_kombu (rabbitmq)
- #
--# [*rabbit_password*]
- # [*rabbit_host*]
-+# (Optional) IP or hostname of the rabbit server.
-+# Defaults to 'localhost'
-+#
- # [*rabbit_port*]
--# [*rabbit_user*]
-+# (Optional) Port of the rabbit server.
-+# Defaults to 5672.
-+#
-+# [*rabbit_hosts*]
-+# (Optional) Array of host:port (used with HA queues).
-+# If defined, will remove rabbit_host & rabbit_port parameters from config
-+# Defaults to undef.
-+#
-+# [*rabbit_userid*]
-+# (Optional) User to connect to the rabbit server.
-+# Defaults to 'guest'
-+#
-+# [*rabbit_password*]
-+# (Optional) Password to connect to the rabbit_server.
-+# Defaults to empty.
-+#
-+# [*rabbit_virtual_host*]
-+# (Optional) Virtual_host to use.
-+# Defaults to '/'
-+#
-+# [*rabbit_use_ssl*]
-+# (optional) Connect over SSL for RabbitMQ
-+# Defaults to false
-+#
-+# [*kombu_ssl_ca_certs*]
-+# (optional) SSL certification authority file (valid only if SSL enabled).
-+# Defaults to undef
-+#
-+# [*kombu_ssl_certfile*]
-+# (optional) SSL cert file (valid only if SSL enabled).
-+# Defaults to undef
-+#
-+# [*kombu_ssl_keyfile*]
-+# (optional) SSL key file (valid only if SSL enabled).
-+# Defaults to undef
-+#
-+# [*kombu_ssl_version*]
-+# (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 'TLSv1'
-+#
-+# [*amqp_durable_queues*]
-+# Use durable queues in amqp.
-+# (Optional) Defaults to false.
-+#
- # [*rabbit_virtual_host*]
- # (optional) Various rabbitmq settings
- #
-@@ -123,12 +170,20 @@ class ironic (
- $auth_strategy = 'keystone',
- $control_exchange = 'openstack',
- $rpc_backend = 'ironic.openstack.common.rpc.impl_kombu',
-- $rabbit_password = false,
-+ $rabbit_hosts = false,
-+ $rabbit_virtual_host = '/',
- $rabbit_host = 'localhost',
-+ $rabbit_port = 5672,
- $rabbit_hosts = false,
-- $rabbit_port = '5672',
-- $rabbit_user = 'guest',
- $rabbit_virtual_host = '/',
-+ $rabbit_userid = 'guest',
-+ $rabbit_password = false,
-+ $rabbit_use_ssl = false,
-+ $kombu_ssl_ca_certs = undef,
-+ $kombu_ssl_certfile = undef,
-+ $kombu_ssl_keyfile = undef,
-+ $kombu_ssl_version = 'TLSv1',
-+ $amqp_durable_queues = false,
- $qpid_hostname = 'localhost',
- $qpid_port = '5672',
- $qpid_username = 'guest',
-@@ -219,7 +274,6 @@ class ironic (
- 'DEFAULT/verbose': value => $verbose;
- 'DEFAULT/debug': value => $debug;
- 'DEFAULT/auth_strategy': value => $auth_strategy;
-- 'DEFAULT/control_exchange': value => $control_exchange;
- 'DEFAULT/rpc_backend': value => $rpc_backend;
- 'database/connection': value => $database_connection, secret => true;
- 'database/idle_timeout': value => $database_idle_timeout;
-@@ -240,12 +294,25 @@ class ironic (
- }
-
- if $rpc_backend == 'ironic.openstack.common.rpc.impl_kombu' {
-+
- if ! $rabbit_password {
- fail('When rpc_backend is rabbitmq, you must set rabbit password')
- }
-+
-+ ironic_config {
-+ 'DEFAULT/rabbit_userid': value => $rabbit_userid;
-+ 'DEFAULT/rabbit_password': value => $rabbit_password, secret => true;
-+ 'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
-+ 'DEFAULT/rabbit_use_ssl': value => $rabbit_use_ssl;
-+ 'DEFAULT/control_exchange': value => $control_exchange;
-+ 'DEFAULT/amqp_durable_queues': value => $amqp_durable_queues;
-+ }
-+
- if $rabbit_hosts {
- ironic_config { 'DEFAULT/rabbit_hosts': value => join($rabbit_hosts, ',') }
- ironic_config { 'DEFAULT/rabbit_ha_queues': value => true }
-+ ironic_config { 'DEFAULT/rabbit_host': ensure => absent }
-+ ironic_config { 'DEFAULT/rabbit_port': ensure => absent }
- } else {
- ironic_config { 'DEFAULT/rabbit_host': value => $rabbit_host }
- ironic_config { 'DEFAULT/rabbit_port': value => $rabbit_port }
-@@ -253,10 +320,33 @@ class ironic (
- ironic_config { 'DEFAULT/rabbit_ha_queues': value => false }
- }
-
-- ironic_config {
-- 'DEFAULT/rabbit_userid': value => $rabbit_user;
-- 'DEFAULT/rabbit_password': value => $rabbit_password, secret => true;
-- 'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
-+ if $rabbit_use_ssl {
-+ ironic_config { 'DEFAULT/kombu_ssl_version': value => $kombu_ssl_version }
-+
-+ if $kombu_ssl_ca_certs {
-+ ironic_config { 'DEFAULT/kombu_ssl_ca_certs': value => $kombu_ssl_ca_certs }
-+ } else {
-+ ironic_config { 'DEFAULT/kombu_ssl_ca_certs': ensure => absent}
-+ }
-+
-+ if $kombu_ssl_certfile {
-+ ironic_config { 'DEFAULT/kombu_ssl_certfile': value => $kombu_ssl_certfile }
-+ } else {
-+ ironic_config { 'DEFAULT/kombu_ssl_certfile': ensure => absent}
-+ }
-+
-+ if $kombu_ssl_keyfile {
-+ ironic_config { 'DEFAULT/kombu_ssl_keyfile': value => $kombu_ssl_keyfile }
-+ } else {
-+ ironic_config { 'DEFAULT/kombu_ssl_keyfile': ensure => absent}
-+ }
-+ } else {
-+ ironic_config {
-+ '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;
-+ }
- }
- }
-
-diff --git a/ironic/spec/classes/ironic_init_spec.rb b/ironic/spec/classes/ironic_init_spec.rb
-index 5c2f6ee..4aeea8f 100644
---- a/ironic/spec/classes/ironic_init_spec.rb
-+++ b/ironic/spec/classes/ironic_init_spec.rb
-@@ -29,7 +29,7 @@ describe 'ironic' do
- :rabbit_host => '127.0.0.1',
- :rabbit_port => 5672,
- :rabbit_hosts => false,
-- :rabbit_user => 'guest',
-+ :rabbit_userid => 'guest',
- :rabbit_password => 'guest',
- :rabbit_virtual_host => '/',
- :database_connection => 'sqlite:////var/lib/ironic/ironic.sqlite',
-@@ -46,6 +46,9 @@ describe 'ironic' do
-
- context 'and if rabbit_host parameter is provided' do
- it_configures 'a ironic base installation'
-+ it_configures 'with SSL disabled'
-+ it_configures 'with SSL enabled without kombu'
-+ it_configures 'with SSL enabled with kombu'
- end
-
- context 'and if rabbit_hosts parameter is provided' do
-@@ -123,7 +126,7 @@ describe 'ironic' do
- end
-
- it 'configures credentials for rabbit' do
-- should contain_ironic_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_user] )
-+ should contain_ironic_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] )
- should contain_ironic_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] )
- should contain_ironic_config('DEFAULT/rabbit_virtual_host').with_value( params[:rabbit_virtual_host] )
- should contain_ironic_config('DEFAULT/rabbit_password').with_secret( true )
-@@ -150,8 +153,8 @@ describe 'ironic' do
-
- shared_examples_for 'rabbit HA with a single virtual host' do
- it 'in ironic.conf' do
-- should_not contain_ironic_config('DEFAULT/rabbit_host')
-- should_not contain_ironic_config('DEFAULT/rabbit_port')
-+ should contain_ironic_config('DEFAULT/rabbit_host').with_ensure('absent')
-+ should contain_ironic_config('DEFAULT/rabbit_port').with_ensure('absent')
- should contain_ironic_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts] )
- should contain_ironic_config('DEFAULT/rabbit_ha_queues').with_value(true)
- end
-@@ -159,13 +162,82 @@ describe 'ironic' do
-
- shared_examples_for 'rabbit HA with multiple hosts' do
- it 'in ironic.conf' do
-- should_not contain_ironic_config('DEFAULT/rabbit_host')
-- should_not contain_ironic_config('DEFAULT/rabbit_port')
-+ should contain_ironic_config('DEFAULT/rabbit_host').with_ensure('absent')
-+ should contain_ironic_config('DEFAULT/rabbit_port').with_ensure('absent')
- should contain_ironic_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') )
- should contain_ironic_config('DEFAULT/rabbit_ha_queues').with_value(true)
- end
- end
-
-+ shared_examples_for 'with SSL enabled with kombu' do
-+ before do
-+ params.merge!(
-+ :rabbit_use_ssl => true,
-+ :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 => 'TLSv1'
-+ )
-+ end
-+
-+ it do
-+ should contain_ironic_config('DEFAULT/rabbit_use_ssl').with_value('true')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_ca_certs').with_value('/path/to/ssl/ca/certs')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_certfile').with_value('/path/to/ssl/cert/file')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_keyfile').with_value('/path/to/ssl/keyfile')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_version').with_value('TLSv1')
-+ end
-+ end
-+
-+ shared_examples_for 'with SSL enabled without kombu' do
-+ before do
-+ params.merge!(
-+ :rabbit_use_ssl => true,
-+ )
-+ end
-+
-+ it do
-+ should contain_ironic_config('DEFAULT/rabbit_use_ssl').with_value('true')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_version').with_value('TLSv1')
-+ end
-+ end
-+
-+ shared_examples_for 'with SSL disabled' do
-+ before do
-+ params.merge!(
-+ :rabbit_use_ssl => false,
-+ :kombu_ssl_ca_certs => 'undef',
-+ :kombu_ssl_certfile => 'undef',
-+ :kombu_ssl_keyfile => 'undef',
-+ :kombu_ssl_version => 'TLSv1'
-+ )
-+ end
-+
-+ it do
-+ should contain_ironic_config('DEFAULT/rabbit_use_ssl').with_value('false')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent')
-+ should contain_ironic_config('DEFAULT/kombu_ssl_version').with_ensure('absent')
-+ end
-+ end
-+
-+
-+ shared_examples_for 'with amqp_durable_queues disabled' do
-+ it { should contain_ironic_config('DEFAULT/amqp_durable_queues').with_value(false) }
-+ end
-+
-+ shared_examples_for 'with amqp_durable_queues enabled' do
-+ before do
-+ params.merge( :amqp_durable_queues => true )
-+ end
-+
-+ it { should contain_ironic_config('DEFAULT/amqp_durable_queues').with_value(true) }
-+ end
-+
- shared_examples_for 'with syslog disabled' do
- it { should contain_ironic_config('DEFAULT/use_syslog').with_value(false) }
- end
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
deleted file mode 100644
index 18859e6..0000000
--- a/0014-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 742b418af7c6cb5fc85c8d63a7428c63d853c233 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
- 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: Ifa6b377ef2c6f25ad11c1f4809a770a031534962
-(cherry picked from commit 39006b77e2957aef818f2adaffe0392773ee99e2)
----
- nova/manifests/init.pp | 4 ++--
- nova/spec/classes/nova_init_spec.rb | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/nova/manifests/init.pp b/nova/manifests/init.pp
-index 6cbf4c7..40c8c79 100644
---- a/nova/manifests/init.pp
-+++ b/nova/manifests/init.pp
-@@ -91,7 +91,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*]
- # (optional) Define queues as "durable" to rabbitmq.
-@@ -286,7 +286,7 @@ class nova(
- $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/nova/spec/classes/nova_init_spec.rb b/nova/spec/classes/nova_init_spec.rb
-index 05f345f..ce69ed5 100644
---- a/nova/spec/classes/nova_init_spec.rb
-+++ b/nova/spec/classes/nova_init_spec.rb
-@@ -351,7 +351,7 @@ describe 'nova' do
- should contain_nova_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent')
- should contain_nova_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent')
- should contain_nova_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent')
-- should contain_nova_config('DEFAULT/kombu_ssl_version').with_value('SSLv3')
-+ should contain_nova_config('DEFAULT/kombu_ssl_version').with_value('TLSv1')
- end
- end
-
-@@ -360,7 +360,7 @@ describe 'nova' do
- {
- :rabbit_password => 'pass',
- :rabbit_use_ssl => false,
-- :kombu_ssl_version => 'SSLv3',
-+ :kombu_ssl_version => 'TLSv1',
- }
- end
-
diff --git a/0014-move-setting-of-novncproxy_base_url.patch b/0014-move-setting-of-novncproxy_base_url.patch
new file mode 100644
index 0000000..2a8a1ab
--- /dev/null
+++ b/0014-move-setting-of-novncproxy_base_url.patch
@@ -0,0 +1,175 @@
+From 50eb58255cbb8509e15f04fb41af34bb2c79efe0 Mon Sep 17 00:00:00 2001
+From: Lars Kellogg-Stedman <lars at redhat.com>
+Date: Fri, 27 Mar 2015 22:44:57 -0400
+Subject: [PATCH] move setting of novncproxy_base_url
+
+The fixes introduced in order to resolve
+https://bugs.launchpad.net/nova/+bug/1409142 (CVE-2015-0259) make
+novncproxy_base_url relevant on hosts running the nova-novncproxy
+service, whereas previously it was only used by nova-compute to
+construct VNC console urls.
+
+This change moves the setting of the novncproxy_base_url option out of
+compute.pp and into nova::vncproxy_common, where it can be used both
+by compute.pp and vncproxy.pp.
+
+Change-Id: I7af4cf8257f2bdbc7d3cc57930fd6371571db531
+
+Conflicts:
+ nova/spec/classes/nova_vnc_proxy_spec.rb
+---
+ nova/manifests/compute.pp | 10 ++----
+ nova/manifests/vncproxy.pp | 25 ++++++++++-----
+ nova/manifests/vncproxy/common.pp | 54 ++++++++++++++++++++++++++++++++
+ nova/spec/classes/nova_vnc_proxy_spec.rb | 1 +
+ 4 files changed, 75 insertions(+), 15 deletions(-)
+ create mode 100644 nova/manifests/vncproxy/common.pp
+
+diff --git a/nova/manifests/compute.pp b/nova/manifests/compute.pp
+index d4eb0f6..6694032 100644
+--- a/nova/manifests/compute.pp
++++ b/nova/manifests/compute.pp
+@@ -38,7 +38,7 @@
+ #
+ # [*vncproxy_path*]
+ # (optional) The path at the end of the uri for communication with the VNC proxy server
+-# Defaults to './vnc_auto.html'
++# Defaults to '/vnc_auto.html'
+ #
+ # [*vnc_keymap*]
+ # (optional) The keymap to use with VNC (ls -alh /usr/share/qemu/keymaps to list available keymaps)
+@@ -121,13 +121,7 @@ class nova::compute (
+ }
+
+ if ($vnc_enabled) {
+- if ($vncproxy_host) {
+- $vncproxy_base_url = "${vncproxy_protocol}://${vncproxy_host}:${vncproxy_port}${vncproxy_path}"
+- # config for vnc proxy
+- nova_config {
+- 'DEFAULT/novncproxy_base_url': value => $vncproxy_base_url;
+- }
+- }
++ include ::nova::vncproxy::common
+ }
+
+ nova_config {
+diff --git a/nova/manifests/vncproxy.pp b/nova/manifests/vncproxy.pp
+index b131aac..f2ae993 100644
+--- a/nova/manifests/vncproxy.pp
++++ b/nova/manifests/vncproxy.pp
+@@ -24,18 +24,27 @@
+ # (optional) The state of the nova-novncproxy package
+ # Defaults to 'present'
+ #
++# [*vncproxy_protocol*]
++# (optional) The protocol to communicate with the VNC proxy server
++# Defaults to 'http'
++#
++# [*vncproxy_path*]
++# (optional) The path at the end of the uri for communication with the VNC
++# proxy server
++# Defaults to '/vnc_auto.html'
++#
+ class nova::vncproxy(
+- $enabled = false,
+- $manage_service = true,
+- $host = '0.0.0.0',
+- $port = '6080',
+- $ensure_package = 'present'
++ $enabled = false,
++ $manage_service = true,
++ $vncproxy_protocol = 'http',
++ $host = '0.0.0.0',
++ $port = '6080',
++ $vncproxy_path = '/vnc_auto.html',
++ $ensure_package = 'present'
+ ) {
+
+ include nova::params
+
+- # TODO make this work on Fedora
+-
+ # See http://nova.openstack.org/runnova/vncconsole.html for more details.
+
+ nova_config {
+@@ -43,6 +52,8 @@ class nova::vncproxy(
+ 'DEFAULT/novncproxy_port': value => $port;
+ }
+
++ include ::nova::vncproxy::common
++
+ if ! defined(Package['python-numpy']) {
+ package { 'python-numpy':
+ ensure => present,
+diff --git a/nova/manifests/vncproxy/common.pp b/nova/manifests/vncproxy/common.pp
+new file mode 100644
+index 0000000..15b4633
+--- /dev/null
++++ b/nova/manifests/vncproxy/common.pp
+@@ -0,0 +1,54 @@
++# == Class: nova::vncproxy::common
++#
++# [*vncproxy_host*]
++# (optional) The host of the VNC proxy server
++# Defaults to false
++#
++# [*vncproxy_protocol*]
++# (optional) The protocol to communicate with the VNC proxy server
++# Defaults to 'http'
++#
++# [*vncproxy_port*]
++# (optional) The port to communicate with the VNC proxy server
++# Defaults to '6080'
++#
++# [*vncproxy_path*]
++# (optional) The path at the end of the uri for communication with the VNC proxy server
++# Defaults to '/vnc_auto.html'
++#
++class nova::vncproxy::common (
++ $vncproxy_host = undef,
++ $vncproxy_protocol = undef,
++ $vncproxy_port = undef,
++ $vncproxy_path = undef,
++) {
++
++ $vncproxy_host_real = pick(
++ $vncproxy_host,
++ $::nova::compute::vncproxy_host,
++ $::nova::vncproxy::host,
++ false)
++ $vncproxy_protocol_real = pick(
++ $vncproxy_protocol,
++ $::nova::compute::vncproxy_protocol,
++ $::nova::vncproxy::vncproxy_protocol,
++ 'http')
++ $vncproxy_port_real = pick(
++ $vncproxy_port,
++ $::nova::compute::vncproxy_port,
++ $::nova::vncproxy::port,
++ 6080)
++ $vncproxy_path_real = pick(
++ $vncproxy_path,
++ $::nova::compute::vncproxy_path,
++ $::nova::vncproxy::vncproxy_path,
++ '/vnc_auto.html')
++
++ if ($vncproxy_host_real) {
++ $vncproxy_base_url = "${vncproxy_protocol_real}://${vncproxy_host_real}:${vncproxy_port_real}${vncproxy_path_real}"
++ # config for vnc proxy
++ nova_config {
++ 'DEFAULT/novncproxy_base_url': value => $vncproxy_base_url;
++ }
++ }
++}
+diff --git a/nova/spec/classes/nova_vnc_proxy_spec.rb b/nova/spec/classes/nova_vnc_proxy_spec.rb
+index b96415b..0b12686 100644
+--- a/nova/spec/classes/nova_vnc_proxy_spec.rb
++++ b/nova/spec/classes/nova_vnc_proxy_spec.rb
+@@ -22,6 +22,7 @@ describe 'nova::vncproxy' do
+
+ it { should contain_nova_config('DEFAULT/novncproxy_host').with(:value => '0.0.0.0') }
+ it { should contain_nova_config('DEFAULT/novncproxy_port').with(:value => '6080') }
++ it { should contain_nova_config('DEFAULT/novncproxy_base_url').with(:value => 'http://0.0.0.0:6080/vnc_auto.html') }
+
+ it { should contain_package('nova-vncproxy').with(
+ :name => 'nova-novncproxy',
diff --git a/0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch b/0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch
deleted file mode 100644
index 630003b..0000000
--- a/0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From acc845b1a9b4f69ba1d1e95d668cf92ce1854d79 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
-
-Also need to remove installing explicit installation of openvswitch
-and call vswitch::ovs instead.
-Adding testcases to neutron_agents_n1kv_vem_spec.rb and fixing an
-error in neutron_plugins_ml2_spec.rb
-
-Change-Id: I2b4ada801610d7081ac3e2469bcacd6ea5ec8e7d
-Closes-Bug: 1421449
-(cherry picked from commit ba0eb6f2f6db6b4a9d455a3ea54150ccc8020be7)
-
-Conflicts:
- manifests/agents/n1kv_vem.pp
-
-Change-Id: I133cc7a184be8508470e46381f19c6f209620fe1
-(cherry picked from commit 29e1b15e82cb171437f5830721892c80e4aa2510)
----
- neutron/manifests/agents/n1kv_vem.pp | 20 ++++++++----
- .../spec/classes/neutron_agents_n1kv_vem_spec.rb | 38 ++++++++++++++++++++--
- neutron/templates/n1kv.conf.erb | 17 ++++++++++
- 3 files changed, 66 insertions(+), 9 deletions(-)
-
-diff --git a/neutron/manifests/agents/n1kv_vem.pp b/neutron/manifests/agents/n1kv_vem.pp
-index 439355f..dc740c0 100644
---- a/neutron/manifests/agents/n1kv_vem.pp
-+++ b/neutron/manifests/agents/n1kv_vem.pp
-@@ -91,6 +91,14 @@
- # (optional) Whether to start/stop the service
- # Defaults to true
- #
-+# [*portdb*]
-+# (optional) PortDB (ovs|vem)
-+# Defaults to ovs
-+#
-+# [*fastpath_flood*]
-+# (optional) Handle broadcast floods and unknown pkts in fastpath(KLM)
-+# Defaults to disable
-+#
- class neutron::agents::n1kv_vem (
- $n1kv_vsm_ip = '127.0.0.1',
- $n1kv_vsm_domain_id = 1000,
-@@ -103,10 +111,13 @@ class neutron::agents::n1kv_vem (
- $n1kv_version = 'present',
- $package_ensure = 'present',
- $enable = true,
-- $manage_service = true
-+ $manage_service = true,
-+ $portdb = 'ovs',
-+ $fastpath_flood = 'disable'
- ) {
-
- include neutron::params
-+ require vswitch::ovs
-
- Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ] }
-
-@@ -134,11 +145,6 @@ class neutron::agents::n1kv_vem (
- name => $::neutron::params::libnl_package
- }
-
-- package { 'openvswitch':
-- ensure => $package_ensure,
-- name => $::neutron::params::ovs_package
-- }
--
- file {
- '/etc/n1kv':
- ensure => directory,
-@@ -229,7 +235,7 @@ class neutron::agents::n1kv_vem (
- }
-
- Package['libnl'] -> Package['nexus1000v']
-- Package['openvswitch'] -> Package['nexus1000v']
-+ Service['openvswitch'] ~> Package['nexus1000v']
- File['/etc/n1kv/n1kv.conf'] -> Package['nexus1000v']
- Package['nexus1000v'] ~> Service['nexus1000v']
- }
-diff --git a/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
-index 9b7a4b1..4eeee17 100644
---- a/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
-+++ b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
-@@ -17,7 +17,7 @@ describe 'neutron::agents::n1kv_vem' do
-
- it 'install n1kv-vem' do
- should contain_package('libnl').with_before('Package[nexus1000v]')
-- should contain_package('openvswitch').with_before('Package[nexus1000v]')
-+ should contain_service('openvswitch').with_notify('Package[nexus1000v]')
- should contain_package('nexus1000v').with_notify('Service[nexus1000v]')
- should contain_service('nexus1000v').with_ensure('running')
- end
-@@ -66,7 +66,9 @@ describe 'neutron::agents::n1kv_vem' do
- {
- :n1kv_vsm_ip => '9.0.0.1',
- :n1kv_vsm_domain_id => 900,
-- :host_mgmt_intf => 'eth9'
-+ :host_mgmt_intf => 'eth9',
-+ :portdb => 'ovs',
-+ :fastpath_flood => 'disable'
- }
- end
- it do
-@@ -77,11 +79,15 @@ describe 'neutron::agents::n1kv_vem' do
- should contain_file('/etc/n1kv/n1kv.conf') \
- .with_content(/^host-mgmt-intf eth9/)
- should contain_file('/etc/n1kv/n1kv.conf') \
-+ .with_content(/^portdb ovs/)
-+ should contain_file('/etc/n1kv/n1kv.conf') \
- .without_content(/^phys/)
- should contain_file('/etc/n1kv/n1kv.conf') \
- .without_content(/^virt/)
- should contain_file('/etc/n1kv/n1kv.conf') \
- .with_content(/^node-type compute/)
-+ should contain_file('/etc/n1kv/n1kv.conf') \
-+ .with_content(/^fastpath-flood disable/)
- end
- end
-
-@@ -99,6 +105,34 @@ describe 'neutron::agents::n1kv_vem' do
- end
- end
-
-+ context 'verify portdb' do
-+ let :params do
-+ {
-+ :portdb => 'vem',
-+ }
-+ end
-+ it do
-+ should contain_file('/etc/n1kv/n1kv.conf') \
-+ .with_content(/^portdb vem/)
-+ should contain_file('/etc/n1kv/n1kv.conf') \
-+ .without_content(/^portdb ovs/)
-+ end
-+ end
-+
-+ context 'verify fastpath_flood' do
-+ let :params do
-+ {
-+ :fastpath_flood => 'enable',
-+ }
-+ end
-+ it do
-+ should contain_file('/etc/n1kv/n1kv.conf') \
-+ .with_content(/^fastpath-flood enable/)
-+ should contain_file('/etc/n1kv/n1kv.conf') \
-+ .without_content(/^fastpath-flood disable/)
-+ end
-+ end
-+
- context 'verify n1kv.conf with uplinks' do
- let :params do
- {
-diff --git a/neutron/templates/n1kv.conf.erb b/neutron/templates/n1kv.conf.erb
-index 8edb3e2..dd94094 100644
---- a/neutron/templates/n1kv.conf.erb
-+++ b/neutron/templates/n1kv.conf.erb
-@@ -81,6 +81,15 @@ virt <%= port%> profile <%= params['profile']%> mode static address <%= params['
- # uvem-ovs-brname n1kvdvs
- uvem-ovs-brname br-int
-
-+# TAG: portdb
-+# Description: PortDB (ovs|vem)
-+# Optional: YES.
-+# Default: ovs
-+# restart_on_modify: Yes
-+# Format:
-+# portdb vem
-+portdb <%= @portdb %>
-+
- # TAG: node-type
- # Description: Type of Node: 'compute' (or) 'neutron'
- # Optional: YES.
-@@ -150,3 +159,11 @@ node-type <%= @node_type %>
- # restart_on_modify: Yes
- # Format: dp-thread-socket-rrnglen <0..16384>
- # Note: 0 - disables memory map I/O
-+
-+# TAG: fastpath-flood
-+# Description: Enable flood of broadcast and unknown pkts in KLM
-+# Optional: YES
-+# Default: disable
-+# restart_on_modify: Yes
-+# Format: fastpath-flood <enable|disable>
-+fastpath-flood <%= @fastpath_flood %>
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
deleted file mode 100644
index 06c6f21..0000000
--- a/0016-Changing-the-default-value-of-fastpath_flood-to-enab.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From b6fbadc277b03e1e1744ba38ce1e428e49bbbe7f 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
-
-Current default value of fastpath_flood in nexus1000v is set to disable.
-Cisco1000v handles broadcast floods and unknown pkts in fastpath(KLM) by default.
-Thus this variable need to be set to enale as the default.
-
-Change-Id: If18ba553b70a896f0d9e38113831445bf3a08cbe
-Closes-Bug: 1425589
-(cherry picked from commit c90b465001b82005f656cc8af08e87111c884089)
----
- neutron/manifests/agents/n1kv_vem.pp | 4 ++--
- neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb | 10 +++++-----
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/neutron/manifests/agents/n1kv_vem.pp b/neutron/manifests/agents/n1kv_vem.pp
-index dc740c0..6366b41 100644
---- a/neutron/manifests/agents/n1kv_vem.pp
-+++ b/neutron/manifests/agents/n1kv_vem.pp
-@@ -97,7 +97,7 @@
- #
- # [*fastpath_flood*]
- # (optional) Handle broadcast floods and unknown pkts in fastpath(KLM)
--# Defaults to disable
-+# Defaults to enable
- #
- class neutron::agents::n1kv_vem (
- $n1kv_vsm_ip = '127.0.0.1',
-@@ -113,7 +113,7 @@ class neutron::agents::n1kv_vem (
- $enable = true,
- $manage_service = true,
- $portdb = 'ovs',
-- $fastpath_flood = 'disable'
-+ $fastpath_flood = 'enable'
- ) {
-
- include neutron::params
-diff --git a/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
-index 4eeee17..68863ef 100644
---- a/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
-+++ b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
-@@ -68,7 +68,7 @@ describe 'neutron::agents::n1kv_vem' do
- :n1kv_vsm_domain_id => 900,
- :host_mgmt_intf => 'eth9',
- :portdb => 'ovs',
-- :fastpath_flood => 'disable'
-+ :fastpath_flood => 'enable'
- }
- end
- it do
-@@ -87,7 +87,7 @@ describe 'neutron::agents::n1kv_vem' do
- should contain_file('/etc/n1kv/n1kv.conf') \
- .with_content(/^node-type compute/)
- should contain_file('/etc/n1kv/n1kv.conf') \
-- .with_content(/^fastpath-flood disable/)
-+ .with_content(/^fastpath-flood enable/)
- end
- end
-
-@@ -122,14 +122,14 @@ describe 'neutron::agents::n1kv_vem' do
- context 'verify fastpath_flood' do
- let :params do
- {
-- :fastpath_flood => 'enable',
-+ :fastpath_flood => 'disable',
- }
- end
- it do
- should contain_file('/etc/n1kv/n1kv.conf') \
-- .with_content(/^fastpath-flood enable/)
-+ .with_content(/^fastpath-flood disable/)
- should contain_file('/etc/n1kv/n1kv.conf') \
-- .without_content(/^fastpath-flood disable/)
-+ .without_content(/^fastpath-flood enable/)
- end
- end
-
diff --git a/0017-Make-cisco-plugin-symlink-coherent.patch b/0017-Make-cisco-plugin-symlink-coherent.patch
deleted file mode 100644
index 1269b21..0000000
--- a/0017-Make-cisco-plugin-symlink-coherent.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7f107b3a7fd010b8a7157756ef3c0390536d7701 Mon Sep 17 00:00:00 2001
-From: Lukas Bezdicka <lbezdick at redhat.com>
-Date: Thu, 15 Jan 2015 14:13:42 +0100
-Subject: [PATCH] Make cisco plugin symlink coherent
-
-If we override to /etc/neutron/plugins/cisco/cisco_plugins.ini if
-symlink exists and we set it to ovs_neutron_plugin.ini if it does
-not seems wrong. We should always use cisco_plugins.ini
-
-Closes-Bug: rhbz#1179474
-Change-Id: I24eee0a29e7e39da7dd6cdda36f71c74613ef300
-(cherry picked from commit aba3ffeba919f9534d60839054c47d53030ab6ed)
----
- neutron/manifests/plugins/cisco.pp | 4 ++--
- neutron/spec/classes/neutron_plugins_cisco_spec.rb | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/neutron/manifests/plugins/cisco.pp b/neutron/manifests/plugins/cisco.pp
-index 10ae874..7ebea6b 100644
---- a/neutron/manifests/plugins/cisco.pp
-+++ b/neutron/manifests/plugins/cisco.pp
-@@ -177,8 +177,8 @@ class neutron::plugins::cisco(
- else {
- file {'/etc/neutron/plugin.ini':
- ensure => link,
-- target => '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini',
-- require => Package['neutron-plugin-ovs'],
-+ target => '/etc/neutron/plugins/cisco/cisco_plugins.ini',
-+ require => Package['neutron-plugin-cisco'],
- }
- }
- }
-diff --git a/neutron/spec/classes/neutron_plugins_cisco_spec.rb b/neutron/spec/classes/neutron_plugins_cisco_spec.rb
-index 8643091..2e8ac5f 100644
---- a/neutron/spec/classes/neutron_plugins_cisco_spec.rb
-+++ b/neutron/spec/classes/neutron_plugins_cisco_spec.rb
-@@ -42,8 +42,8 @@ describe 'neutron::plugins::cisco' do
- it 'should create plugin symbolic link' do
- should contain_file('/etc/neutron/plugin.ini').with(
- :ensure => 'link',
-- :target => '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini',
-- :require => 'Package[neutron-plugin-ovs]'
-+ :target => '/etc/neutron/plugins/cisco/cisco_plugins.ini',
-+ :require => 'Package[neutron-plugin-cisco]'
- )
- end
-
diff --git a/0018-Add-serialproxy-configuration.patch b/0018-Add-serialproxy-configuration.patch
deleted file mode 100644
index 0016e65..0000000
--- a/0018-Add-serialproxy-configuration.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-From 9dddfe1c0a659659b0d06a3c13c318c81a26fad7 Mon Sep 17 00:00:00 2001
-From: Ivan Chavero <ichavero at redhat.com>
-Date: Sun, 11 Jan 2015 20:30:27 -0700
-Subject: [PATCH] Add serialproxy configuration
-
-Configure the serial proxy feature recently added
-in Juno
-
-There's no built in way in openstack to test this.
-to check the patch you'll need this utility:
-https://github.com/larsks/novaconsole/
-
-Change-Id: I593ebb0f4ce8cae00671230022516f9bbcbe4e9a
-(cherry picked from commit f95548589d69e6589864a78667e9db981644b960)
----
- nova/manifests/compute/serial.pp | 40 ++++++++++++
- nova/manifests/params.pp | 4 ++
- nova/manifests/serialproxy.pp | 50 +++++++++++++++
- nova/spec/classes/nova_compute_serial_spec.rb | 21 ++++++
- nova/spec/classes/nova_serial_proxy_spec.rb | 92 +++++++++++++++++++++++++++
- 5 files changed, 207 insertions(+)
- create mode 100644 nova/manifests/compute/serial.pp
- create mode 100644 nova/manifests/serialproxy.pp
- create mode 100644 nova/spec/classes/nova_compute_serial_spec.rb
- create mode 100644 nova/spec/classes/nova_serial_proxy_spec.rb
-
-diff --git a/nova/manifests/compute/serial.pp b/nova/manifests/compute/serial.pp
-new file mode 100644
-index 0000000..00173e2
---- /dev/null
-+++ b/nova/manifests/compute/serial.pp
-@@ -0,0 +1,40 @@
-+# == Class: nova::compute::serial
-+#
-+# Configures nova serial console
-+#
-+# === Parameters:
-+#
-+# [*port_range]
-+# (optional) Range of TCP ports to use for serial ports on compute hosts
-+# Defaults to 10000:20000
-+#
-+# [*base_url*]
-+# (optional) URL that gets passed to the clients
-+# Defaults to 'ws://127.0.0.1:6083/'
-+#
-+# [*listen]
-+# IP address on which instance serial console should listen
-+# Defaults to 127.0.0.1
-+#
-+# [*proxyclient_address*]
-+# The address to which proxy clients (like nova-serialproxy)
-+# should connect (string value)
-+# Defaults to 127.0.0.1
-+
-+
-+class nova::compute::serial(
-+ $port_range = '10000:20000',
-+ $base_url = 'ws://127.0.0.1:6083/',
-+ $listen = '127.0.0.1',
-+ $proxyclient_address = '127.0.0.1',
-+) {
-+
-+
-+ nova_config {
-+ 'serial_console/enabled': value => true;
-+ 'serial_console/port_range': value => $port_range;
-+ 'serial_console/base_url': value => $base_url;
-+ 'serial_console/listen': value => $listen;
-+ 'serial_console/proxyclient_address': value => $proxyclient_address;
-+ }
-+}
-diff --git a/nova/manifests/params.pp b/nova/manifests/params.pp
-index 5d0fb51..d2f44e9 100644
---- a/nova/manifests/params.pp
-+++ b/nova/manifests/params.pp
-@@ -22,6 +22,7 @@ class nova::params {
- $scheduler_package_name = 'openstack-nova-scheduler'
- $tgt_package_name = 'scsi-target-utils'
- $vncproxy_package_name = 'openstack-nova-novncproxy'
-+ $serialproxy_package_name = 'openstack-nova-serialproxy'
- $spicehtml5proxy_package_name = 'openstack-nova-console'
- # service names
- $api_service_name = 'openstack-nova-api'
-@@ -36,6 +37,7 @@ class nova::params {
- $scheduler_service_name = 'openstack-nova-scheduler'
- $tgt_service_name = 'tgtd'
- $vncproxy_service_name = 'openstack-nova-novncproxy'
-+ $serialproxy_service_name = 'openstack-nova-serialproxy'
- $spicehtml5proxy_service_name = 'openstack-nova-spicehtml5proxy'
- # redhat specific config defaults
- $root_helper = 'sudo nova-rootwrap'
-@@ -72,6 +74,7 @@ class nova::params {
- $objectstore_package_name = 'nova-objectstore'
- $scheduler_package_name = 'nova-scheduler'
- $tgt_package_name = 'tgt'
-+ $serialproxy_package_name = 'nova-serialproxy'
- # service names
- $api_service_name = 'nova-api'
- $cells_service_name = 'nova-cells'
-@@ -84,6 +87,7 @@ class nova::params {
- $objectstore_service_name = 'nova-objectstore'
- $scheduler_service_name = 'nova-scheduler'
- $vncproxy_service_name = 'nova-novncproxy'
-+ $serialproxy_service_name = 'nova-serialproxy'
- $tgt_service_name = 'tgt'
- # debian specific nova config
- $root_helper = 'sudo nova-rootwrap'
-diff --git a/nova/manifests/serialproxy.pp b/nova/manifests/serialproxy.pp
-new file mode 100644
-index 0000000..018d4cc
---- /dev/null
-+++ b/nova/manifests/serialproxy.pp
-@@ -0,0 +1,50 @@
-+# == Class: nova:serialproxy
-+#
-+# Configures nova serialproxy
-+#
-+# === Parameters:
-+#
-+# [*enabled*]
-+# (optional) Whether to run the serialproxy service
-+# Defaults to false
-+#
-+# [*manage_service*]
-+# (optional) Whether to start/stop the service
-+# Defaults to true
-+#
-+# [*serialproxy_host*]
-+# (optional) Host on which to listen for incoming requests
-+# Defaults to '0.0.0.0'
-+#
-+# [*serialproxy_port*]
-+# (optional) Port on which to listen for incoming requests
-+# Defaults to '6083'
-+#
-+# [*ensure_package*]
-+# (optional) The state of the nova-serialproxy package
-+# Defaults to 'present'
-+#
-+class nova::serialproxy(
-+ $enabled = true,
-+ $manage_service = true,
-+ $serialproxy_host = '0.0.0.0',
-+ $serialproxy_port = '6083',
-+ $ensure_package = 'present'
-+) {
-+
-+ include nova::params
-+
-+ nova_config {
-+ 'serial_console/serialproxy_port': value => $serialproxy_port;
-+ 'serial_console/serialproxy_host': value => $serialproxy_host;
-+ }
-+
-+ nova::generic_service { 'serialproxy':
-+ enabled => $enabled,
-+ manage_service => $manage_service,
-+ package_name => $::nova::params::serialproxy_package_name,
-+ service_name => $::nova::params::serialproxy_service_name,
-+ ensure_package => $ensure_package
-+ }
-+
-+}
-diff --git a/nova/spec/classes/nova_compute_serial_spec.rb b/nova/spec/classes/nova_compute_serial_spec.rb
-new file mode 100644
-index 0000000..ba83584
---- /dev/null
-+++ b/nova/spec/classes/nova_compute_serial_spec.rb
-@@ -0,0 +1,21 @@
-+require 'spec_helper'
-+describe 'nova::compute::serial' do
-+
-+ it { should contain_nova_config('serial_console/enabled').with_value('true') }
-+ it { should contain_nova_config('serial_console/port_range').with_value('10000:20000')}
-+ it { should contain_nova_config('serial_console/base_url').with_value('ws://127.0.0.1:6083/')}
-+ it { should contain_nova_config('serial_console/listen').with_value('127.0.0.1')}
-+ it { should contain_nova_config('serial_console/proxyclient_address').with_value('127.0.0.1')}
-+
-+ context 'when overriding params' do
-+ let :params do
-+ {
-+ :proxyclient_address => '10.10.10.10',
-+ :listen => '10.10.11.11',
-+ }
-+ end
-+ it { should contain_nova_config('serial_console/proxyclient_address').with_value('10.10.10.10')}
-+ it { should contain_nova_config('serial_console/listen').with_value('10.10.11.11')}
-+ end
-+
-+end
-diff --git a/nova/spec/classes/nova_serial_proxy_spec.rb b/nova/spec/classes/nova_serial_proxy_spec.rb
-new file mode 100644
-index 0000000..1dcaca1
---- /dev/null
-+++ b/nova/spec/classes/nova_serial_proxy_spec.rb
-@@ -0,0 +1,92 @@
-+require 'spec_helper'
-+
-+describe 'nova::serialproxy' do
-+
-+ let :pre_condition do
-+ 'include nova'
-+ end
-+
-+ let :params do
-+ { :enabled => true }
-+ end
-+
-+ shared_examples 'nova-serialproxy' do
-+
-+ it 'configures nova.conf' do
-+ should contain_nova_config('serial_console/serialproxy_host').with(:value => '0.0.0.0')
-+ should contain_nova_config('serial_console/serialproxy_port').with(:value => '6083')
-+ end
-+
-+ it { should contain_package('nova-serialproxy').with(
-+ :name => platform_params[:serialproxy_package_name],
-+ :ensure => 'present'
-+ ) }
-+
-+ it { should contain_service('nova-serialproxy').with(
-+ :name => platform_params[:serialproxy_service_name],
-+ :hasstatus => 'true',
-+ :ensure => 'running'
-+ )}
-+
-+ context 'with manage_service as false' do
-+ let :params do
-+ { :enabled => true,
-+ :manage_service => false
-+ }
-+ end
-+ it { should contain_service('nova-serialproxy').without_ensure }
-+ end
-+
-+ context 'with package version' do
-+ let :params do
-+ { :ensure_package => '2012.2' }
-+ end
-+
-+ it { should contain_package('nova-serialproxy').with(
-+ :ensure => params[:ensure_package]
-+ )}
-+ end
-+ end
-+
-+ context 'on Ubuntu system' do
-+ let :facts do
-+ { :osfamily => 'Debian',
-+ :operatingsystem => 'Ubuntu' }
-+ end
-+
-+ let :platform_params do
-+ { :serialproxy_package_name => 'nova-serialproxy',
-+ :serialproxy_service_name => 'nova-serialproxy' }
-+ end
-+
-+ it_configures 'nova-serialproxy'
-+ end
-+
-+ context 'on Debian system' do
-+ let :facts do
-+ { :osfamily => 'Debian',
-+ :operatingsystem => 'Debian' }
-+ end
-+
-+ let :platform_params do
-+ { :serialproxy_package_name => 'nova-serialproxy',
-+ :serialproxy_service_name => 'nova-serialproxy' }
-+ end
-+
-+ it_configures 'nova-serialproxy'
-+ end
-+
-+ context 'on Redhat platforms' do
-+ let :facts do
-+ { :osfamily => 'RedHat' }
-+ end
-+
-+ let :platform_params do
-+ { :serialproxy_package_name => 'openstack-nova-serialproxy',
-+ :serialproxy_service_name => 'openstack-nova-serialproxy' }
-+ end
-+
-+ it_configures 'nova-serialproxy'
-+ end
-+
-+end
diff --git a/0019-move-setting-of-novncproxy_base_url.patch b/0019-move-setting-of-novncproxy_base_url.patch
deleted file mode 100644
index dc80845..0000000
--- a/0019-move-setting-of-novncproxy_base_url.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 65951f3a94df5341a92f592ff8ca3820496c3feb Mon Sep 17 00:00:00 2001
-From: Lars Kellogg-Stedman <lars at redhat.com>
-Date: Fri, 27 Mar 2015 22:44:57 -0400
-Subject: [PATCH] move setting of novncproxy_base_url
-
-The fixes introduced in order to resolve
-https://bugs.launchpad.net/nova/+bug/1409142 (CVE-2015-0259) make
-novncproxy_base_url relevant on hosts running the nova-novncproxy
-service, whereas previously it was only used by nova-compute to
-construct VNC console urls.
-
-This change moves the setting of the novncproxy_base_url option out of
-compute.pp and into nova::vncproxy_common, where it can be used both
-by compute.pp and vncproxy.pp.
-
-Change-Id: I7af4cf8257f2bdbc7d3cc57930fd6371571db531
-
-Conflicts:
- nova/spec/classes/nova_vnc_proxy_spec.rb
----
- nova/manifests/compute.pp | 10 ++----
- nova/manifests/vncproxy.pp | 25 ++++++++++-----
- nova/manifests/vncproxy/common.pp | 54 ++++++++++++++++++++++++++++++++
- nova/spec/classes/nova_vnc_proxy_spec.rb | 1 +
- 4 files changed, 75 insertions(+), 15 deletions(-)
- create mode 100644 nova/manifests/vncproxy/common.pp
-
-diff --git a/nova/manifests/compute.pp b/nova/manifests/compute.pp
-index d4eb0f6..6694032 100644
---- a/nova/manifests/compute.pp
-+++ b/nova/manifests/compute.pp
-@@ -38,7 +38,7 @@
- #
- # [*vncproxy_path*]
- # (optional) The path at the end of the uri for communication with the VNC proxy server
--# Defaults to './vnc_auto.html'
-+# Defaults to '/vnc_auto.html'
- #
- # [*vnc_keymap*]
- # (optional) The keymap to use with VNC (ls -alh /usr/share/qemu/keymaps to list available keymaps)
-@@ -121,13 +121,7 @@ class nova::compute (
- }
-
- if ($vnc_enabled) {
-- if ($vncproxy_host) {
-- $vncproxy_base_url = "${vncproxy_protocol}://${vncproxy_host}:${vncproxy_port}${vncproxy_path}"
-- # config for vnc proxy
-- nova_config {
-- 'DEFAULT/novncproxy_base_url': value => $vncproxy_base_url;
-- }
-- }
-+ include ::nova::vncproxy::common
- }
-
- nova_config {
-diff --git a/nova/manifests/vncproxy.pp b/nova/manifests/vncproxy.pp
-index b131aac..f2ae993 100644
---- a/nova/manifests/vncproxy.pp
-+++ b/nova/manifests/vncproxy.pp
-@@ -24,18 +24,27 @@
- # (optional) The state of the nova-novncproxy package
- # Defaults to 'present'
- #
-+# [*vncproxy_protocol*]
-+# (optional) The protocol to communicate with the VNC proxy server
-+# Defaults to 'http'
-+#
-+# [*vncproxy_path*]
-+# (optional) The path at the end of the uri for communication with the VNC
-+# proxy server
-+# Defaults to '/vnc_auto.html'
-+#
- class nova::vncproxy(
-- $enabled = false,
-- $manage_service = true,
-- $host = '0.0.0.0',
-- $port = '6080',
-- $ensure_package = 'present'
-+ $enabled = false,
-+ $manage_service = true,
-+ $vncproxy_protocol = 'http',
-+ $host = '0.0.0.0',
-+ $port = '6080',
-+ $vncproxy_path = '/vnc_auto.html',
-+ $ensure_package = 'present'
- ) {
-
- include nova::params
-
-- # TODO make this work on Fedora
--
- # See http://nova.openstack.org/runnova/vncconsole.html for more details.
-
- nova_config {
-@@ -43,6 +52,8 @@ class nova::vncproxy(
- 'DEFAULT/novncproxy_port': value => $port;
- }
-
-+ include ::nova::vncproxy::common
-+
- if ! defined(Package['python-numpy']) {
- package { 'python-numpy':
- ensure => present,
-diff --git a/nova/manifests/vncproxy/common.pp b/nova/manifests/vncproxy/common.pp
-new file mode 100644
-index 0000000..15b4633
---- /dev/null
-+++ b/nova/manifests/vncproxy/common.pp
-@@ -0,0 +1,54 @@
-+# == Class: nova::vncproxy::common
-+#
-+# [*vncproxy_host*]
-+# (optional) The host of the VNC proxy server
-+# Defaults to false
-+#
-+# [*vncproxy_protocol*]
-+# (optional) The protocol to communicate with the VNC proxy server
-+# Defaults to 'http'
-+#
-+# [*vncproxy_port*]
-+# (optional) The port to communicate with the VNC proxy server
-+# Defaults to '6080'
-+#
-+# [*vncproxy_path*]
-+# (optional) The path at the end of the uri for communication with the VNC proxy server
-+# Defaults to '/vnc_auto.html'
-+#
-+class nova::vncproxy::common (
-+ $vncproxy_host = undef,
-+ $vncproxy_protocol = undef,
-+ $vncproxy_port = undef,
-+ $vncproxy_path = undef,
-+) {
-+
-+ $vncproxy_host_real = pick(
-+ $vncproxy_host,
-+ $::nova::compute::vncproxy_host,
-+ $::nova::vncproxy::host,
-+ false)
-+ $vncproxy_protocol_real = pick(
-+ $vncproxy_protocol,
-+ $::nova::compute::vncproxy_protocol,
-+ $::nova::vncproxy::vncproxy_protocol,
-+ 'http')
-+ $vncproxy_port_real = pick(
-+ $vncproxy_port,
-+ $::nova::compute::vncproxy_port,
-+ $::nova::vncproxy::port,
-+ 6080)
-+ $vncproxy_path_real = pick(
-+ $vncproxy_path,
-+ $::nova::compute::vncproxy_path,
-+ $::nova::vncproxy::vncproxy_path,
-+ '/vnc_auto.html')
-+
-+ if ($vncproxy_host_real) {
-+ $vncproxy_base_url = "${vncproxy_protocol_real}://${vncproxy_host_real}:${vncproxy_port_real}${vncproxy_path_real}"
-+ # config for vnc proxy
-+ nova_config {
-+ 'DEFAULT/novncproxy_base_url': value => $vncproxy_base_url;
-+ }
-+ }
-+}
-diff --git a/nova/spec/classes/nova_vnc_proxy_spec.rb b/nova/spec/classes/nova_vnc_proxy_spec.rb
-index b96415b..0b12686 100644
---- a/nova/spec/classes/nova_vnc_proxy_spec.rb
-+++ b/nova/spec/classes/nova_vnc_proxy_spec.rb
-@@ -22,6 +22,7 @@ describe 'nova::vncproxy' do
-
- it { should contain_nova_config('DEFAULT/novncproxy_host').with(:value => '0.0.0.0') }
- it { should contain_nova_config('DEFAULT/novncproxy_port').with(:value => '6080') }
-+ it { should contain_nova_config('DEFAULT/novncproxy_base_url').with(:value => 'http://0.0.0.0:6080/vnc_auto.html') }
-
- it { should contain_package('nova-vncproxy').with(
- :name => 'nova-novncproxy',
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 5fab6ad..beecaef 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,7 +1,7 @@
Name: openstack-puppet-modules
-Version: 2014.2.13
-Release: 3%{?dist}
+Version: 2014.2.14
+Release: 1%{?dist}
Summary: Collection of Puppet modules for OpenStack deployment
License: ASL 2.0 and GPLv2 and GPLv3
@@ -20,14 +20,9 @@ Patch0008: 0008-Adds-filtering-for-BONDING-LACP.patch
Patch0009: 0009-JSON-was-invalid.patch
Patch0010: 0010-Set-control_exchange-in-the-main-config-file.patch
Patch0011: 0011-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
-Patch0012: 0012-Create-resource-cache-upon-creation.patch
-Patch0013: 0013-Fix-rabbitmq-support.patch
-Patch0014: 0014-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
-Patch0015: 0015-Adding-portdb-and-fastpath_flood-to-n1kv.conf.patch
-Patch0016: 0016-Changing-the-default-value-of-fastpath_flood-to-enab.patch
-Patch0017: 0017-Make-cisco-plugin-symlink-coherent.patch
-Patch0018: 0018-Add-serialproxy-configuration.patch
-Patch0019: 0019-move-setting-of-novncproxy_base_url.patch
+Patch0012: 0012-Fix-rabbitmq-support.patch
+Patch0013: 0013-Changing-the-default-value-of-fastpath_flood-to-enab.patch
+Patch0014: 0014-move-setting-of-novncproxy_base_url.patch
BuildArch: noarch
Requires: rubygem-json
@@ -54,11 +49,6 @@ OpenStack via installers using Puppet configuration tool.
%patch0012 -p1
%patch0013 -p1
%patch0014 -p1
-%patch0015 -p1
-%patch0016 -p1
-%patch0017 -p1
-%patch0018 -p1
-%patch0019 -p1
find %{_builddir}/%{name}-%{version}/ -type f -name ".*" -exec rm {} +
find %{_builddir}/%{name}-%{version}/ -size 0 -exec rm {} +
@@ -132,6 +122,57 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Thu Apr 02 2015 Lukas Bezdicka <lbezdick at redhat.com> 2014.2.14-1
+- Update to upstream 2014.2.14
+- apache 1417312b493ea79f88f22cc8b961d8db08cb9273
+- aviator d308a263318399f0de7fd760826f8b98b2b59aba
+- ceilometer ee5e035df0bfea5ed69b9f39a345caba5b7fd626
+- certmonger 3f86b9973fc30c14a066b0f215023d5f1398b874
+- cinder bde992600a63a3debba4b06a27d7cde9119f23ed
+- common 2c0ed2844c606fd806bde0c02e47e79c88fab4a9
+- concat 644fb1b6dc8b64accc4d1208d6127b79a08a38b7
+- firewall 6b308177c3d279083078955942969c92b145eba0
+- galera f7d4110886b643eb63dc5c347a0e8a06b09642e7
+- glance 533a3bbb91f11b82cd68b02a22531efd3e3f4119
+- gluster 6c962083d8b100dcaeb6f11dbe61e6071f3d13f0
+- haproxy f381510e940ee11feb044c1c728ba2e5af807c79
+- heat f07c80174f9f8b3f467b0171627e4b2586c55e29
+- horizon 46f74e5576ccd4044328c619702721df012a0521
+- inifile fe9b0d5229ea37179a08c4b49239da9bc950acd1
+- ipa 08e51e96ac2c9265499deec3485e396b792587d3
+- ironic 6733465482dc092486ee7d9227e9068fee506d6b
+- keystone 6d1d79ebd5b69a97dfc6e7cf7d5309643ef73492
+- memcached 49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
+- module-data 159fc5e0e21ce9df96c777f0064b5eca88e29cae
+- mongodb fe562b86f388a6d107bb1f3cb3b32a3978f59c2a
+- mysql 40dd1805886aee56dc02860565f161c6e3b4c7e5
+- n1k_vsm 2a42723f5a9d7dbfa00edf944ac5dec2bff6d9ea
+- nagios 56a1eee350c4600bb12e017d64238fb3f876abd4
+- neutron cd92789a58d09bbf3d863f46c90871c920cedc75
+- nova a2d7b4dd4a13803f8612b17e214e3856e283b614
+- nssdb b3799a9a7c62c3b5b7968f9860220a885b45fb8a
+- ntp 8f697e32bc279b36ada752273e6c788716b95315
+- openstack d81d2d86280d5739cc896a48b68d7309e765047a
+- openstacklib 417121b83c188e5b470e6b16f8e906c8ecdbcc4a
+- pacemaker 52acfd9c31e0801cedf970929851d4bece5cf79b
+- puppet bd467cae15eba9ca44274034d2593b0eaf30518d
+- qpid 9ffb2788c536f1694980e07a43e8133ff85fa28c
+- rabbitmq 4832bd61b5b1bfea7c9cc985508e65cd10081652
+- redis d72af9ab3c2911b6dc18c5cc12e700630ebdcfb2
+- rsync 357d51f3a6a22bc3da842736176c3510e507b4fb
+- sahara 6781e080362fa03a7bde0feaa52e2fc0d10b4c8b
+- ssh d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
+- staging 887275d8fb20e148c6f9eb327f1f6c8ea5ee280f
+- stdlib 62e8c1d76902e6f22cb9f7b3abd43e757b4130a3
+- swift 68a9e8eecba4a280ea1ec18fba67069a8c7dfce4
+- sysctl c4486acc2d66de857dbccd8b4b945ea803226705
+- tempest 7a3369949fc8af41e190dd8115391354a7575ecb
+- trove c6d7addb151d572b5146d59898179434d1c2ba73
+- vcsrepo 6f7507a2a48ff0a58c7db026760a2eb84e382a77
+- vlan c937de75c28e63fba8d8738ad6a5f2ede517e53d
+- vswitch 996db952e452a1aa11a4afb2962884ce97d08b8a
+- xinetd 6b02de8d4f30a819eb404048e4258e3a5e8023c8
+
* Tue Mar 31 2015 Ivan Chavero <ichavero at redhat.com> 2014.2.13-3
- Fix move setting of novncproxy_base_url patch (rhbz#1204482)
diff --git a/sources b/sources
index 55de1b4..731cbe4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5e3a2f5ff538445bc776c9c28097413 2014.2.13.tar.gz
+ca27dd2f20714deaf86b1e10c29fb73b 2014.2.14.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-puppet-modules.git/commit/?h=f22&id=139573995287e8ef25bda9d23699465ebcf7b47c
More information about the scm-commits
mailing list