openstack
/
neutron-fwaas
Code Issues Proposed changes

Merge "rename quantum into neutron"

This commit is contained in:
Jenkins 2013-07-18 04:08:23 +00:00 committed by Gerrit Code Review
parent 7efd7957a2 4a01e35f3f
commit 1bd456371f
13 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
etc/neutron.conf
View File

@ -5,9 +5,9 @@
# debug = False # debug = False
# verbose = False # verbose = False
# Where to store Quantum state files. This directory must be writable by the # Where to store Neutron state files. This directory must be writable by the
# user executing the agent. # user executing the agent.
# state_path = /var/lib/quantum # state_path = /var/lib/neutron
# Where to store lock files # Where to store lock files
lock_path = $state_path/lock lock_path = $state_path/lock
@ -40,11 +40,11 @@ bind_port = 9696
# Path to the extensions. Note that this can be a colon-separated list of # Path to the extensions. Note that this can be a colon-separated list of
# paths. For example: # paths. For example:
# api_extensions_path = extensions:/path/to/more/extensions:/even/more/extensions # api_extensions_path = extensions:/path/to/more/extensions:/even/more/extensions
# The __path__ of quantum.extensions is appended to this, so if your # The __path__ of neutron.extensions is appended to this, so if your
# extensions are in there you don't need to specify them here # extensions are in there you don't need to specify them here
# api_extensions_path = # api_extensions_path =
# Quantum plugin provider module # Neutron plugin provider module
# core_plugin = # core_plugin =
# Advanced service modules # Advanced service modules
@ -81,7 +81,7 @@ api_paste_config = api-paste.ini
# Enable or disable sorting # Enable or disable sorting
# allow_sorting = False # allow_sorting = False
# Enable or disable overlapping IPs for subnets # Enable or disable overlapping IPs for subnets
# Attention: the following parameter MUST be set to False if Quantum is # Attention: the following parameter MUST be set to False if Neutron is
# being used in conjunction with nova security groups # being used in conjunction with nova security groups
# allow_overlapping_ips = False # allow_overlapping_ips = False
# Ensure that configured gateway is on subnet # Ensure that configured gateway is on subnet
@ -90,7 +90,7 @@ api_paste_config = api-paste.ini
# RPC configuration options. Defined in rpc __init__ # RPC configuration options. Defined in rpc __init__
# The messaging module to use, defaults to kombu. # The messaging module to use, defaults to kombu.
# rpc_backend = quantum.openstack.common.rpc.impl_kombu # rpc_backend = neutron.openstack.common.rpc.impl_kombu
# Size of RPC thread pool # Size of RPC thread pool
# rpc_thread_pool_size = 64, # rpc_thread_pool_size = 64,
# Size of RPC connection pool # Size of RPC connection pool
@ -101,9 +101,9 @@ api_paste_config = api-paste.ini
# rpc_cast_timeout = 30 # rpc_cast_timeout = 30
# Modules of exceptions that are permitted to be recreated # Modules of exceptions that are permitted to be recreated
# upon receiving exception data from an rpc call. # upon receiving exception data from an rpc call.
# allowed_rpc_exception_modules = quantum.openstack.common.exception, nova.exception # allowed_rpc_exception_modules = neutron.openstack.common.exception, nova.exception
# AMQP exchange to connect to if using RabbitMQ or QPID # AMQP exchange to connect to if using RabbitMQ or QPID
control_exchange = quantum # control_exchange = neutron
# If passed, use a fake RabbitMQ provider # If passed, use a fake RabbitMQ provider
# fake_rabbit = False # fake_rabbit = False
@ -141,7 +141,7 @@ control_exchange = quantum
# rabbit_ha_queues = false # rabbit_ha_queues = false
# QPID # QPID
# rpc_backend=quantum.openstack.common.rpc.impl_qpid # rpc_backend=neutron.openstack.common.rpc.impl_qpid
# Qpid broker hostname # Qpid broker hostname
# qpid_hostname = localhost # qpid_hostname = localhost
# Qpid broker port # Qpid broker port
@ -163,7 +163,7 @@ control_exchange = quantum
# qpid_tcp_nodelay = True # qpid_tcp_nodelay = True
# ZMQ # ZMQ
# rpc_backend=quantum.openstack.common.rpc.impl_zmq # rpc_backend=neutron.openstack.common.rpc.impl_zmq
# ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. # ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP.
# The "host" option should point or resolve to this address. # The "host" option should point or resolve to this address.
# rpc_zmq_bind_address = * # rpc_zmq_bind_address = *
@ -177,11 +177,11 @@ control_exchange = quantum
# Notification_driver can be defined multiple times # Notification_driver can be defined multiple times
# Do nothing driver # Do nothing driver
# notification_driver = quantum.openstack.common.notifier.no_op_notifier # notification_driver = neutron.openstack.common.notifier.no_op_notifier
# Logging driver # Logging driver
# notification_driver = quantum.openstack.common.notifier.log_notifier # notification_driver = neutron.openstack.common.notifier.log_notifier
# RPC driver. DHCP agents needs it. # RPC driver. DHCP agents needs it.
notification_driver = quantum.openstack.common.notifier.rpc_notifier notification_driver = neutron.openstack.common.notifier.rpc_notifier
# default_notification_level is used to form actual topic name(s) or to set logging level # default_notification_level is used to form actual topic name(s) or to set logging level
default_notification_level = INFO default_notification_level = INFO
@ -217,17 +217,17 @@ notification_topics = notifications
# =========== items for agent scheduler extension ============= # =========== items for agent scheduler extension =============
# Driver to use for scheduling network to DHCP agent # Driver to use for scheduling network to DHCP agent
# network_scheduler_driver = quantum.scheduler.dhcp_agent_scheduler.ChanceScheduler # network_scheduler_driver = neutron.scheduler.dhcp_agent_scheduler.ChanceScheduler
# Driver to use for scheduling router to a default L3 agent # Driver to use for scheduling router to a default L3 agent
# router_scheduler_driver = quantum.scheduler.l3_agent_scheduler.ChanceScheduler # router_scheduler_driver = neutron.scheduler.l3_agent_scheduler.ChanceScheduler
# Allow auto scheduling networks to DHCP agent. It will schedule non-hosted # Allow auto scheduling networks to DHCP agent. It will schedule non-hosted
# networks to first DHCP agent which sends get_active_networks message to # networks to first DHCP agent which sends get_active_networks message to
# quantum server # neutron server
# network_auto_schedule = True # network_auto_schedule = True
# Allow auto scheduling routers to L3 agent. It will schedule non-hosted # Allow auto scheduling routers to L3 agent. It will schedule non-hosted
# routers to first L3 agent which sends sync_routers message to quantum server # routers to first L3 agent which sends sync_routers message to neutron server
# router_auto_schedule = True # router_auto_schedule = True
# Number of DHCP agents scheduled to host a network. This enables redundant # Number of DHCP agents scheduled to host a network. This enables redundant
@ -286,7 +286,7 @@ notification_topics = notifications
# quota_security_group_rule = 100 # quota_security_group_rule = 100
# default driver to use for quota checks # default driver to use for quota checks
# quota_driver = quantum.quota.ConfDriver # quota_driver = neutron.quota.ConfDriver
[default_servicetype] [default_servicetype]
# Description of the default service type (optional) # Description of the default service type (optional)
@ -297,7 +297,7 @@ notification_topics = notifications
# <service>:<plugin>[:driver] # <service>:<plugin>[:driver]
[agent] [agent]
# Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
# root filter facility. # root filter facility.
# Change to "sudo" to skip the filtering and just run the comand directly # Change to "sudo" to skip the filtering and just run the comand directly
# root_helper = sudo # root_helper = sudo
@ -316,20 +316,20 @@ auth_protocol = http
admin_tenant_name = %SERVICE_TENANT_NAME% admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER% admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD% admin_password = %SERVICE_PASSWORD%
signing_dir = /var/lib/quantum/keystone-signing signing_dir = $state_path/keystone-signing
[lbaas] [lbaas]
# ================================================================================================== # ==================================================================================================
# driver_fqn is the fully qualified name of the lbaas driver that will be loaded by the lbass plugin # driver_fqn is the fully qualified name of the lbaas driver that will be loaded by the lbass plugin
# ================================================================================================== # ==================================================================================================
#driver_fqn = quantum.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver #driver_fqn = neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver
[database] [database]
# This line MUST be changed to actually run the plugin. # This line MUST be changed to actually run the plugin.
# Example: # Example:
# connection = mysql://root:pass@127.0.0.1:3306/quantum # connection = mysql://root:pass@127.0.0.1:3306/neutron
# Replace 127.0.0.1 above with the IP address of the database used by the # Replace 127.0.0.1 above with the IP address of the database used by the
# main quantum server. (Leave it as is if the database runs on this host.) # main neutron server. (Leave it as is if the database runs on this host.)
# connection = sqlite:// # connection = sqlite://
# The SQLAlchemy connection string used to connect to the slave database # The SQLAlchemy connection string used to connect to the slave database

