From feba2086be3d8cd9280f5181a4bac4341413936f Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Tue, 28 Apr 2015 22:28:39 +0200
Subject: [PATCH] Autohelp: update the scripts for the juno/kilo diff

* include sahara
* remove the keystoneclient workaround
* ignore a problematic neutron import
* handle "None" values

Change-Id: I8f342dcb39f5ddd69b73baec2ecb1f3c6883c01a
---
 autogenerate_config_docs/autohelp-wrapper | 9 ---------
 autogenerate_config_docs/autohelp.py      | 6 ++++--
 autogenerate_config_docs/diff_branches.py | 3 ++-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/autogenerate_config_docs/autohelp-wrapper b/autogenerate_config_docs/autohelp-wrapper
index 0ee82f4a..01b96f6c 100755
--- a/autogenerate_config_docs/autohelp-wrapper
+++ b/autogenerate_config_docs/autohelp-wrapper
@@ -76,15 +76,6 @@ setup_tools() {
 
     # autohelp.py requires this
     pip install oslo.i18n lxml
-
-    # This is a workaround to avoid pulling in new configuration options brought
-    # by python-keystoneclient >= 0.8. This version also deprecates some options
-    # still expected by the projects. The release of version 0.8 happened too
-    # late in the icehouse release cycle to let the doc team handle the changes
-    # properly in the documentation.
-    if echo $BRANCH | grep -q stable/; then
-        pip install "python-keystoneclient==0.7"
-    fi
 }
 
 while getopts :b:e:cf opt; do
diff --git a/autogenerate_config_docs/autohelp.py b/autogenerate_config_docs/autohelp.py
index 1f4632da..5446cdac 100755
--- a/autogenerate_config_docs/autohelp.py
+++ b/autogenerate_config_docs/autohelp.py
@@ -51,7 +51,8 @@ IGNORE = [
     'trove.guestagent.datastore.experimental.postgresql.service.root',
     'trove.guestagent.datastore.experimental.postgresql.service.users',
     'glance.contrib.plugins.image_artifact.setup',
-    'glance.contrib.plugins.artifacts_sample.setup'
+    'glance.contrib.plugins.artifacts_sample.setup',
+    'neutron.plugins.ml2.drivers.cisco.nexus.type_nexus_vxlan'
 ]
 
 
@@ -351,9 +352,10 @@ class OptionsCache(object):
             deprecated_opts = [{'group': deprecated.group,
                                 'name': deprecated.name}
                                for deprecated in option.deprecated_opts]
+            help_str = option.help.strip() if option.help else "None"
             new_option = {
                 'default': option.default,
-                'help': option.help.strip(),
+                'help': help_str,
                 'deprecated_opts': deprecated_opts,
                 'type': option.__class__.__name__.split('.')[-1]
             }
diff --git a/autogenerate_config_docs/diff_branches.py b/autogenerate_config_docs/diff_branches.py
index 3a495969..af430a4e 100755
--- a/autogenerate_config_docs/diff_branches.py
+++ b/autogenerate_config_docs/diff_branches.py
@@ -27,7 +27,7 @@ from lxml import etree
 
 
 PROJECTS = ['ceilometer', 'cinder', 'glance', 'heat', 'keystone', 'neutron',
-            'nova', 'swift', 'trove']
+            'nova', 'sahara', 'swift', 'trove']
 MASTER_RELEASE = 'Kilo'
 CODENAME_TITLE = {'ceilometer': 'Telemetry',
                   'cinder': 'OpenStack Block Storage',
@@ -36,6 +36,7 @@ CODENAME_TITLE = {'ceilometer': 'Telemetry',
                   'keystone': 'OpenStack Identity',
                   'neutron': 'OpenStack Networking',
                   'nova': 'OpenStack Compute',
+                  'sahara': 'Data Processing service',
                   'swift': 'OpenStack Object Storage',
                   'trove': 'Database service'}