Fix the config sample generation

* add missed cache and auth_token oslo config entrypoints.
* make placement and shellinabox config options can be recognized.

Change-Id: Ic277ebfe02616db3aca7623d404cf64494d82993
Closes-Bug: #1709275

mogan/conf/opts.py

@@ -20,8 +20,10 @@ import mogan.conf.glance
 import mogan.conf.ironic
 import mogan.conf.keystone
 import mogan.conf.neutron
+import mogan.conf.placement
 import mogan.conf.quota
 import mogan.conf.scheduler
+import mogan.conf.shellinabox
 
 _default_opt_lists = [
     mogan.conf.default.api_opts,
@@ -39,9 +41,11 @@ _opts = [
     ('glance', mogan.conf.glance.opts),
     ('ironic', mogan.conf.ironic.ironic_opts),
     ('keystone', mogan.conf.keystone.opts),
-    ('neutron', mogan.conf.neutron.opts),
+    ('neutron', mogan.conf.neutron.list_opts()),
+    ('placement', mogan.conf.placement.list_opts()),
     ('quota', mogan.conf.quota.quota_opts),
     ('scheduler', mogan.conf.scheduler.opts),
+    ('shellinabox_console', mogan.conf.shellinabox.shellinabox_opts),
 ]
 
 

mogan/conf/placement.py

@@ -10,9 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from keystoneauth1 import loading as ks_loading
 from oslo_config import cfg
 
+from mogan.conf import auth
+
 placement_group = cfg.OptGroup(
     'placement',
     title='Placement Service Options',
@@ -39,15 +40,8 @@ service catalog.
 def register_opts(conf):
     conf.register_group(placement_group)
     conf.register_opts(placement_opts, group=placement_group)
-    ks_loading.register_session_conf_options(conf, placement_group.name)
+    auth.register_auth_opts(conf, placement_group.name)
-    ks_loading.register_auth_conf_options(conf, placement_group.name)
 
 
 def list_opts():
-    return {
+    return auth.add_auth_opts(placement_opts)
-        placement_group.name: (
-            placement_opts +
-            ks_loading.get_session_conf_options() +
-            ks_loading.get_auth_common_conf_options() +
-            ks_loading.get_auth_plugin_conf_options('v3password'))
-    }

mogan/conf/shellinabox.py

@@ -97,19 +97,15 @@ Interdependencies to other options:
   section.
 """)
 
-ALL_OPTS = [shellinaboxproxy_host_opt, shellinaboxproxy_port_opt,
+shellinabox_opts = [shellinaboxproxy_host_opt, shellinaboxproxy_port_opt,
-            shellinabox_base_url_opt]
+                    shellinabox_base_url_opt]
 
 
 def register_opts(conf):
     conf.register_group(shellinabox_opt_group)
-    conf.register_opts(ALL_OPTS, group=shellinabox_opt_group)
+    conf.register_opts(shellinabox_opts, group=shellinabox_opt_group)
 
 
 def register_cli_opts(conf):
     conf.register_group(shellinabox_opt_group)
-    conf.register_cli_opts(ALL_OPTS, shellinabox_opt_group)
+    conf.register_cli_opts(shellinabox_opts, shellinabox_opt_group)
-
-
-def list_opts():
-    return {shellinabox_opt_group: ALL_OPTS}

tools/config/mogan-config-generator.conf

@@ -2,6 +2,7 @@
 output_file = etc/mogan/mogan.conf.sample
 wrap_width = 62
 namespace = mogan
+namespace = oslo.cache
 namespace = oslo.db
 namespace = oslo.messaging
 namespace = oslo.middleware.cors
@@ -12,3 +13,4 @@ namespace = oslo.reports
 namespace = oslo.service.service
 namespace = oslo.service.periodic_task
 namespace = oslo.service.sslutils
+namespace = keystonemiddleware.auth_token