2
etc/neutron/plugins/bigswitch/restproxy.ini
View File

@ -1,4 +1,4 @@
# Config file for quantum-proxy-plugin. # Config file for neutron-proxy-plugin.
[restproxy] [restproxy]
# All configuration for this plugin is in section '[restproxy]' # All configuration for this plugin is in section '[restproxy]'

2
etc/neutron/plugins/brocade/brocade.ini
View File

@ -24,7 +24,7 @@
[agent] [agent]
# Example: # Example:
# root_helper = sudo /usr/local/bin/quantum-rootwrap /etc/quantum/rootwrap.conf # root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
[linux_bridge] [linux_bridge]
# physical_interface_mappings = <physical network name>:<local interface> # physical_interface_mappings = <physical network name>:<local interface>

4
etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
View File

@ -43,10 +43,10 @@
# Sample Configurations. # Sample Configurations.
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# #
# Quantum server: # Neutron server:
# #
# [database] # [database]
# connection = mysql://root:nova@127.0.0.1:3306/hyperv_quantum # connection = mysql://root:nova@127.0.0.1:3306/hyperv_neutron
# [HYPERV] # [HYPERV]
# tenant_network_type = vlan # tenant_network_type = vlan
# network_vlan_ranges = default:2000:3999 # network_vlan_ranges = default:2000:3999

