From fca3d311eac9de3fee50ce7a723bdbdc116ac5ac Mon Sep 17 00:00:00 2001
From: Pádraig Brady
Date: Apr 26 2014 13:49:48 +0000
Subject: remove unused patches
---
diff --git a/0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch b/0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch
deleted file mode 100644
index 37afaab..0000000
--- a/0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From f1eee124575f2ccb33338759126f4d8315034715 Mon Sep 17 00:00:00 2001
-From: Martin Magr
-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
deleted file mode 100644
index e204974..0000000
--- a/0002-Change-dhcp_lease_duration-to-Havana-default-of-8640.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ce310786521f095913fc093ff1ad5e8e2d54dd65 Mon Sep 17 00:00:00 2001
-From: Maish Saidel-Keesing
-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
deleted file mode 100644
index 47aabc1..0000000
--- a/0003-Do-not-create-symblic-link-for-cisco-plugin.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6519a7d27d87cebe43e4ad7c37132a0fdc5bd167 Mon Sep 17 00:00:00 2001
-From: Martin Magr
-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/el7-cinder.patch b/el7-cinder.patch
deleted file mode 100644
index aad0b45..0000000
--- a/el7-cinder.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ruN a/manifests/volume/iscsi.pp b/manifests/volume/iscsi.pp
---- a/manifests/volume/iscsi.pp 2013-11-27 17:40:05.000000000 +0100
-+++ b/manifests/volume/iscsi.pp 2014-03-01 00:58:43.833508034 +0100
-@@ -2,7 +2,7 @@
- class cinder::volume::iscsi (
- $iscsi_ip_address,
- $volume_group = 'cinder-volumes',
-- $iscsi_helper = 'tgtadm'
-+ $iscsi_helper = 'lioadm'
- ) {
-
- include cinder::params
-@@ -38,6 +38,13 @@
- }
- }
-
-+ 'lioadm': {
-+ package { 'targetcli':
-+ ensure => present,
-+ name => 'targetcli',
-+ }
-+ }
-+
- default: {
- fail("Unsupported iscsi helper: ${iscsi_helper}.")
- }
diff --git a/puppet-neutron-vlan_ranges.patch b/puppet-neutron-vlan_ranges.patch
deleted file mode 100644
index b7730fe..0000000
--- a/puppet-neutron-vlan_ranges.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 265498fcf59bd2e787bb01361999771b4ec4e833 Mon Sep 17 00:00:00 2001
-From: Martin Magr
-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