Merge "Move to new single heat.conf model"

This commit is contained in:
Jenkins 2013-09-15 02:34:20 +00:00 committed by Gerrit Code Review
commit cf8e20e5a9
6 changed files with 712 additions and 219 deletions

View File

@ -32,7 +32,6 @@ $venvs/glance/bin/glance-manage db_sync
os-db-create heat heat $db_pass
$venvs/heat/bin/heat-manage db_sync
chown heat:heat /var/log/heat/engine.log
os-db-create ovs_neutron neutron $db_pass

View File

@ -1,46 +0,0 @@
[DEFAULT]
# Show more verbose log output (sets INFO log level output)
verbose = True
# Show debugging output in logs (sets DEBUG log level output)
debug = True
# Address to bind the server to
bind_host = 0.0.0.0
# Port the bind the server to
bind_port = 8000
# Turn off standard error logging
use_stderr = False
# Log to this file. Make sure the user running heat-api-cfn has
# permissions to write to this file!
log_file = /var/log/heat/api-cfn.log
# ================= Syslog Options ============================
# Send logs to syslog (/dev/log) instead of to file specified
# by `log_file`
use_syslog = False
# Facility to use. If unset defaults to LOG_USER.
# syslog_log_facility = LOG_LOCAL0
rpc_backend=heat.openstack.common.rpc.impl_kombu
[keystone_authtoken]
auth_host = {{keystone.host}}
auth_port = 35357
auth_protocol = http
auth_uri = http://{{keystone.host}}:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = {{heat.admin_tenant_name}}
admin_user = {{heat.admin_user}}
admin_password = {{heat.admin_password}}
[ec2authtoken]
auth_uri = http://{{keystone.host}}:5000/v2.0
keystone_ec2_uri = http://{{keystone.host}}:5000/v2.0/ec2tokens

View File

@ -1,47 +0,0 @@
[DEFAULT]
rabbit_password = {{rabbit.password}}
rabbit_host = {{rabbit.host}}
# Show more verbose log output (sets INFO log level output)
verbose = True
# Show debugging output in logs (sets DEBUG log level output)
debug = False
# Turn off standard error logging
use_stderr = False
# Log to this file. Make sure the user running heat-api has
# permissions to write to this file!
log_file = /var/log/heat/api-cloudwatch.log
# Send logs to syslog (/dev/log) instead of to file specified
# by `log_file`
use_syslog = False
# Facility to use. If unset defaults to LOG_USER.
# syslog_log_facility = LOG_LOCAL0
# Address to bind the server to
bind_host = 0.0.0.0
# Port the bind the server to
bind_port = 8003
rpc_backend = heat.openstack.common.rpc.impl_kombu
[keystone_authtoken]
auth_host = {{keystone.host}}
auth_port = 35357
auth_protocol = http
auth_uri = http://{{keystone.host}}:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = {{heat.admin_tenant_name}}
admin_user = {{heat.admin_user}}
admin_password = {{heat.admin_password}}
[ec2authtoken]
auth_uri = http://{{keystone.host}}:5000/v2.0
keystone_ec2_uri = http://{{keystone.host}}:5000/v2.0/ec2tokens

View File

@ -1,48 +0,0 @@
[DEFAULT]
rabbit_password = {{rabbit.password}}
rabbit_host = {{rabbit.host}}
# Show more verbose log output (sets INFO log level output)
verbose = True
# Show debugging output in logs (sets DEBUG log level output)
debug = False
# Turn off standard error logging
use_stderr = False
# Log to this file. Make sure the user running heat-api-cfn has
# permissions to write to this file!
log_file = /var/log/heat/api.log
# Send logs to syslog (/dev/log) instead of to file specified
# by `log_file`
use_syslog = False
# Facility to use. If unset defaults to LOG_USER.
# syslog_log_facility = LOG_LOCAL0
# Address to bind the server to
bind_host = 0.0.0.0
# Port the bind the server to
bind_port = 8004
rpc_backend=heat.openstack.common.rpc.impl_kombu
# Uncomment to deploy different flavor of heat-api pipeline:
# [paste_deploy]
# flavor = custombackend
[keystone_authtoken]
auth_host = {{keystone.host}}
auth_port = 35357
auth_protocol = http
auth_uri = http://{{keystone.host}}:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = {{heat.admin_tenant_name}}
admin_user = {{heat.admin_user}}
admin_password = {{heat.admin_password}}