6
etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
View File

@ -42,6 +42,6 @@
# Example: rpc_support_old_agents = False # Example: rpc_support_old_agents = False
[securitygroup] [securitygroup]
# Firewall driver for realizing quantum security group function # Firewall driver for realizing neutron security group function
# firewall_driver = quantum.agent.firewall.NoopFirewallDriver # firewall_driver = neutron.agent.firewall.NoopFirewallDriver
# Example: firewall_driver = quantum.agent.linux.iptables_firewall.IptablesFirewallDriver # Example: firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver

6
etc/neutron/plugins/metaplugin/metaplugin.ini
View File

@ -1,9 +1,9 @@
[meta] [meta]
## This is list of flavor:quantum_plugins ## This is list of flavor:neutron_plugins
# extension method is used in the order of this list # extension method is used in the order of this list
plugin_list= 'openvswitch:quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2,linuxbridge:quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2' plugin_list= 'openvswitch:neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2,linuxbridge:neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2'
l3_plugin_list= 'openvswitch:quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2,linuxbridge:quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2' l3_plugin_list= 'openvswitch:neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2,linuxbridge:neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2'
# Default value of flavor # Default value of flavor
default_flavor = 'openvswitch' default_flavor = 'openvswitch'

2
etc/neutron/plugins/ml2/ml2_conf.ini
View File

@ -1,7 +1,7 @@
[ml2] [ml2]
# (ListOpt) List of network type driver entrypoints to be loaded from # (ListOpt) List of network type driver entrypoints to be loaded from
# the quantum.ml2.type_drivers namespace. # the neutron.ml2.type_drivers namespace.
# #
# type_drivers = local,flat,vlan,gre,vxlan # type_drivers = local,flat,vlan,gre,vxlan
# Example: type_drivers = flat,vlan,gre,vxlan # Example: type_drivers = flat,vlan,gre,vxlan

8
etc/neutron/plugins/nec/nec.ini
View File

@ -11,20 +11,20 @@ integration_bridge = br-int
[agent] [agent]
# Agent's polling interval in seconds # Agent's polling interval in seconds
polling_interval = 2 polling_interval = 2
# Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
# root filter facility. # root filter facility.
# Change to "sudo" to skip the filtering and just run the comand directly # Change to "sudo" to skip the filtering and just run the comand directly
root_helper = sudo root_helper = sudo
[securitygroup] [securitygroup]
# Firewall driver for realizing quantum security group function # Firewall driver for realizing neutron security group function
firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
[ofc] [ofc]
# Specify OpenFlow Controller Host, Port and Driver to connect. # Specify OpenFlow Controller Host, Port and Driver to connect.
host = 127.0.0.1 host = 127.0.0.1
port = 8888 port = 8888
# Drivers are in quantum/plugins/nec/drivers/ . # Drivers are in neutron/plugins/nec/drivers/ .
driver = trema driver = trema
# PacketFilter is available when it's enabled in this configuration # PacketFilter is available when it's enabled in this configuration
# and supported by the driver. # and supported by the driver.

