From 887619269afd8da241daf145996327ca7e7d0dec Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 19 May 2015 15:00:52 +0000 Subject: Neutron: add back the custom configuration Add back the custom configuration for Neutron, this time adapted for the OpenStack Kilo release. --- openstack/usr/share/openstack/neutron/neutron.conf | 66 ++++++++++++++-------- 1 file changed, 42 insertions(+), 24 deletions(-) (limited to 'openstack/usr/share/openstack/neutron/neutron.conf') diff --git a/openstack/usr/share/openstack/neutron/neutron.conf b/openstack/usr/share/openstack/neutron/neutron.conf index ee42954b..33c6398a 100644 --- a/openstack/usr/share/openstack/neutron/neutron.conf +++ b/openstack/usr/share/openstack/neutron/neutron.conf @@ -29,7 +29,7 @@ # (not user_stderr) and (not log_file) -> stdout # publish_errors -> notification system -# use_syslog = False +use_syslog = True # syslog_log_facility = LOG_USER # use_stderr = True @@ -57,7 +57,7 @@ # previous versions, the class name of a plugin can be specified instead of its # entrypoint name. # -# core_plugin = +core_plugin = ml2 # Example: core_plugin = ml2 # (ListOpt) List of service plugin entrypoints to be loaded from the @@ -66,7 +66,7 @@ # with previous versions, the class name of a plugin can be specified instead # of its entrypoint name. # -# service_plugins = +service_plugins = router # Example: service_plugins = router,firewall,lbaas,vpnaas,metering # Paste configuration file @@ -81,7 +81,7 @@ # The strategy to be used for auth. # Supported values are 'keystone'(default), 'noauth'. -# auth_strategy = keystone +auth_strategy = keystone # Base MAC address. The first 3 octets will remain unchanged. If the # 4h octet is not 00, it will also be used. The others will be @@ -118,7 +118,7 @@ # Enable or disable overlapping IPs for subnets # Attention: the following parameter MUST be set to False if Neutron is # being used in conjunction with nova security groups -# allow_overlapping_ips = False +allow_overlapping_ips = True # Ensure that configured gateway is on subnet. For IPv6, validate only if # gateway is not a link local address. Deprecated, to be removed during the # K release, at which point the check will be mandatory. @@ -334,14 +334,14 @@ # ======== neutron nova interactions ========== # Send notification to nova when port status is active. -# notify_nova_on_port_status_changes = True +notify_nova_on_port_status_changes = True # Send notifications to nova when port data (fixed_ips/floatingips) change # so nova can update it's cache. -# notify_nova_on_port_data_changes = True +notify_nova_on_port_data_changes = True # URL for connection to nova (Only supports one nova region currently). -# nova_url = http://127.0.0.1:8774/v2 +nova_url = http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region # nova_region_name = @@ -450,7 +450,7 @@ # The RabbitMQ broker port where a single node is used. # (integer value) -# rabbit_port=5672 +# rabbit_port =5672 # RabbitMQ HA cluster host:port pairs. (list value) # rabbit_hosts=$rabbit_host:$rabbit_port @@ -531,7 +531,7 @@ # Driver or drivers to handle sending notifications. (multi # valued) -# notification_driver= +notification_driver = neutron.openstack.common.notifier.rpc_notifier # AMQP topic used for OpenStack notifications. (list value) # Deprecated group/name - [rpc_notifier2]/topics @@ -547,7 +547,7 @@ # The messaging driver to use, defaults to rabbit. Other # drivers include qpid and zmq. (string value) -# rpc_backend=rabbit +rpc_backend = rabbit # The default exchange under which topics are scoped. May be # overridden by an exchange name specified in the @@ -660,7 +660,7 @@ # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real # root filter facility. # Change to "sudo" to skip the filtering and just run the command directly -# root_helper = sudo +root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf # Set to true to add comments to generated iptables rules that describe # each rule's purpose. (System must support the iptables comments module.) @@ -691,11 +691,11 @@ # =========== end of items for agent management extension ===== [keystone_authtoken] -auth_uri = http://127.0.0.1:35357/v2.0/ -identity_uri = http://127.0.0.1:5000 -admin_tenant_name = %SERVICE_TENANT_NAME% -admin_user = %SERVICE_USER% -admin_password = %SERVICE_PASSWORD% +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 +admin_tenant_name = service +admin_user = {{ NEUTRON_SERVICE_USER }} +admin_password = {{ NEUTRON_SERVICE_PASSWORD }} [database] # This line MUST be changed to actually run the plugin. @@ -703,7 +703,8 @@ admin_password = %SERVICE_PASSWORD% # 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 # main neutron server. (Leave it as is if the database runs on this host.) -# connection = sqlite:// +connection=postgresql://{{ NEUTRON_DB_USER }}:{{ NEUTRON_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/neutron + # NOTE: In deployment the [database] section and its connection attribute may # be set in the corresponding core plugin '.ini' file. However, it is suggested # to put the [database] section and its connection attribute in this @@ -747,7 +748,7 @@ admin_password = %SERVICE_PASSWORD% [nova] # Name of the plugin to load -# auth_plugin = +auth_plugin = password # Config Section from which to load plugin specific options # auth_section = @@ -765,11 +766,28 @@ admin_password = %SERVICE_PASSWORD% # keyfile = # Name of nova region to use. Useful if keystone manages more than one region. -# region_name = +region_name = regionOne # Timeout value for http requests # timeout = +# Authorization URL for connection to nova in admin context. +auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0 + +# Username for connection to nova in admin context +username = {{ NOVA_SERVICE_USER }} + +# Password for connection to nova in admin context. +password = {{ NOVA_SERVICE_PASSWORD }} + +# The uuid of the admin nova tenant +# tenant_id = + +# The name of the admin nova tenant. If the uuid of the admin nova tenant +# is set, this is optional. Useful for cases where the uuid of the admin +# nova tenant is not available when configuration is being done. +tenant_name = service + [oslo_concurrency] # Directory to use for lock files. For security, the specified directory should @@ -956,11 +974,11 @@ lock_path = $state_path/lock # The RabbitMQ broker address where a single node is used. (string value) # Deprecated group/name - [DEFAULT]/rabbit_host -# rabbit_host = localhost +rabbit_host = {{ RABBITMQ_HOST }} # The RabbitMQ broker port where a single node is used. (integer value) # Deprecated group/name - [DEFAULT]/rabbit_port -# rabbit_port = 5672 +rabbit_port = {{ RABBITMQ_PORT }} # RabbitMQ HA cluster host:port pairs. (list value) # Deprecated group/name - [DEFAULT]/rabbit_hosts @@ -972,11 +990,11 @@ lock_path = $state_path/lock # The RabbitMQ userid. (string value) # Deprecated group/name - [DEFAULT]/rabbit_userid -# rabbit_userid = guest +rabbit_userid = {{ RABBITMQ_USER }} # The RabbitMQ password. (string value) # Deprecated group/name - [DEFAULT]/rabbit_password -# rabbit_password = guest +rabbit_password = {{ RABBITMQ_PASSWORD }} # The RabbitMQ login method. (string value) # Deprecated group/name - [DEFAULT]/rabbit_login_method -- cgit v1.2.1