[openstack-puppet-modules] Added missing puppet-neutron patches
Martin Mágr
mmagr at fedoraproject.org
Wed Apr 2 13:44:18 UTC 2014
commit d6b6efc45b79b1dd3334d6c9e764ad3a33358e84
Author: Martin Magr <mmagr at redhat.com>
Date: Wed Apr 2 16:11:18 2014 +0200
Added missing puppet-neutron patches
...work_vlan_ranges-parameter-for-OVS-plugin.patch | 66 ++++++++++++++++++++
..._lease_duration-to-Havana-default-of-8640.patch | 57 +++++++++++++++++
...-not-create-symblic-link-for-cisco-plugin.patch | 38 +++++++++++
openstack-puppet-modules.spec | 15 ++++-
puppet-neutron-vlan_ranges.patch | 32 ++++++++++
5 files changed, 207 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch b/0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch
new file mode 100644
index 0000000..37afaab
--- /dev/null
+++ b/0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch
@@ -0,0 +1,66 @@
+From f1eee124575f2ccb33338759126f4d8315034715 Mon Sep 17 00:00:00 2001
+From: Martin Magr <mmagr at redhat.com>
+Date: Thu, 27 Mar 2014 14:01:44 +0100
+Subject: [PATCH 1/3] Fix network_vlan_ranges parameter for OVS plugin
+
+Class neutron::plugins::ovs expects string value in network_vlan_ranges parameter,
+but validate_network_vlan_ranges will fail when value is comma separated list
+of valid values. This patch is fixing this problem
+
+Change-Id: If5b8ef59a600b3204415853ad796fb0537fefe4a
+(cherry picked from commit 3d8d9fafec004b0debb2af8a70f4cd77d67ce04d)
+---
+ manifests/plugins/ovs.pp | 10 ++++++++--
+ spec/classes/neutron_plugins_ovs_spec.rb | 14 ++++++++++++++
+ 2 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/manifests/plugins/ovs.pp b/manifests/plugins/ovs.pp
+index 349e316..fea6d0f 100644
+--- a/manifests/plugins/ovs.pp
++++ b/manifests/plugins/ovs.pp
+@@ -83,9 +83,15 @@ class neutron::plugins::ovs (
+ } else {
+ # This might be set by the user for the gre or vxlan case where
+ # provider networks are in use
+- validate_network_vlan_ranges($network_vlan_ranges)
++ if !is_array($network_vlan_ranges) {
++ $arr_network_vlan_ranges = strip(split($network_vlan_ranges, ','))
++ } else {
++ $arr_network_vlan_ranges = $network_vlan_ranges
++ }
++
++ validate_network_vlan_ranges($arr_network_vlan_ranges)
+ neutron_plugin_ovs {
+- 'OVS/network_vlan_ranges': value => $network_vlan_ranges
++ 'OVS/network_vlan_ranges': value => join($arr_network_vlan_ranges, ',');
+ }
+ }
+
+diff --git a/spec/classes/neutron_plugins_ovs_spec.rb b/spec/classes/neutron_plugins_ovs_spec.rb
+index 36efd04..f9cfa3f 100644
+--- a/spec/classes/neutron_plugins_ovs_spec.rb
++++ b/spec/classes/neutron_plugins_ovs_spec.rb
+@@ -160,6 +160,20 @@ describe 'neutron::plugins::ovs' do
+ end
+ it { should contain_neutron_plugin_ovs('OVS/network_vlan_ranges').with_value(params[:network_vlan_ranges]) }
+ end
++
++ context 'with comma separated vlan ranges' do
++ let :params do
++ { :network_vlan_ranges => 'physint1:1000:2000,physext1:100:200' }
++ end
++ it { should contain_neutron_plugin_ovs('OVS/network_vlan_ranges').with_value(params[:network_vlan_ranges]) }
++ end
++
++ context 'with vlan ranges in array' do
++ let :params do
++ { :network_vlan_ranges => ['physint1:1000:2000', 'physext1:100:200'] }
++ end
++ it { should contain_neutron_plugin_ovs('OVS/network_vlan_ranges').with_value(params[:network_vlan_ranges].join(',')) }
++ end
+ end
+
+ context 'on Debian platforms' do
+--
+1.8.5.3
+
diff --git a/0002-Change-dhcp_lease_duration-to-Havana-default-of-8640.patch b/0002-Change-dhcp_lease_duration-to-Havana-default-of-8640.patch
new file mode 100644
index 0000000..e204974
--- /dev/null
+++ b/0002-Change-dhcp_lease_duration-to-Havana-default-of-8640.patch
@@ -0,0 +1,57 @@
+From ce310786521f095913fc093ff1ad5e8e2d54dd65 Mon Sep 17 00:00:00 2001
+From: Maish Saidel-Keesing <maishsk at gmail.com>
+Date: Mon, 24 Mar 2014 20:22:24 +0000
+Subject: [PATCH 2/3] Change dhcp_lease_duration to Havana default of 86400
+
+In Havana - the default lease time was upped to 86400 - 1 day - this should be changed back to the correct default in the puppet module as well.
+http://docs.openstack.org/havana/config-reference/content/section_networking-options-reference.html
+
+(cherry picked from commit 1235d8f7001e060d0d52d4cdf1512a894b35da2c)
+
+Conflicts:
+ spec/classes/neutron_init_spec.rb
+
+Change-Id: Ifd75f024186a9100f8aeb78415b4b5c8482913e2
+---
+ manifests/init.pp | 4 ++--
+ spec/classes/neutron_init_spec.rb | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/manifests/init.pp b/manifests/init.pp
+index 84cc649..b0c37d8 100644
+--- a/manifests/init.pp
++++ b/manifests/init.pp
+@@ -67,7 +67,7 @@
+ #
+ # [*dhcp_lease_duration*]
+ # (optional) DHCP lease
+-# Defaults to 120 seconds
++# Defaults to 86400 seconds
+ #
+ # [*dhcp_agents_per_network*]
+ # (optional) Number of DHCP agents scheduled to host a network.
+@@ -137,7 +137,7 @@ class neutron (
+ $auth_strategy = 'keystone',
+ $base_mac = 'fa:16:3e:00:00:00',
+ $mac_generation_retries = 16,
+- $dhcp_lease_duration = 120,
++ $dhcp_lease_duration = 86400,
+ $dhcp_agents_per_network = 1,
+ $allow_bulk = true,
+ $allow_overlapping_ips = false,
+diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
+index b7630eb..821d3a6 100644
+--- a/spec/classes/neutron_init_spec.rb
++++ b/spec/classes/neutron_init_spec.rb
+@@ -92,7 +92,7 @@ describe 'neutron' do
+ should contain_neutron_config('DEFAULT/core_plugin').with_value( params[:core_plugin] )
+ should contain_neutron_config('DEFAULT/base_mac').with_value('fa:16:3e:00:00:00')
+ should contain_neutron_config('DEFAULT/mac_generation_retries').with_value(16)
+- should contain_neutron_config('DEFAULT/dhcp_lease_duration').with_value(120)
++ should contain_neutron_config('DEFAULT/dhcp_lease_duration').with_value(86400)
+ should contain_neutron_config('DEFAULT/allow_bulk').with_value(true)
+ should contain_neutron_config('DEFAULT/allow_overlapping_ips').with_value(false)
+ should contain_neutron_config('DEFAULT/control_exchange').with_value('neutron')
+--
+1.8.5.3
+
diff --git a/0003-Do-not-create-symblic-link-for-cisco-plugin.patch b/0003-Do-not-create-symblic-link-for-cisco-plugin.patch
new file mode 100644
index 0000000..47aabc1
--- /dev/null
+++ b/0003-Do-not-create-symblic-link-for-cisco-plugin.patch
@@ -0,0 +1,38 @@
+From 6519a7d27d87cebe43e4ad7c37132a0fdc5bd167 Mon Sep 17 00:00:00 2001
+From: Martin Magr <mmagr at redhat.com>
+Date: Wed, 2 Apr 2014 12:54:38 +0200
+Subject: [PATCH 3/3] Do not create symblic link for cisco plugin
+
+Fixes: rhbz#1078284
+---
+ manifests/plugins/cisco.pp | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/manifests/plugins/cisco.pp b/manifests/plugins/cisco.pp
+index eedac84..f00c24d 100644
+--- a/manifests/plugins/cisco.pp
++++ b/manifests/plugins/cisco.pp
+@@ -169,13 +169,13 @@ class neutron::plugins::cisco(
+ 'keystone/tenant' : value => $keystone_tenant;
+ }
+
+- if $::osfamily == 'Redhat' {
+- file {'/etc/neutron/plugin.ini':
+- ensure => link,
+- target => '/etc/neutron/plugins/cisco/cisco_plugins.ini',
+- require => Package['neutron-plugin-cisco'],
+- }
+- }
++# if $::osfamily == 'Redhat' {
++# file {'/etc/neutron/plugin.ini':
++# ensure => link,
++# target => '/etc/neutron/plugins/cisco/cisco_plugins.ini',
++# require => Package['neutron-plugin-cisco'],
++# }
++# }
+
+
+ }
+--
+1.8.5.3
+
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index c4095f8..092e5b6 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -37,7 +37,7 @@
Name: openstack-puppet-modules
Version: 2014.1
-Release: 5.4%{?dist}
+Release: 5.5%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
@@ -88,6 +88,10 @@ Patch6: openstack.patch
Patch7: cinder.patch
Patch8: keystone.patch
Patch9: nova.patch
+Patch10: 0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch
+Patch11: 0002-Change-dhcp_lease_duration-to-Havana-default-of-8640.patch
+Patch12: 0003-Do-not-create-symblic-link-for-cisco-plugin.patch
+Patch13: puppet-neutron-vlan_ranges.patch
BuildArch: noarch
@@ -155,6 +159,10 @@ cd %{_builddir}/%{name}-%{version}/puppet-heat-%{heat_commit}
# puppet-neutron patches
cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
%patch5 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
# puppet-openstack patches
cd %{_builddir}/%{name}-%{version}/puppet-openstack-%{openstack_commit}
@@ -227,6 +235,11 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Wed Apr 2 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-5.5
+- Added 0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch (rhbz#1066549)
+- Added 0002-Change-dhcp_lease_duration-to-Havana-default-of-8640.patch (rhbz#1082505)
+- Added 0003-Do-not-create-symblic-link-for-cisco-plugin.patch (rhbz#1080442)
+
* Mon Mar 31 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-5.4
- Added cinder.patch, nova.patch and keystone.patch utf8 charset patches
diff --git a/puppet-neutron-vlan_ranges.patch b/puppet-neutron-vlan_ranges.patch
new file mode 100644
index 0000000..b7730fe
--- /dev/null
+++ b/puppet-neutron-vlan_ranges.patch
@@ -0,0 +1,32 @@
+From 265498fcf59bd2e787bb01361999771b4ec4e833 Mon Sep 17 00:00:00 2001
+From: Martin Magr <mmagr at redhat.com>
+Date: Wed, 19 Feb 2014 14:25:51 +0100
+Subject: [PATCH] Don't be too strict for vlan_ranges
+
+VLAN range can be also in format of physical network or with only
+single ID. This patch makes those values pass the validation
+
+For more info please check https://bugzilla.redhat.com/show_bug.cgi?id=1066549
+
+Change-Id: I054fbd45ac2228a3a579c08cdd617d970abcaddf
+(cherry picked from commit 8fd57075d13e7c4e84e66378e2490eb02f3a00c1)
+---
+ lib/puppet/parser/functions/validate_network_vlan_ranges.rb | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/puppet/parser/functions/validate_network_vlan_ranges.rb b/lib/puppet/parser/functions/validate_network_vlan_ranges.rb
+index 013ee08..f363ef5 100644
+--- a/lib/puppet/parser/functions/validate_network_vlan_ranges.rb
++++ b/lib/puppet/parser/functions/validate_network_vlan_ranges.rb
+@@ -36,6 +36,9 @@ module Puppet::Parser::Functions
+ if ((second_id - first_id) < 0 )
+ raise Puppet::Error, "network vlan ranges are invalid."
+ end
++ elsif m = /^([^:]+)?(:\d+)?$/.match(range)
++ # Either only name of physical network or single vlan id has
++ # been passed. This is also correct.
+ elsif range
+ raise Puppet::Error, "network vlan ranges are invalid."
+ end
+--
+1.8.5.3
More information about the scm-commits
mailing list