x/vmware-nsx
Code Issues Proposed changes

Merge "Typo/grammar fixes for the example neutron config file"

Browse Source
This commit is contained in:
Jenkins 2014-02-28 13:13:19 +00:00 committed by Gerrit Code Review
commit 40c65e2133
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc/neutron.conf
View File

@ -31,7 +31,7 @@ lock_path = $state_path/lock
# publish_errors = False # publish_errors = False
# Address to bind the API server # Address to bind the API server to
# bind_host = 0.0.0.0 # bind_host = 0.0.0.0
# Port the bind the API server to # Port the bind the API server to
@ -70,7 +70,7 @@ lock_path = $state_path/lock
# auth_strategy = keystone # auth_strategy = keystone
# Base MAC address. The first 3 octets will remain unchanged. If the # Base MAC address. The first 3 octets will remain unchanged. If the
# 4h octet is not 00, it will also used. The others will be # 4h octet is not 00, it will also be used. The others will be
# randomly generated. # randomly generated.
# 3 octet # 3 octet
# base_mac = fa:16:3e:00:00:00 # base_mac = fa:16:3e:00:00:00
@ -128,7 +128,7 @@ lock_path = $state_path/lock
# kombu_ssl_keyfile = # kombu_ssl_keyfile =
# SSL cert file (valid only if SSL enabled) # SSL cert file (valid only if SSL enabled)
# kombu_ssl_certfile = # kombu_ssl_certfile =
# SSL certification authority file (valid only if SSL enabled)' # SSL certification authority file (valid only if SSL enabled)
# kombu_ssl_ca_certs = # kombu_ssl_ca_certs =
# IP address of the RabbitMQ installation # IP address of the RabbitMQ installation
# rabbit_host = localhost # rabbit_host = localhost
@ -148,7 +148,7 @@ lock_path = $state_path/lock
# rabbit_max_retries = 0 # rabbit_max_retries = 0
# RabbitMQ connection retry interval # RabbitMQ connection retry interval
# rabbit_retry_interval = 1 # rabbit_retry_interval = 1
# Use HA queues in RabbitMQ (x-ha-policy: all).You need to # Use HA queues in RabbitMQ (x-ha-policy: all). You need to
# wipe RabbitMQ database when changing this option. (boolean value) # wipe RabbitMQ database when changing this option. (boolean value)
# rabbit_ha_queues = false # rabbit_ha_queues = false
@ -182,7 +182,7 @@ lock_path = $state_path/lock
# ============ Notification System Options ===================== # ============ Notification System Options =====================
# Notifications can be sent when network/subnet/port are create, updated or deleted. # Notifications can be sent when network/subnet/port are created, updated or deleted.
# There are three methods of sending notifications: logging (via the # There are three methods of sending notifications: logging (via the
# log_file directive), rpc (via a message queue) and # log_file directive), rpc (via a message queue) and
# noop (no notifications sent, the default) # noop (no notifications sent, the default)
@ -208,7 +208,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# Default maximum number of items returned in a single response, # Default maximum number of items returned in a single response,
# value == infinite and value < 0 means no max limit, and value must # value == infinite and value < 0 means no max limit, and value must
# greater than 0. If the number of items requested is greater than # be greater than 0. If the number of items requested is greater than
# pagination_max_limit, server will just return pagination_max_limit # pagination_max_limit, server will just return pagination_max_limit
# of number of items. # of number of items.
# pagination_max_limit = -1 # pagination_max_limit = -1
@ -256,6 +256,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# worker thread in the current process. Greater than 0 launches that number of # worker thread in the current process. Greater than 0 launches that number of
# child processes as workers. The parent process manages them. # child processes as workers. The parent process manages them.
# api_workers = 0 # api_workers = 0
# Sets the value of TCP_KEEPIDLE in seconds to use for each server socket when # Sets the value of TCP_KEEPIDLE in seconds to use for each server socket when
# starting API server. Not supported on OS X. # starting API server. Not supported on OS X.
# tcp_keepidle = 600 # tcp_keepidle = 600
@ -404,9 +405,9 @@ signing_dir = $state_path/keystone-signing
# Specify service providers (drivers) for advanced services like loadbalancer, VPN, Firewall. # Specify service providers (drivers) for advanced services like loadbalancer, VPN, Firewall.
# Must be in form: # Must be in form:
# service_provider=<service_type>:<name>:<driver>[:default] # service_provider=<service_type>:<name>:<driver>[:default]
# List of allowed service type include LOADBALANCER, FIREWALL, VPN # List of allowed service types includes LOADBALANCER, FIREWALL, VPN
# Combination of <service type> and <name> must be unique; <driver> must also be unique # Combination of <service type> and <name> must be unique; <driver> must also be unique
# this is multiline option, example for default provider: # This is multiline option, example for default provider:
# service_provider=LOADBALANCER:name:lbaas_plugin_driver_path:default # service_provider=LOADBALANCER:name:lbaas_plugin_driver_path:default
# example of non-default provider: # example of non-default provider:
# service_provider=FIREWALL:name2:firewall_driver_path # service_provider=FIREWALL:name2:firewall_driver_path