Merge "Edits for nova.conf.sample"

openstack · Sep 19, 2013 · 50482be · 50482be
2 parents ded3bd1 + 344d870
commit 50482be
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
@@ -458,8 +458,8 @@
 # Options defined in nova.api.openstack.compute.contrib.os_tenant_networks
 #
 
-# Enables or disables quotaing of tenant networks (boolean
-# value)
+# Enables or disables quota checking for tenant networks
+# (boolean value)
 #enable_network_quota=false
 
 # Control for checking for default networks (string value)
@@ -1125,11 +1125,11 @@
 # the port for the metadata api port (integer value)
 #metadata_port=8775
 
-# Regular expression to match iptables rule that shouldalways
+# Regular expression to match iptables rule that should always
 # be on the top. (string value)
 #iptables_top_regex=
 
-# Regular expression to match iptables rule that shouldalways
+# Regular expression to match iptables rule that should always
 # be on the bottom. (string value)
 #iptables_bottom_regex=
 

diff --git a/nova/api/openstack/compute/contrib/os_tenant_networks.py b/nova/api/openstack/compute/contrib/os_tenant_networks.py
@@ -36,7 +36,8 @@
     os_network_opts = [
         cfg.BoolOpt("enable_network_quota",
                     default=False,
-                    help="Enables or disables quotaing of tenant networks"),
+                    help=('Enables or disables quota checking for tenant '
+                          'networks')),
         cfg.StrOpt('use_neutron_default_nets',
                          default="False",
                          deprecated_name='use_quantum_default_nets',

diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
@@ -112,11 +112,11 @@
                help='the port for the metadata api port'),
     cfg.StrOpt('iptables_top_regex',
                default='',
-               help='Regular expression to match iptables rule that should'
+               help='Regular expression to match iptables rule that should '
                     'always be on the top.'),
     cfg.StrOpt('iptables_bottom_regex',
                default='',
-               help='Regular expression to match iptables rule that should'
+               help='Regular expression to match iptables rule that should '
                     'always be on the bottom.'),
     cfg.StrOpt('iptables_drop_action',
                default='DROP',