From edb4e822a2b96f57b3e35b7dd8d947e58c7a1f46 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 21 May 2015 16:57:44 +0000 Subject: Openstack: Add back the custom configuration for nova Add back the custom configuration for nova adapted for the OpenStack Kilo release. Change-Id: I1af61630c64925fcd468aaae111b8589dc9f9dd5 --- openstack/usr/share/openstack/nova/nova.conf | 134 +++++++++++++-------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/openstack/usr/share/openstack/nova/nova.conf b/openstack/usr/share/openstack/nova/nova.conf index b49f9522..9fc10493 100644 --- a/openstack/usr/share/openstack/nova/nova.conf +++ b/openstack/usr/share/openstack/nova/nova.conf @@ -42,7 +42,7 @@ #rpc_thread_pool_size = 64 # Driver or drivers to handle sending notifications. (multi valued) -#notification_driver = +notification_driver = messagingv2 # AMQP topic used for OpenStack notifications. (list value) # Deprecated group/name - [rpc_notifier2]/topics @@ -58,7 +58,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 transport_url option. (string value) @@ -121,7 +121,7 @@ # # IP address of this host (string value) -#my_ip=10.0.0.1 +my_ip={{ MANAGEMENT_INTERFACE_IP_ADDRESS }} # Block storage IP address of this host (string value) #my_block_storage_ip=$my_ip @@ -145,7 +145,7 @@ # notifications, "vm_state" for notifications on VM state # changes, or "vm_and_task_state" for notifications on VM and # task state changes. (string value) -#notify_on_state_change= +notify_on_state_change=vm_and_task_state # If set, send api.fault notifications on caught exceptions in # the API service. (boolean value) @@ -173,7 +173,7 @@ # Top-level directory for maintaining nova's state (string # value) -#state_path=$pybasedir +state_path=/var/lib/nova # @@ -265,7 +265,7 @@ #periodic_fuzzy_delay=60 # A list of APIs to enable by default (list value) -#enabled_apis=ec2,osapi_compute,metadata +enabled_apis=ec2,osapi_compute,metadata # A list of APIs with enabled SSL (list value) #enabled_ssl_apis= @@ -309,7 +309,7 @@ #metadata_workers= # Full class name for the Manager for compute (string value) -#compute_manager=nova.compute.manager.ComputeManager +compute_manager={{ COMPUTE_MANAGER }} # Full class name for the Manager for console proxy (string # value) @@ -347,11 +347,11 @@ # Time period to generate instance usages for. Time period # must be hour, day, month or year (string value) -#instance_usage_audit_period=month +instance_usage_audit_period=hour # Path to the rootwrap configuration file to use for running # commands as root (string value) -#rootwrap_config=/etc/nova/rootwrap.conf +rootwrap_config=/etc/nova/rootwrap.conf # Explicitly specify the temporary working directory (string # value) @@ -364,7 +364,7 @@ # File name for the paste.deploy config for nova-api (string # value) -#api_paste_config=api-paste.ini +api_paste_config=api-paste.ini # A python format string that is used as the template to # generate log lines. The following values can be formatted @@ -422,7 +422,7 @@ # checking. noauth provides administrative credentials # regardless of the passed in user, noauth2 only does if # 'admin' is specified as the username. (string value) -#auth_strategy=keystone +auth_strategy=keystone # Treat X-Forwarded-For as the canonical remote address. Only # enable this if you have a sanitizing proxy. (boolean value) @@ -587,7 +587,7 @@ # # osapi compute extension to load (multi valued) -#osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions +osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions # @@ -753,7 +753,7 @@ # Generate periodic compute.instance.exists notifications # (boolean value) -#instance_usage_audit=false +instance_usage_audit= True # Number of 1 second retries needed in live_migration (integer # value) @@ -886,7 +886,7 @@ # Amount of memory in MB to reserve for the host (integer # value) -#reserved_host_memory_mb=512 +reserved_host_memory_mb={{ RESERVED_HOST_MEMORY_MB }} # Class that will manage stats for the local compute host # (string value) @@ -982,11 +982,11 @@ # Template string to be used to generate instance names # (string value) -#instance_name_template=instance-%08x +instance_name_template=instance-%08x # Template string to be used to generate snapshot names # (string value) -#snapshot_name_template=snapshot-%s +snapshot_name_template=snapshot-%s # @@ -1050,7 +1050,7 @@ # The full class name of the network API class to use (string # value) -#network_api_class=nova.network.api.API +network_api_class=nova.network.neutronv2.api.API # @@ -1168,7 +1168,7 @@ #dnsmasq_config_file= # Driver used to create ethernet devices. (string value) -#linuxnet_interface_driver=nova.network.linux_net.LinuxBridgeInterfaceDriver +linuxnet_interface_driver=nova.network.linux_net.LinuxOVSInterfaceDriver # Name of Open vSwitch bridge used with linuxnet (string # value) @@ -1328,7 +1328,7 @@ # # The full class name of the security API class (string value) -#security_group_api=nova +security_group_api=neutron # @@ -1401,7 +1401,7 @@ # Use syslog for logging. Existing syslog format is DEPRECATED during I, and # will change in J to honor RFC5424. (boolean value) -#use_syslog = false +use_syslog = True # (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, # prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The @@ -1474,7 +1474,7 @@ # # The scheduler host manager class to use (string value) -#scheduler_host_manager=nova.scheduler.host_manager.HostManager +scheduler_host_manager={{ SCHEDULER_HOST_MANAGER }} # @@ -1566,7 +1566,7 @@ # for RamFilter. For AggregateRamFilter, it will fall back to # this configuration value if no per-aggregate setting found. # (floating point value) -#ram_allocation_ratio=1.5 +ram_allocation_ratio={{ RAM_ALLOCATION_RATIO }} # @@ -1581,7 +1581,7 @@ # Which filter class names to use for filtering hosts when not # specified in the request. (list value) -#scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter +scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter # Which weight class names to use for weighing hosts (list # value) @@ -1610,7 +1610,7 @@ # # Default driver to use for the scheduler (string value) -#scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler +scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler # How often (in seconds) to run periodic tasks in the # scheduler driver of your choice. Please note this is likely @@ -1725,7 +1725,7 @@ # include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, # fake.FakeDriver, baremetal.BareMetalDriver, # vmwareapi.VMwareVCDriver, hyperv.HyperVDriver (string value) -#compute_driver= +compute_driver={{ COMPUTE_DRIVER }} # The default format an ephemeral_volume will be formatted # with on creation. (string value) @@ -1756,7 +1756,7 @@ # Firewall driver (defaults to hypervisor specific iptables # driver) (string value) -#firewall_driver= +firewall_driver=nova.virt.firewall.NoopFirewallDriver # Whether to allow network traffic from same network (boolean # value) @@ -1816,7 +1816,7 @@ # Location of VNC console proxy, in the form # "http://127.0.0.1:6080/vnc_auto.html" (string value) -#novncproxy_base_url=http://127.0.0.1:6080/vnc_auto.html +novncproxy_base_url=http://{{ MANAGEMENT_INTERFACE_IP_ADDRESS }}:6080/vnc_auto.html # Location of nova xvp VNC console proxy, in the form # "http://127.0.0.1:6081/console" (string value) @@ -1824,17 +1824,17 @@ # IP address on which instance vncservers should listen # (string value) -#vncserver_listen=127.0.0.1 +vncserver_listen=0.0.0.0 # The address to which proxy clients (like nova-xvpvncproxy) # should connect (string value) -#vncserver_proxyclient_address=127.0.0.1 +vncserver_proxyclient_address={{ MANAGEMENT_INTERFACE_IP_ADDRESS }} # Enable VNC related features (boolean value) -#vnc_enabled=true +vnc_enabled=true # Keymap for VNC (string value) -#vnc_keymap=en-us +vnc_keymap=en-us # @@ -1926,7 +1926,7 @@ # The SQLAlchemy connection string to use to connect to the # Nova API database. (string value) -#connection= +#connection=postgresql://{{ NOVA_DB_USER }}:{{ NOVA_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/nova # If True, SQLite uses synchronous mode. (boolean value) #sqlite_synchronous=true @@ -2172,7 +2172,7 @@ # # Perform nova-conductor operations locally (boolean value) -#use_local=false +use_local=true # The topic on which conductor nodes listen (string value) #topic=conductor @@ -2210,6 +2210,7 @@ # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection = +connection=postgresql://{{ NOVA_DB_USER }}:{{ NOVA_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/nova # The SQLAlchemy connection string to use to connect to the slave database. # (string value) @@ -2330,19 +2331,19 @@ # # Default glance hostname or IP address (string value) -#host=$my_ip +host={{ CONTROLLER_HOST_ADDRESS }} # Default glance port (integer value) -#port=9292 +port=9292 # Default protocol to use when connecting to glance. Set to # https for SSL. (string value) -#protocol=http +protocol=http # A list of the glance api servers available to nova. Prefix # with https:// for ssl-based glance api servers. # ([hostname|ip]:port) (list value) -#api_servers= +api_servers=$host:$port # Allow to perform insecure SSL (https) requests to glance # (boolean value) @@ -2485,19 +2486,19 @@ #api_version=1 # URL for Ironic API endpoint. (string value) -#api_endpoint= +api_endpoint=http://{{ CONTROLLER_HOST_ADDRESS }}:6385/v1 # Ironic keystone admin name (string value) -#admin_username= +admin_username={{ IRONIC_SERVICE_USER }} # Ironic keystone admin password. (string value) -#admin_password= +admin_password={{ IRONIC_SERVICE_PASSWORD }} # Ironic keystone auth token. (string value) #admin_auth_token= # Keystone public API endpoint. (string value) -#admin_url= +admin_url=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0 # Log level override for ironicclient. Set this in order to # override the global "default_log_levels", "verbose", and @@ -2506,7 +2507,7 @@ #client_log_level= # Ironic keystone tenant name. (string value) -#admin_tenant_name= +admin_tenant_name=service # How many retries when a request does conflict. (integer # value) @@ -2544,10 +2545,10 @@ # # Complete public Identity API endpoint. (string value) -#auth_uri = +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 # API version of the admin Identity API endpoint. (string value) -#auth_version = +auth_version = v2.0 # Do not handle authorization requests within the middleware, but delegate the # authorization decision to downstream WSGI components. (boolean value) @@ -2678,7 +2679,7 @@ # Complete admin Identity API endpoint. This should specify the unversioned # root endpoint e.g. https://localhost:35357/ (string value) -#identity_uri = +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 # This option is deprecated and may be removed in a future release. Single # shared secret with the Keystone configuration used for bootstrapping a @@ -2688,13 +2689,13 @@ #admin_token = # Service username. (string value) -#admin_user = +admin_user = {{ NOVA_SERVICE_USER }} # Service user password. (string value) -#admin_password = +admin_password = {{ NOVA_SERVICE_PASSWORD }} # Service tenant name. (string value) -#admin_tenant_name = admin +admin_tenant_name = service [libvirt] @@ -2715,7 +2716,7 @@ # Libvirt domain type (valid options are: kvm, lxc, qemu, uml, # xen and parallels) (string value) -#virt_type=kvm +virt_type={{ NOVA_VIRT_TYPE }} # Override the default libvirt URI (which is dependent on # virt_type) (string value) @@ -3028,11 +3029,11 @@ # Set flag to indicate Neutron will proxy metadata requests # and resolve instance ids. (boolean value) -#service_metadata_proxy=false +service_metadata_proxy=True # Shared secret to validate proxies Neutron metadata requests # (string value) -#metadata_proxy_shared_secret= +metadata_proxy_shared_secret={{ METADATA_PROXY_SHARED_SECRET }} # @@ -3040,7 +3041,7 @@ # # URL for connecting to neutron (string value) -#url=http://127.0.0.1:9696 +url=http://{{ CONTROLLER_HOST_ADDRESS }}:9696 # User id for connecting to neutron in admin context. # DEPRECATED: specify an auth_plugin and appropriate @@ -3050,12 +3051,12 @@ # Username for connecting to neutron in admin context # DEPRECATED: specify an auth_plugin and appropriate # credentials instead. (string value) -#admin_username= +admin_username={{ NEUTRON_SERVICE_USER }} # Password for connecting to neutron in admin context # DEPRECATED: specify an auth_plugin and appropriate # credentials instead. (string value) -#admin_password= +admin_password={{ NEUTRON_SERVICE_PASSWORD }} # Tenant id for connecting to neutron in admin context # DEPRECATED: specify an auth_plugin and appropriate @@ -3067,7 +3068,7 @@ # Note that with Keystone V3 tenant names are only unique # within a domain. DEPRECATED: specify an auth_plugin and # appropriate credentials instead. (string value) -#admin_tenant_name= +admin_tenant_name=service # Region name for connecting to neutron in admin context # (string value) @@ -3076,13 +3077,13 @@ # Authorization URL for connecting to neutron in admin # context. DEPRECATED: specify an auth_plugin and appropriate # credentials instead. (string value) -#admin_auth_url=http://localhost:5000/v2.0 +admin_auth_url=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0 # Authorization strategy for connecting to neutron in admin # context. DEPRECATED: specify an auth_plugin and appropriate # credentials instead. If an auth_plugin is specified strategy # will be ignored. (string value) -#auth_strategy=keystone +auth_strategy=keystone # Name of Integration Bridge used by Open vSwitch (string # value) @@ -3141,7 +3142,7 @@ # # Host on which to listen for incoming requests (string value) -#serialproxy_host=0.0.0.0 +serialproxy_host=127.0.0.1 # Port on which to listen for incoming requests (integer # value) @@ -3153,7 +3154,7 @@ # # Enable serial console related features (boolean value) -#enabled=false +enabled=false # Range of TCP ports to use for serial ports on compute hosts # (string value) @@ -3202,7 +3203,7 @@ #server_proxyclient_address=127.0.0.1 # Enable spice related features (boolean value) -#enabled=false +enabled=false # Enable spice guest agent support (boolean value) #agent_enabled=true @@ -3783,7 +3784,7 @@ # Defaults to environment variable OSLO_LOCK_PATH. If external locks are used, # a lock path must be set. (string value) # Deprecated group/name - [DEFAULT]/lock_path -#lock_path = +lock_path = /var/lock/nova [oslo_messaging_amqp] @@ -3946,11 +3947,11 @@ # 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 @@ -3958,15 +3959,15 @@ # Connect over SSL for RabbitMQ. (boolean value) # Deprecated group/name - [DEFAULT]/rabbit_use_ssl -#rabbit_use_ssl = false +rabbit_use_ssl = false # 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 @@ -4005,4 +4006,3 @@ # Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value) # Deprecated group/name - [DEFAULT]/fake_rabbit #fake_rabbit = false - -- cgit v1.2.1