From a780b892c675b73819afdf1b0d3ce578d166a9c4 Mon Sep 17 00:00:00 2001
From: Nguyen Van Trung <trungnv@vn.fujitsu.com>
Date: Mon, 12 Jun 2017 00:26:51 +0700
Subject: [PATCH] Fix missing format of impl_infoblox config file

- The 'deprecated_reason' will created if 'deprecated_for_removal=True'
and help='DEPRECATED: <string>'.
- Currently format will be raising 'NoneType' object if we want
to genconfig testenv(in-progress [1]).

[1] https://review.openstack.org/#/c/472770/

Change-Id: I1b542175cb471093787e0ba0947bc5920917f29b
---
 designate/backend/impl_infoblox/config.py | 30 +++++++++++++++--------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/designate/backend/impl_infoblox/config.py b/designate/backend/impl_infoblox/config.py
index 7d804f0c..a9a3fa61 100644
--- a/designate/backend/impl_infoblox/config.py
+++ b/designate/backend/impl_infoblox/config.py
@@ -25,59 +25,69 @@ OPTS = [
         'wapi_url',
         deprecated_for_removal=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file"),
+        "in the pools.yaml file",
+        help='DEPRECATED: wapi_url'),
     cfg.StrOpt(
         'username',
         deprecated_for_removal=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file"),
+        "in the pools.yaml file",
+        help='DEPRECATED: username'),
     cfg.StrOpt(
         'password',
         deprecated_for_removal=True,
         secret=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file"),
+        "in the pools.yaml file",
+        help='DEPRECATED: password'),
     cfg.BoolOpt(
         'sslverify',
         default=True,
         deprecated_for_removal=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file"),
+        "in the pools.yaml file",
+        help='DEPRECATED: sslverify'),
     cfg.BoolOpt(
         'multi_tenant',
         default=False,
         deprecated_for_removal=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file"),
+        "in the pools.yaml file",
+        help='DEPRECATED: multi_tenant'),
     cfg.IntOpt(
         'http_pool_connections',
         default=100,
         deprecated_for_removal=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file"),
+        "in the pools.yaml file",
+        help='DEPRECATED: http_pool_connections'),
     cfg.IntOpt(
         'http_pool_maxsize',
         default=100,
         deprecated_for_removal=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file"),
+        "in the pools.yaml file",
+        help='DEPRECATED: http_pool_maxsize'),
     cfg.StrOpt(
         'dns_view',
         default='default',
         deprecated_for_removal=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file"),
+        "in the pools.yaml file",
+        help='DEPRECATED: dns_view'),
     cfg.StrOpt(
         'network_view',
         default='default',
         deprecated_for_removal=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file"),
+        "in the pools.yaml file",
+        help='DEPRECATED: network_view'),
     cfg.StrOpt(
         'ns_group',
         deprecated_for_removal=True,
         deprecated_reason="All backend options have been migrated to options "
-        "in the pools.yaml file")
+        "in the pools.yaml file",
+        help='DEPRECATED: ns_group'),
 ]
 
 cfg.CONF.register_opts(OPTS, group='backend:infoblox')