View File

@ -1,77 +0,0 @@
{{#heat}}
[DEFAULT]
{{#rabbit}}
rabbit_password = {{password}}
rabbit_host = {{host}}
{{/rabbit}}
# Show more verbose log output (sets INFO log level output)
verbose = True
# Show debugging output in logs (sets DEBUG log level output)
debug = False
# Turn off standard error logging
use_stderr = False
# Log to this file. Make sure the user running heat-api has
# permissions to write to this file!
log_file = /var/log/heat/engine.log
# Send logs to syslog (/dev/log) instead of to file specified
# by `log_file`
use_syslog = False
# Facility to use. If unset defaults to LOG_USER.
# syslog_log_facility = LOG_LOCAL0
# Keystone role for heat template-defined users
heat_stack_user_role = heat_stack_user
# Make instances connect to the heat services via https
# default to off since it will require images and host
# to be configured correctly to support ssl connections
instance_connection_is_secure = 0
# If is_secure is set to 1, certificate validation can
# be enabled or disabled
instance_connection_https_validate_certificates = 1
instance_user = heat-admin
# URL for instances to connect for metadata
# ie the IP of the bridge device connecting the
# instances with the host and the bind_port of
# the CFN API
# NOTE : change this from 127.0.0.1 !!
heat_metadata_server_url = {{metadata_server_url}}
# URL for instances to connect for notification
# of waitcondition events (ie via cfn-signal)
# e.g the IP of the bridge device connecting the
# instances with the host and the bind_port of
# the CFN API
# NOTE : change this from 127.0.0.1 !!
heat_waitcondition_server_url = {{waitcondition_server_url}}
# URL for instances to connect for publishing metric
# data (ie via cfn-push-stats)
# e.g the IP of the bridge device connecting the
# instances with the host and the bind_port of
# the heat-api-cloudwatch API
# NOTE : change this from 127.0.0.1 !!
heat_watch_server_url = {{watch_server_url}}
# The namespace for the custom backend. Must provide class Clients which will be
# imported. Defaults to OpenStack if none provided.
# cloud_backend=deltacloud_heat.client
sql_connection = {{db}}
db_backend = heat.db.sqlalchemy.api
rpc_backend = heat.openstack.common.rpc.impl_kombu
auth_encryption_key = {{auth_encryption_key}}
{{/heat}}

View File

@ -0,0 +1,712 @@
[DEFAULT]
#
# Options defined in heat.common.config
#
verbose = True
debug = False
# The SQLAlchemy connection string used to connect to the
# database (string value)
sql_connection = {{heat.db}}
# timeout before idle sql connections are reaped (integer
# value)
#sql_idle_timeout=3600
# The default user for new instances (string value)
instance_user=heat-admin
# Driver to use for controlling instances (string value)
#instance_driver=heat.engine.nova
# List of directories to search for Plugins (list value)
#plugin_dirs=/usr/lib64/heat,/usr/lib/heat
# The directory to search for environment files (string value)
#environment_dir=/etc/heat/environment.d
# Select deferred auth method, stored password or trusts
# (string value)
#deferred_auth_method=password
# Subset of trustor roles to be delegated to heat (list value)
#trusts_delegated_roles=heat_stack_owner
# Name of the engine node. This can be an opaque identifier.It
# is not necessarily a hostname, FQDN, or IP address. (string
# value)
#host=heat
# seconds between running periodic tasks (integer value)
#periodic_interval=60
# URL of the Heat metadata server (string value)
heat_metadata_server_url = {{metadata_server_url}}
# URL of the Heat waitcondition server (string value)
heat_waitcondition_server_url = {{waitcondition_server_url}}
# URL of the Heat cloudwatch server (string value)
heat_watch_server_url = {{watch_server_url}}
# Instance connection to cfn/cw API via https (string value)
#instance_connection_is_secure=0
# Instance connection to cfn/cw API validate certs if ssl
# (string value)
#instance_connection_https_validate_certificates=1
# Keystone role for heat template-defined users (string value)
#heat_stack_user_role=heat_stack_user
# Maximum raw byte size of any template. (integer value)
#max_template_size=524288
# Maximum depth allowed when using nested stacks. (integer
# value)
#max_nested_stack_depth=3
#
# Options defined in heat.common.crypt
#
# Encryption key used for authentication info in database
# (string value)
auth_encryption_key = {{heat.auth_encryption_key}}
#
# Options defined in heat.db.api
#
# The backend to use for db (string value)
#db_backend=sqlalchemy
#
# Options defined in heat.engine.clients
#
# Cloud module to use as a backend. Defaults to OpenStack.
# (string value)
#cloud_backend=<None>
#
# Options defined in heat.openstack.common.db.sqlalchemy.session
#
# the filename to use with sqlite (string value)
#sqlite_db=heat.sqlite
# If true, use synchronous mode for sqlite (boolean value)
#sqlite_synchronous=true
#
# Options defined in heat.openstack.common.eventlet_backdoor
#
# Enable eventlet backdoor. Acceptable values are 0, <port>,
# and <start>:<end>, where 0 results in listening on a random
# tcp port number; <port> results in listening on the
# specified port number (and not enabling backdoor if that
# port is in use); and <start>:<end> results in listening on
# the smallest unused port number within the specified range
# of port numbers. The chosen port is displayed in the
# service's log file. (string value)
#backdoor_port=<None>
#
# Options defined in heat.openstack.common.lockutils
#
# Whether to disable inter-process locks (boolean value)
#disable_process_locking=false
# Directory to use for lock files. (string value)
#lock_path=<None>
#
# Options defined in heat.openstack.common.log
#
# Print debugging output (set logging level to DEBUG instead
# of default WARNING level). (boolean value)
#debug=false
# Print more verbose output (set logging level to INFO instead
# of default WARNING level). (boolean value)
#verbose=false
# Log output to standard error (boolean value)
#use_stderr=true
# format string to use for log messages with context (string
# value)
#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user)s %(tenant)s] %(instance)s%(message)s
# format string to use for log messages without context
# (string value)
#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
# data to append to log format when level is DEBUG (string
# value)
#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d
# prefix each line of exception output with this format
# (string value)
#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
# list of logger=LEVEL pairs (list value)
#default_log_levels=amqplib=WARN,sqlalchemy=WARN,boto=WARN,suds=INFO,keystone=INFO,eventlet.wsgi.server=WARN
# publish error events (boolean value)
#publish_errors=false
# make deprecations fatal (boolean value)
#fatal_deprecations=false
# If an instance is passed with the log message, format it
# like this (string value)
#instance_format="[instance: %(uuid)s] "
# If an instance UUID is passed with the log message, format
# it like this (string value)
#instance_uuid_format="[instance: %(uuid)s] "
# If this option is specified, the logging configuration file
# specified is used and overrides any other logging options
# specified. Please see the Python logging module
# documentation for details on logging configuration files.
# (string value)
#log_config=<None>
# DEPRECATED. A logging.Formatter log message format string
# which may use any of the available logging.LogRecord
# attributes. This option is deprecated. Please use
# logging_context_format_string and
# logging_default_format_string instead. (string value)
#log_format=<None>
# Format string for %%(asctime)s in log records. Default:
# %(default)s (string value)
#log_date_format=%Y-%m-%d %H:%M:%S
# (Optional) Name of log file to output to. If no default is
# set, logging will go to stdout. (string value)
#log_file=<None>
# (Optional) The base directory used for relative --log-file
# paths (string value)
#log_dir=<None>
# Use syslog for logging. (boolean value)
#use_syslog=false
# syslog facility to receive log lines (string value)
#syslog_log_facility=LOG_USER
#
# Options defined in heat.openstack.common.notifier.api
#
# Driver or drivers to handle sending notifications (multi
# valued)
#notification_driver=
# Default notification level for outgoing notifications
# (string value)
#default_notification_level=INFO
# Default publisher_id for outgoing notifications (string
# value)
#default_publisher_id=<None>
#
# Options defined in heat.openstack.common.notifier.list_notifier
#
# List of drivers to send notifications (multi valued)
#list_notifier_drivers=heat.openstack.common.notifier.no_op_notifier
#
# Options defined in heat.openstack.common.notifier.rpc_notifier
#
# AMQP topic used for openstack notifications (list value)
#notification_topics=notifications
#
# Options defined in heat.openstack.common.policy
#
# JSON file containing policy (string value)
#policy_file=policy.json
# Rule enforced when requested rule is not found (string
# value)
#policy_default_rule=default
#
# Options defined in heat.openstack.common.rpc
#
# The messaging module to use, defaults to kombu. (string
# value)
#rpc_backend=heat.openstack.common.rpc.impl_kombu
# Size of RPC thread pool (integer value)
#rpc_thread_pool_size=64
# Size of RPC connection pool (integer value)
#rpc_conn_pool_size=30
# Seconds to wait for a response from call or multicall
# (integer value)
#rpc_response_timeout=60
# Seconds to wait before a cast expires (TTL). Only supported
# by impl_zmq. (integer value)
#rpc_cast_timeout=30
# Modules of exceptions that are permitted to be recreatedupon
# receiving exception data from an rpc call. (list value)
#allowed_rpc_exception_modules=heat.openstack.common.exception,heat.common.exception,nova.exception,cinder.exception,exceptions
# If passed, use a fake RabbitMQ provider (boolean value)
#fake_rabbit=false
# AMQP exchange to connect to if using RabbitMQ or Qpid
# (string value)
#control_exchange=openstack
#
# Options defined in heat.openstack.common.rpc.amqp
#
# Use durable queues in amqp. (boolean value)
#amqp_durable_queues=false
# Auto-delete queues in amqp. (boolean value)
#amqp_auto_delete=false
#
# Options defined in heat.openstack.common.rpc.impl_kombu
#
# SSL version to use (valid only if SSL enabled). valid values
# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some
# distributions (string value)
#kombu_ssl_version=
# SSL key file (valid only if SSL enabled) (string value)
#kombu_ssl_keyfile=
# SSL cert file (valid only if SSL enabled) (string value)
#kombu_ssl_certfile=
# SSL certification authority file (valid only if SSL enabled)
# (string value)
#kombu_ssl_ca_certs=
# The RabbitMQ broker address where a single node is used
# (string value)
rabbit_host = {{rabbit.host}}
# The RabbitMQ broker port where a single node is used
# (integer value)
#rabbit_port=5672
# RabbitMQ HA cluster host:port pairs (list value)
#rabbit_hosts=$rabbit_host:$rabbit_port
# connect over SSL for RabbitMQ (boolean value)
#rabbit_use_ssl=false
# the RabbitMQ userid (string value)
#rabbit_userid=guest
# the RabbitMQ password (string value)
rabbit_password = {{rabbit.password}}
# the RabbitMQ virtual host (string value)
#rabbit_virtual_host=/
# how frequently to retry connecting with RabbitMQ (integer
# value)
#rabbit_retry_interval=1
# how long to backoff for between retries when connecting to
# RabbitMQ (integer value)
#rabbit_retry_backoff=2
# maximum retries with trying to connect to RabbitMQ (the
# default of 0 implies an infinite retry count) (integer
# value)
#rabbit_max_retries=0
# use H/A queues in RabbitMQ (x-ha-policy: all).You need to
# wipe RabbitMQ database when changing this option. (boolean
# value)
#rabbit_ha_queues=false
#
# Options defined in heat.openstack.common.rpc.impl_qpid
#
# Qpid broker hostname (string value)
#qpid_hostname=localhost
# Qpid broker port (integer value)
#qpid_port=5672
# Qpid HA cluster host:port pairs (list value)
#qpid_hosts=$qpid_hostname:$qpid_port
# Username for qpid connection (string value)
#qpid_username=
# Password for qpid connection (string value)
#qpid_password=
# Space separated list of SASL mechanisms to use for auth
# (string value)
#qpid_sasl_mechanisms=
# Seconds between connection keepalive heartbeats (integer
# value)
#qpid_heartbeat=60
# Transport to use, either 'tcp' or 'ssl' (string value)
#qpid_protocol=tcp
# Disable Nagle algorithm (boolean value)
#qpid_tcp_nodelay=true
# The qpid topology version to use. Version 1 is what was
# originally used by impl_qpid. Version 2 includes some
# backwards-incompatible changes that allow broker federation
# to work. Users should update to version 2 when they are
# able to take everything down, as it requires a clean break.
# (integer value)
#qpid_topology_version=1
#
# Options defined in heat.openstack.common.rpc.impl_zmq
#
# ZeroMQ bind address. Should be a wildcard (*), an ethernet
# interface, or IP. The "host" option should point or resolve
# to this address. (string value)
#rpc_zmq_bind_address=*
# MatchMaker driver (string value)
#rpc_zmq_matchmaker=heat.openstack.common.rpc.matchmaker.MatchMakerLocalhost
# ZeroMQ receiver listening port (integer value)
#rpc_zmq_port=9501
# Number of ZeroMQ contexts, defaults to 1 (integer value)
#rpc_zmq_contexts=1
# Maximum number of ingress messages to locally buffer per
# topic. Default is unlimited. (integer value)
#rpc_zmq_topic_backlog=<None>
# Directory for holding IPC sockets (string value)
#rpc_zmq_ipc_dir=/var/run/openstack
# Name of this node. Must be a valid hostname, FQDN, or IP
# address. Must match "host" option, if running Nova. (string
# value)
#rpc_zmq_host=heat
#
# Options defined in heat.openstack.common.rpc.matchmaker
#
# Heartbeat frequency (integer value)
#matchmaker_heartbeat_freq=300
# Heartbeat time-to-live. (integer value)
#matchmaker_heartbeat_ttl=600
[ssl]
#
# Options defined in heat.openstack.common.sslutils
#
# CA certificate file to use to verify connecting clients
# (string value)
#ca_file=<None>
# Certificate file to use when starting the server securely
# (string value)
#cert_file=<None>
# Private key file to use when starting the server securely
# (string value)
#key_file=<None>
[database]
#
# Options defined in heat.openstack.common.db.api
#
# The backend to use for db (string value)
#backend=sqlalchemy
# Enable the experimental use of thread pooling for all DB API
# calls (boolean value)
#use_tpool=false
#
# Options defined in heat.openstack.common.db.sqlalchemy.session
#
# The SQLAlchemy connection string used to connect to the
# database (string value)
#connection=sqlite:////heat/openstack/common/db/$sqlite_db
# The SQLAlchemy connection string used to connect to the
# slave database (string value)
#slave_connection=
# timeout before idle sql connections are reaped (integer
# value)
#idle_timeout=3600
# Minimum number of SQL connections to keep open in a pool
# (integer value)
#min_pool_size=1
# Maximum number of SQL connections to keep open in a pool
# (integer value)
#max_pool_size=<None>
# maximum db connection retries during startup. (setting -1
# implies an infinite retry count) (integer value)
#max_retries=10
# interval between retries of opening a sql connection
# (integer value)
#retry_interval=10
# If set, use this value for max_overflow with sqlalchemy
# (integer value)
#max_overflow=<None>
# Verbosity of SQL debugging information. 0=None,
# 100=Everything (integer value)
#connection_debug=0
# Add python stack traces to SQL as comment strings (boolean
# value)
#connection_trace=false
# If set, use this value for pool_timeout with sqlalchemy
# (integer value)
#pool_timeout=<None>
[paste_deploy]
#
# Options defined in heat.common.config
#
# The flavor to use (string value)
#flavor=<None>
# The API paste config file to use (string value)
#api_paste_config=api-paste.ini
[rpc_notifier2]
#
# Options defined in heat.openstack.common.notifier.rpc_notifier2
#
# AMQP topic(s) used for openstack notifications (list value)
#topics=notifications
[keystone_authtoken]
auth_host = {{keystone.host}}
auth_port = 35357
auth_protocol = http
auth_uri = http://{{keystone.host}}:5000/v2.0
# These must be set to your local values in order for the token
# authentication to work.
admin_tenant_name = {{heat.admin_tenant_name}}
admin_user = {{heat.admin_user}}
admin_password = {{heat.admin_password}}
[ec2authtoken]
#
# Options defined in heat.api.aws.ec2token
#
# Authentication Endpoint URI (string value)
#auth_uri=<None>
auth_uri = http://{{keystone.host}}:5000/v2.0
# Allow orchestration of multiple clouds (boolean value)
#multi_cloud=false
# Allowed keystone endpoints for auth_uri when multi_cloud is
# enabled. At least one endpoint needs to be specified. (list
# value)
#allowed_auth_uris=
[heat_api_cloudwatch]
#
# Options defined in heat.common.wsgi
#
# Address to bind the server. Useful when selecting a
# particular network interface. (string value)
#bind_host=0.0.0.0
# The port on which the server will listen. (integer value)
#bind_port=8003
# Number of backlog requests to configure the socket with
# (integer value)
#backlog=4096
# Location of the SSL Certificate File to use for SSL mode
# (string value)
#cert_file=<None>
# Location of the SSL Key File to use for enabling SSL mode
# (string value)
#key_file=<None>
# Number of workers for Heat service (integer value)
#workers=0
[heat_api]
#
# Options defined in heat.common.wsgi
#
# Address to bind the server. Useful when selecting a
# particular network interface. (string value)
#bind_host=0.0.0.0
# The port on which the server will listen. (integer value)
#bind_port=8004
# Number of backlog requests to configure the socket with
# (integer value)
#backlog=4096
# Location of the SSL Certificate File to use for SSL mode
# (string value)
#cert_file=<None>
# Location of the SSL Key File to use for enabling SSL mode
# (string value)
#key_file=<None>
# Number of workers for Heat service (integer value)
#workers=0
[heat_api_cfn]
#
# Options defined in heat.common.wsgi
#
# Address to bind the server. Useful when selecting a
# particular network interface. (string value)
#bind_host=0.0.0.0
# The port on which the server will listen. (integer value)
#bind_port=8000
# Number of backlog requests to configure the socket with
# (integer value)
#backlog=4096
# Location of the SSL Certificate File to use for SSL mode
# (string value)
#cert_file=<None>
# Location of the SSL Key File to use for enabling SSL mode
# (string value)
#key_file=<None>
# Number of workers for Heat service (integer value)
#workers=0
[auth_password]
#
# Options defined in heat.common.config
#
# Allow orchestration of multiple clouds (boolean value)
#multi_cloud=false
# Allowed keystone endpoints for auth_uri when multi_cloud is
# enabled. At least one endpoint needs to be specified. (list
# value)
#allowed_auth_uris=
[matchmaker_ring]
#
# Options defined in heat.openstack.common.rpc.matchmaker_ring
#
# Matchmaker ring file (JSON) (string value)
#ringfile=/etc/oslo/matchmaker_ring.json
[matchmaker_redis]
#
# Options defined in heat.openstack.common.rpc.matchmaker_redis
#
# Host to locate redis (string value)
#host=127.0.0.1
# Use this port to connect to redis host. (integer value)
#port=6379
# Password for Redis server. (optional) (string value)
#password=<None>