diff --git a/neutron/agent/securitygroups_rpc.py b/neutron/agent/securitygroups_rpc.py
index ffdc21fd22..04d6ef50ea 100644
--- a/neutron/agent/securitygroups_rpc.py
+++ b/neutron/agent/securitygroups_rpc.py
@@ -28,7 +28,8 @@ SG_RPC_VERSION = "1.1"
 security_group_opts = [
     cfg.StrOpt(
         'firewall_driver',
-        default='neutron.agent.firewall.NoopFirewallDriver')
+        default='neutron.agent.firewall.NoopFirewallDriver',
+        help=_('Driver for Security Groups Firewall'))
 ]
 cfg.CONF.register_opts(security_group_opts, 'SECURITYGROUP')
 
diff --git a/neutron/common/config.py b/neutron/common/config.py
index 3796488d76..6bbe080b73 100644
--- a/neutron/common/config.py
+++ b/neutron/common/config.py
@@ -86,7 +86,10 @@ core_opts = [
 ]
 
 core_cli_opts = [
-    cfg.StrOpt('state_path', default='/var/lib/neutron'),
+    cfg.StrOpt('state_path',
+               default='/var/lib/neutron',
+               help=_("Where to store Neutron state files. "
+                      "This directory must be writable by the agent.")),
 ]
 
 # Register the configuration options
diff --git a/neutron/plugins/bigswitch/plugin.py b/neutron/plugins/bigswitch/plugin.py
index 31add796eb..feb78650f6 100644
--- a/neutron/plugins/bigswitch/plugin.py
+++ b/neutron/plugins/bigswitch/plugin.py
@@ -136,7 +136,9 @@ for i in portbindings.VIF_TYPES:
     nova_opts.append(opt)
 
 # Add the vif types for reference later
-nova_opts.append(cfg.ListOpt('vif_types', default=portbindings.VIF_TYPES))
+nova_opts.append(cfg.ListOpt('vif_types',
+                             default=portbindings.VIF_TYPES,
+                             help=_('List of allowed vif_type values.')))
 
 cfg.CONF.register_opts(nova_opts, "NOVA")