4
etc/neutron/plugins/nicira/nvp.ini
View File

@ -41,7 +41,7 @@
# nvp_controllers = xx.yy.zz.ww:443, aa.bb.cc.dd, ee.ff.gg.hh.ee:80 # nvp_controllers = xx.yy.zz.ww:443, aa.bb.cc.dd, ee.ff.gg.hh.ee:80
# UUID of the pre-existing default NVP Transport zone to be used for creating # UUID of the pre-existing default NVP Transport zone to be used for creating
# tunneled isolated "Quantum" networks. This option MUST be specified, e.g.: # tunneled isolated "Neutron" networks. This option MUST be specified, e.g.:
# default_tz_uuid = 1e8e52cf-fa7f-46b0-a14a-f99835a9cb53 # default_tz_uuid = 1e8e52cf-fa7f-46b0-a14a-f99835a9cb53
# (Optional) UUID of the cluster in NVP. It can be retrieved from NVP management # (Optional) UUID of the cluster in NVP. It can be retrieved from NVP management
@ -78,7 +78,7 @@
# Acceptable values for 'metadata_mode' are: # Acceptable values for 'metadata_mode' are:
# - 'access_network': this enables a dedicated connection to the metadata # - 'access_network': this enables a dedicated connection to the metadata
# proxy for metadata server access via Quantum router. # proxy for metadata server access via Neutron router.
# - 'dhcp_host_route': this enables host route injection via the dhcp agent. # - 'dhcp_host_route': this enables host route injection via the dhcp agent.
# This option is only useful if running on a host that does not support # This option is only useful if running on a host that does not support
# namespaces otherwise access_network should be used. # namespaces otherwise access_network should be used.

10
etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
View File

@ -108,9 +108,9 @@
# Example: vxlan_udp_port = 8472 # Example: vxlan_udp_port = 8472
[securitygroup] [securitygroup]
# Firewall driver for realizing quantum security group function. # Firewall driver for realizing neutron security group function.
# firewall_driver = quantum.agent.firewall.NoopFirewallDriver # firewall_driver = neutron.agent.firewall.NoopFirewallDriver
# Example: firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver # Example: firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Sample Configurations. # Sample Configurations.
@ -118,7 +118,7 @@
# #
# 1. With VLANs on eth1. # 1. With VLANs on eth1.
# [database] # [database]
# connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum # connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
# [OVS] # [OVS]
# network_vlan_ranges = default:2000:3999 # network_vlan_ranges = default:2000:3999
# tunnel_id_ranges = # tunnel_id_ranges =
@ -129,7 +129,7 @@
# #
# 2. With tunneling. # 2. With tunneling.
# [database] # [database]
# connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum # connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
# [OVS] # [OVS]
# network_vlan_ranges = # network_vlan_ranges =
# tunnel_id_ranges = 1:1000 # tunnel_id_ranges = 1:1000

2
etc/neutron/plugins/plumgrid/plumgrid.ini
View File

@ -1,4 +1,4 @@
# Config file for Quantum PLUMgrid plugin # Config file for Neutron PLUMgrid plugin
[plumgridnos] [plumgridnos]
# This line should be pointing to the NOS server, # This line should be pointing to the NOS server,

4
etc/neutron/plugins/ryu/ryu.ini
View File

@ -33,8 +33,8 @@ tunnel_interface = eth0
ovsdb_interface = eth0 ovsdb_interface = eth0
[securitygroup] [securitygroup]
# Firewall driver for realizing quantum security group function # Firewall driver for realizing neutron security group function
# firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver # firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
[agent] [agent]
# Agent's polling interval in seconds # Agent's polling interval in seconds

2
etc/rootwrap.conf
View File

@ -4,7 +4,7 @@
[DEFAULT] [DEFAULT]
# List of directories to load filter definitions from (separated by ','). # List of directories to load filter definitions from (separated by ',').
# These directories MUST all be only writeable by root ! # These directories MUST all be only writeable by root !
filters_path=/etc/quantum/rootwrap.d,/usr/share/quantum/rootwrap filters_path=/etc/neutron/rootwrap.d,/usr/share/neutron/rootwrap,/etc/quantum/rootwrap.d,/usr/share/quantum/rootwrap
# List of directories to search executables in, in case filters do not # List of directories to search executables in, in case filters do not
# explicitely specify a full path (separated by ',') # explicitely specify a full path (separated by ',')