From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 21 Jun 2016 08:41:26 +0000 (+0000)
Subject: Removed Return_oslo_config_Opts_to_config_generator.patch applied upstream.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9931f45894c2e7cf47f1c5e356b92f50ea5b66e1;p=openstack-build%2Fneutron-build.git

Removed Return_oslo_config_Opts_to_config_generator.patch applied upstream.

Rewritten-From: 618684990819f641d0e539b7d02bf031911b471d
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 9d635b253..9c97c9910 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -3,6 +3,7 @@ neutron (2:8.1.2-1) unstable; urgency=medium
   * New upstream release:
     - Fix FTBFS in Jessie (Closes: #827737).
   * Fix neutron-metadata server templates.
+  * Removed Return_oslo_config_Opts_to_config_generator.patch applied upstream.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 21 Jun 2016 10:30:16 +0200
 
diff --git a/trusty/debian/patches/Return_oslo_config_Opts_to_config_generator.patch b/trusty/debian/patches/Return_oslo_config_Opts_to_config_generator.patch
deleted file mode 100644
index c8d4b61e6..000000000
--- a/trusty/debian/patches/Return_oslo_config_Opts_to_config_generator.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Return oslo_config Opts to config generator
- We shouldn't be returning keystoneauth Opts to the oslo_config
- generator. Whilst it mostly works these objects are not interchangable
- and it can result in problems. You can see this by entries such as:
- .
-  # Warning: Failed to format sample for tenant_name
-  # isinstance() arg 2 must be a class, type, or tuple of classes
-    and types
- .
- in the currently generated config files.
- .
- Keystoneauth provides a function that returns oslo_config options so
- fetch, process and return those instead.
-Author: Jamie Lennox <jamielennox@gmail.com>
-Date: Mon, 14 Mar 2016 23:05:29 +0000 (+1100)
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fneutron.git;a=commitdiff_plain;h=c3db0707eff70f381913643891ba4e148977407d
-Change-Id: Ie3fad2381467b19189cbb332c41cea8b6cf6e264
-Bug-Ubuntu: https://bugs.launchpad.net/neutron/+bug/1548433
-Origin: upstream, https://review.openstack.org/#/c/292640/
-Last-Update: 2016-03-22
----
-
-diff --git a/neutron/opts.py b/neutron/opts.py
-index 4166811..23e4796 100644
---- a/neutron/opts.py
-+++ b/neutron/opts.py
-@@ -295,7 +295,7 @@ def list_auth_opts():
-     # the config options for a few common ones
-     plugins = ['password', 'v2password', 'v3password']
-     for name in plugins:
--        for plugin_option in ks_loading.get_plugin_loader(name).get_options():
-+        for plugin_option in ks_loading.get_auth_plugin_conf_options(name):
-             if all(option.name != plugin_option.name for option in opt_list):
-                 opt_list.append(plugin_option)
-     opt_list.sort(key=operator.attrgetter('name'))
diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
deleted file mode 100644
index c0fb46a2a..000000000
--- a/trusty/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Return_oslo_config_Opts_to_config_generator.patch