From 0162588ebdb9ed93a54521918ced755dbc0dbaa8 Mon Sep 17 00:00:00 2001
From: houming-wang <houming.wang@easystack.cn>
Date: Wed, 2 Dec 2015 04:41:03 -0500
Subject: [PATCH] Register neutron client option

1. Register neutron_client_opts
2. Updated config sample to include neutron opts

Change-Id: I97fd1f25dbe7e8d07620ede0ea7b25acadb2e432
Patially-Implements: blueprint api-parameter-validation
---
 etc/magnum/magnum.conf.sample | 15 +++++++++++++++
 magnum/opts.py                |  1 +
 2 files changed, 16 insertions(+)

diff --git a/etc/magnum/magnum.conf.sample b/etc/magnum/magnum.conf.sample
index bf0ee0eecf..2125d79c0f 100644
--- a/etc/magnum/magnum.conf.sample
+++ b/etc/magnum/magnum.conf.sample
@@ -861,6 +861,21 @@
 #password =
 
 
+[neutron_client]
+
+#
+# From magnum
+#
+
+# Region in Identity service catalog to use for communication with the
+# OpenStack service. (string value)
+#region_name = <None>
+
+# Type of endpoint in Identity service catalog to use for
+# communication with the OpenStack service. (string value)
+#endpoint_type = publicURL
+
+
 [nova_client]
 
 #
diff --git a/magnum/opts.py b/magnum/opts.py
index 8656ec492a..4f5bd3740f 100644
--- a/magnum/opts.py
+++ b/magnum/opts.py
@@ -51,6 +51,7 @@ def list_opts():
         ('glance_client', magnum.common.clients.glance_client_opts),
         ('barbican_client', magnum.common.clients.barbican_client_opts),
         ('nova_client', magnum.common.clients.nova_client_opts),
+        ('neutron_client', magnum.common.clients.neutron_client_opts),
         ('x509', magnum.common.x509.config.x509_opts),
         ('bay_heat', magnum.conductor.handlers.bay_conductor.bay_heat_opts),
         ('certificates',