From bc5d3020a7e52a993d6647cc3f88531ff564dc08 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 11 Mar 2015 18:37:16 +0300 Subject: [PATCH] Remove the sahara.conf.sample file This file is not gated anymore and therefore it gets out of date. Replacing it with a README that explains how to generate it. Change-Id: I529b5d73c6936371f4d0af4af738544d608e25ff --- etc/sahara/README-sahara.conf.txt | 4 + etc/sahara/sahara.conf.sample | 950 ------------------------------ tools/config/check_uptodate.sh | 25 - tox.ini | 4 - 4 files changed, 4 insertions(+), 979 deletions(-) create mode 100644 etc/sahara/README-sahara.conf.txt delete mode 100644 etc/sahara/sahara.conf.sample delete mode 100755 tools/config/check_uptodate.sh diff --git a/etc/sahara/README-sahara.conf.txt b/etc/sahara/README-sahara.conf.txt new file mode 100644 index 0000000000..42aff51b49 --- /dev/null +++ b/etc/sahara/README-sahara.conf.txt @@ -0,0 +1,4 @@ +To generate the sample sahara.conf file, run the following +command from the top level of the sahara directory: + +tox -e genconfig diff --git a/etc/sahara/sahara.conf.sample b/etc/sahara/sahara.conf.sample deleted file mode 100644 index 3c4748b096..0000000000 --- a/etc/sahara/sahara.conf.sample +++ /dev/null @@ -1,950 +0,0 @@ -[DEFAULT] - -# -# From oslo.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 - -# The name of a logging configuration file. This file is appended to -# any existing logging configuration files. For details about logging -# configuration files, see the Python logging module documentation. -# (string value) -# Deprecated group/name - [DEFAULT]/log_config -#log_config_append = - -# 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 = - -# 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) -# Deprecated group/name - [DEFAULT]/logfile -#log_file = - -# (Optional) The base directory used for relative --log-file paths. -# (string value) -# Deprecated group/name - [DEFAULT]/logdir -#log_dir = - -# Use syslog for logging. Existing syslog format is DEPRECATED during -# I, and will change in J to honor RFC5424. (boolean value) -#use_syslog = false - -# (Optional) Enables or disables syslog rfc5424 format for logging. If -# enabled, prefixes the MSG part of the syslog message with APP-NAME -# (RFC5424). The format without the APP-NAME is deprecated in I, and -# will be removed in J. (boolean value) -#use_syslog_rfc_format = false - -# Syslog facility to receive log lines. (string value) -#syslog_log_facility = LOG_USER - -# 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_identity)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,qpid.messaging=INFO,stevedore=INFO,eventlet.wsgi.server=WARN,sqlalchemy=WARN,boto=WARN,suds=INFO,keystone=INFO,paramiko=WARN,requests=WARN,iso8601=WARN,oslo_messaging=INFO - -# Enables or disables publication of error events. (boolean value) -#publish_errors = false - -# Enables or disables fatal status of deprecations. (boolean value) -#fatal_deprecations = false - -# The format for an instance that is passed with the log message. -# (string value) -#instance_format = "[instance: %(uuid)s] " - -# The format for an instance UUID that is passed with the log message. -# (string value) -#instance_uuid_format = "[instance: %(uuid)s] " - -# -# From oslo.messaging -# - -# Use durable queues in AMQP. (boolean value) -# Deprecated group/name - [DEFAULT]/rabbit_durable_queues -#amqp_durable_queues = false - -# Auto-delete queues in AMQP. (boolean value) -#amqp_auto_delete = false - -# Size of RPC connection pool. (integer value) -#rpc_conn_pool_size = 30 - -# 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 - -# Whether to disable the Nagle algorithm. (boolean value) -#qpid_tcp_nodelay = true - -# The number of prefetched messages held by receiver. (integer value) -#qpid_receiver_capacity = 1 - -# 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 - -# SSL version to use (valid only if SSL enabled). Valid values are -# TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 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 = - -# How long to wait before reconnecting in response to an AMQP consumer -# cancel notification. (floating point value) -#kombu_reconnect_delay = 1.0 - -# The RabbitMQ broker address where a single node is used. (string -# value) -#rabbit_host = localhost - -# 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 = guest - -# The RabbitMQ login method. (string value) -#rabbit_login_method = AMQPLAIN - -# 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 number of RabbitMQ connection retries. Default is 0 -# (infinite retry count). (integer value) -#rabbit_max_retries = 0 - -# Use HA queues in RabbitMQ (x-ha-policy: all). If you change this -# option, you must wipe the RabbitMQ database. (boolean value) -#rabbit_ha_queues = false - -# Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake -# (boolean value) -#fake_rabbit = false - -# 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 = oslo_messaging._drivers.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 = - -# 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 = localhost - -# Seconds to wait before a cast expires (TTL). Only supported by -# impl_zmq. (integer value) -#rpc_cast_timeout = 30 - -# Heartbeat frequency. (integer value) -#matchmaker_heartbeat_freq = 300 - -# Heartbeat time-to-live. (integer value) -#matchmaker_heartbeat_ttl = 600 - -# Size of RPC thread pool. (integer value) -#rpc_thread_pool_size = 64 - -# Driver or drivers to handle sending notifications. (multi valued) -#notification_driver = - -# AMQP topic used for OpenStack notifications. (list value) -# Deprecated group/name - [rpc_notifier2]/topics -#notification_topics = notifications - -# Seconds to wait for a response from a call. (integer value) -#rpc_response_timeout = 60 - -# A URL representing the messaging driver to use and its full -# configuration. If not set, we fall back to the rpc_backend option -# and driver specific configuration. (string value) -#transport_url = - -# The messaging driver to use, defaults to rabbit. Other drivers -# include qpid and zmq. (string value) -#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) -#control_exchange = openstack - -# -# From periodic.config -# - -# Some periodic tasks can be run in a separate process. Should we run -# them here? (boolean value) -#run_external_periodic_tasks = true - -# -# From policy.config -# - -# The JSON file that defines policies. (string value) -#policy_file = policy.json - -# Default rule. Enforced when a requested rule is not found. (string -# value) -#policy_default_rule = default - -# Directories where policy configuration files are stored. They can be -# relative to any directory in the search path defined by the -# config_dir option, or absolute paths. The file defined by -# policy_file must exist for these directories to be searched. (multi -# valued) -#policy_dirs = policy.d - -# -# From sahara.config -# - -# Hostname or IP address that will be used to listen on. (string -# value) -#host = - -# Port that will be used to listen on. (integer value) -#port = 8386 - -# Log request/response exchange details: environ, headers and bodies. -# (boolean value) -#log_exchange = false - -# Maximum length of job binary data in kilobytes that may be stored or -# retrieved in a single operation. (integer value) -#job_binary_max_KB = 5120 - -# Timeout for canceling job execution (in seconds). Sahara will try to -# cancel job execution during this time. (integer value) -#job_canceling_timeout = 300 - -# If set to True, Sahara will use floating IPs to communicate with -# instances. To make sure that all instances have floating IPs -# assigned in Nova Network set "auto_assign_floating_ip=True" in -# nova.conf. If Neutron is used for networking, make sure that all -# Node Groups have "floating_ip_pool" parameter defined. (boolean -# value) -#use_floating_ips = true - -# The suffix of the node's FQDN. In nova-network that is the -# dhcp_domain config parameter. (string value) -#node_domain = novalocal - -# Use Neutron Networking (False indicates the use of Nova networking). -# (boolean value) -#use_neutron = false - -# Use network namespaces for communication (only valid to use in -# conjunction with use_neutron=True). (boolean value) -#use_namespaces = false - -# Use rootwrap facility to allow non-root users to run the sahara-all -# server instance and access private network IPs (only valid to use in -# conjunction with use_namespaces=True) (boolean value) -#use_rootwrap = false - -# Rootwrap command to leverage. Use in conjunction with -# use_rootwrap=True (string value) -#rootwrap_command = sudo sahara-rootwrap /etc/sahara/rootwrap.conf - -# Driver to use for database access. (string value) -#db_driver = sahara.db - -# List of plugins to be loaded. Sahara preserves the order of the list -# when returning it. (list value) -#plugins = vanilla,hdp,spark,cdh - -# Enables data locality for hadoop cluster. Also enables data locality -# for Swift used by hadoop. If enabled, 'compute_topology' and -# 'swift_topology' configuration parameters should point to OpenStack -# and Swift topology correspondingly. (boolean value) -#enable_data_locality = false - -# Enables four-level topology for data locality. Works only if -# corresponding plugin supports such mode. (boolean value) -#enable_hypervisor_awareness = true - -# File with nova compute topology. It should contain mapping between -# nova computes and racks. (string value) -#compute_topology_file = etc/sahara/compute.topology - -# File with Swift topology.It should contain mapping between Swift -# nodes and racks. (string value) -#swift_topology_file = etc/sahara/swift.topology - -# Notification level for outgoing notifications (string value) -#notification_level = INFO - -# Notification publisher_id for outgoing notifications (string value) -#notification_publisher_id = - -# Enables sending notifications to Ceilometer (boolean value) -#enable_notifications = false - -# Enables Sahara to use Keystone API v3. If that flag is disabled, -# per-job clusters will not be terminated automatically. (boolean -# value) -#use_identity_api_v3 = true - -# Maximum number of remote operations that will be running at the same -# time. Note that each remote operation requires its own process to -# run. (integer value) -#global_remote_threshold = 100 - -# The same as global_remote_threshold, but for a single cluster. -# (integer value) -#cluster_remote_threshold = 70 - -# Proxy command used to connect to instances. If set, this command -# should open a netcat socket, that Sahara will use for SSH and HTTP -# connections. Use {host} and {port} to describe the destination. -# Other available keywords: {tenant_id}, {network_id}, {router_id}. -# (string value) -#proxy_command = - -# Region name used to get services endpoints. (string value) -#os_region_name = - -# An engine which will be used to provision infrastructure for Hadoop -# cluster. (string value) -#infrastructure_engine = direct - -# A method for Sahara to execute commands on VMs. (string value) -#remote = ssh - -# Number of workers for Sahara API service (0 means all-in-one-thread -# configuration). (integer value) -#api_workers = 0 - -# Postfix for storing jobs in hdfs. Will be added to '/user//' path. (string value) -#job_workflow_postfix = - -# Enable periodic tasks. (boolean value) -#periodic_enable = true - -# Range in seconds to randomly delay when starting the periodic task -# scheduler to reduce stampeding. (Disable by setting to 0). (integer -# value) -#periodic_fuzzy_delay = 60 - -# Max interval size between periodic tasks execution in seconds. -# (integer value) -#periodic_interval_max = 60 - -# Minimal "lifetime" in seconds for a transient cluster. Cluster is -# guaranteed to be "alive" within this time period. (integer value) -#min_transient_cluster_active_time = 30 - -# Maximal time (in hours) for clusters allowed to be in states other -# than "Active", "Deleting" or "Error". If a cluster is not in -# "Active", "Deleting" or "Error" state and last update of it was -# longer than "cleanup_time_for_incomplete_clusters" hours ago then it -# will be deleted automatically. (0 value means that automatic clean -# up is disabled). (integer value) -#cleanup_time_for_incomplete_clusters = 0 - -# Timeout for detaching volumes from instance (in seconds). (integer -# value) -#detach_volume_timeout = 300 - -# Enables Sahara to use a domain for creating temporary proxy users to -# access Swift. If this is enabled a domain must be created for Sahara -# to use. (boolean value) -#use_domain_for_proxy_users = false - -# The domain Sahara will use to create new proxy users for Swift -# object access. (string value) -#proxy_user_domain_name = - -# A list of the role names that the proxy user should assume through -# trust for Swift object access. (list value) -#proxy_user_role_names = Member - -# Disables event log feature. (boolean value) -#disable_event_log = false - - -[cinder] - -# -# From sahara.config -# - -# Version of the Cinder API to use. (integer value) -# Deprecated group/name - [DEFAULT]/cinder_api_version -#api_version = 2 - -# Allow to perform insecure SSL requests to cinder. (boolean value) -#api_insecure = false - -# Location of ca certificates file to use for cinder client requests. -# (string value) -#ca_file = - - -[conductor] - -# -# From sahara.config -# - -# Perform sahara-conductor operations locally. (boolean value) -#use_local = true - - -[database] - -# -# From oslo.db -# - -# The file name to use with SQLite. (string value) -# Deprecated group/name - [DEFAULT]/sqlite_db -#sqlite_db = oslo.sqlite - -# If True, SQLite uses synchronous mode. (boolean value) -# Deprecated group/name - [DEFAULT]/sqlite_synchronous -#sqlite_synchronous = true - -# The back end to use for the database. (string value) -# Deprecated group/name - [DEFAULT]/db_backend -#backend = sqlalchemy - -# The SQLAlchemy connection string to use to connect to the database. -# (string value) -# Deprecated group/name - [DEFAULT]/sql_connection -# Deprecated group/name - [DATABASE]/sql_connection -# Deprecated group/name - [sql]/connection -#connection = - -# The SQLAlchemy connection string to use to connect to the slave -# database. (string value) -#slave_connection = - -# The SQL mode to be used for MySQL sessions. This option, including -# the default, overrides any server-set SQL mode. To use whatever SQL -# mode is set by the server configuration, set this to no value. -# Example: mysql_sql_mode= (string value) -#mysql_sql_mode = TRADITIONAL - -# Timeout before idle SQL connections are reaped. (integer value) -# Deprecated group/name - [DEFAULT]/sql_idle_timeout -# Deprecated group/name - [DATABASE]/sql_idle_timeout -# Deprecated group/name - [sql]/idle_timeout -#idle_timeout = 3600 - -# Minimum number of SQL connections to keep open in a pool. (integer -# value) -# Deprecated group/name - [DEFAULT]/sql_min_pool_size -# Deprecated group/name - [DATABASE]/sql_min_pool_size -#min_pool_size = 1 - -# Maximum number of SQL connections to keep open in a pool. (integer -# value) -# Deprecated group/name - [DEFAULT]/sql_max_pool_size -# Deprecated group/name - [DATABASE]/sql_max_pool_size -#max_pool_size = - -# Maximum number of database connection retries during startup. Set to -# -1 to specify an infinite retry count. (integer value) -# Deprecated group/name - [DEFAULT]/sql_max_retries -# Deprecated group/name - [DATABASE]/sql_max_retries -#max_retries = 10 - -# Interval between retries of opening a SQL connection. (integer -# value) -# Deprecated group/name - [DEFAULT]/sql_retry_interval -# Deprecated group/name - [DATABASE]/reconnect_interval -#retry_interval = 10 - -# If set, use this value for max_overflow with SQLAlchemy. (integer -# value) -# Deprecated group/name - [DEFAULT]/sql_max_overflow -# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow -#max_overflow = - -# Verbosity of SQL debugging information: 0=None, 100=Everything. -# (integer value) -# Deprecated group/name - [DEFAULT]/sql_connection_debug -#connection_debug = 0 - -# Add Python stack traces to SQL as comment strings. (boolean value) -# Deprecated group/name - [DEFAULT]/sql_connection_trace -#connection_trace = false - -# If set, use this value for pool_timeout with SQLAlchemy. (integer -# value) -# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout -#pool_timeout = - -# Enable the experimental use of database reconnect on connection -# lost. (boolean value) -#use_db_reconnect = false - -# Seconds between database connection retries. (integer value) -#db_retry_interval = 1 - -# If True, increases the interval between database connection retries -# up to db_max_retry_interval. (boolean value) -#db_inc_retry_interval = true - -# If db_inc_retry_interval is set, the maximum seconds between -# database connection retries. (integer value) -#db_max_retry_interval = 10 - -# Maximum database connection retries before error is raised. Set to -# -1 to specify an infinite retry count. (integer value) -#db_max_retries = 20 - - -[heat] - -# -# From sahara.config -# - -# Allow to perform insecure SSL requests to heat. (boolean value) -#api_insecure = false - -# Location of ca certificates file to use for heat client requests. -# (string value) -#ca_file = - - -[keystone] - -# -# From sahara.config -# - -# Allow to perform insecure SSL requests to keystone. (boolean value) -#api_insecure = false - -# Location of ca certificates file to use for keystone client -# requests. (string value) -#ca_file = - - -[keystone_authtoken] - -# -# From keystonemiddleware.auth_token -# - -# Complete public Identity API endpoint. (string value) -#auth_uri = - -# API version of the admin Identity API endpoint. (string value) -#auth_version = - -# Do not handle authorization requests within the middleware, but -# delegate the authorization decision to downstream WSGI components. -# (boolean value) -#delay_auth_decision = false - -# Request timeout value for communicating with Identity API server. -# (integer value) -#http_connect_timeout = - -# How many times are we trying to reconnect when communicating with -# Identity API Server. (integer value) -#http_request_max_retries = 3 - -# Env key for the swift cache. (string value) -#cache = - -# Required if identity server requires client certificate (string -# value) -#certfile = - -# Required if identity server requires client certificate (string -# value) -#keyfile = - -# A PEM encoded Certificate Authority to use when verifying HTTPs -# connections. Defaults to system CAs. (string value) -#cafile = - -# Verify HTTPS connections. (boolean value) -#insecure = false - -# Directory used to cache files related to PKI tokens. (string value) -#signing_dir = - -# Optionally specify a list of memcached server(s) to use for caching. -# If left undefined, tokens will instead be cached in-process. (list -# value) -# Deprecated group/name - [DEFAULT]/memcache_servers -#memcached_servers = - -# In order to prevent excessive effort spent validating tokens, the -# middleware caches previously-seen tokens for a configurable duration -# (in seconds). Set to -1 to disable caching completely. (integer -# value) -#token_cache_time = 300 - -# Determines the frequency at which the list of revoked tokens is -# retrieved from the Identity service (in seconds). A high number of -# revocation events combined with a low cache duration may -# significantly reduce performance. (integer value) -#revocation_cache_time = 10 - -# (Optional) If defined, indicate whether token data should be -# authenticated or authenticated and encrypted. Acceptable values are -# MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in -# the cache. If ENCRYPT, token data is encrypted and authenticated in -# the cache. If the value is not one of these options or empty, -# auth_token will raise an exception on initialization. (string value) -#memcache_security_strategy = - -# (Optional, mandatory if memcache_security_strategy is defined) This -# string is used for key derivation. (string value) -#memcache_secret_key = - -# (Optional) Number of seconds memcached server is considered dead -# before it is tried again. (integer value) -#memcache_pool_dead_retry = 300 - -# (Optional) Maximum total number of open connections to every -# memcached server. (integer value) -#memcache_pool_maxsize = 10 - -# (Optional) Socket timeout in seconds for communicating with a -# memcache server. (integer value) -#memcache_pool_socket_timeout = 3 - -# (Optional) Number of seconds a connection to memcached is held -# unused in the pool before it is closed. (integer value) -#memcache_pool_unused_timeout = 60 - -# (Optional) Number of seconds that an operation will wait to get a -# memcache client connection from the pool. (integer value) -#memcache_pool_conn_get_timeout = 10 - -# (Optional) Use the advanced (eventlet safe) memcache client pool. -# The advanced pool will only work under python 2.x. (boolean value) -#memcache_use_advanced_pool = false - -# (Optional) Indicate whether to set the X-Service-Catalog header. If -# False, middleware will not ask for service catalog on token -# validation and will not set the X-Service-Catalog header. (boolean -# value) -#include_service_catalog = true - -# Used to control the use and type of token binding. Can be set to: -# "disabled" to not check token binding. "permissive" (default) to -# validate binding information if the bind type is of a form known to -# the server and ignore it if not. "strict" like "permissive" but if -# the bind type is unknown the token will be rejected. "required" any -# form of token binding is needed to be allowed. Finally the name of a -# binding method that must be present in tokens. (string value) -#enforce_token_bind = permissive - -# If true, the revocation list will be checked for cached tokens. This -# requires that PKI tokens are configured on the identity server. -# (boolean value) -#check_revocations_for_cached = false - -# Hash algorithms to use for hashing PKI tokens. This may be a single -# algorithm or multiple. The algorithms are those supported by Python -# standard hashlib.new(). The hashes will be tried in the order given, -# so put the preferred one first for performance. The result of the -# first hash will be stored in the cache. This will typically be set -# to multiple values only while migrating from a less secure algorithm -# to a more secure one. Once all the old tokens are expired this -# option should be set to a single value for better performance. (list -# value) -#hash_algorithms = md5 - -# Prefix to prepend at the beginning of the path. Deprecated, use -# identity_uri. (string value) -#auth_admin_prefix = - -# Host providing the admin Identity API endpoint. Deprecated, use -# identity_uri. (string value) -#auth_host = 127.0.0.1 - -# Port of the admin Identity API endpoint. Deprecated, use -# identity_uri. (integer value) -#auth_port = 35357 - -# Protocol of the admin Identity API endpoint (http or https). -# Deprecated, use identity_uri. (string value) -#auth_protocol = https - -# Complete admin Identity API endpoint. This should specify the -# unversioned root endpoint e.g. https://localhost:35357/ (string -# value) -#identity_uri = - -# This option is deprecated and may be removed in a future release. -# Single shared secret with the Keystone configuration used for -# bootstrapping a Keystone installation, or otherwise bypassing the -# normal authentication process. This option should not be used, use -# `admin_user` and `admin_password` instead. (string value) -#admin_token = - -# Service username. (string value) -#admin_user = - -# Service user password. (string value) -#admin_password = - -# Service tenant name. (string value) -#admin_tenant_name = admin - - -[matchmaker_redis] - -# -# From oslo.messaging -# - -# 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 = - - -[matchmaker_ring] - -# -# From oslo.messaging -# - -# Matchmaker ring file (JSON). (string value) -# Deprecated group/name - [DEFAULT]/matchmaker_ringfile -#ringfile = /etc/oslo/matchmaker_ring.json - - -[neutron] - -# -# From sahara.config -# - -# Allow to perform insecure SSL requests to neutron. (boolean value) -#api_insecure = false - -# Location of ca certificates file to use for neutron client requests. -# (string value) -#ca_file = - - -[nova] - -# -# From sahara.config -# - -# Allow to perform insecure SSL requests to nova. (boolean value) -#api_insecure = false - -# Location of ca certificates file to use for nova client requests. -# (string value) -#ca_file = - - -[oslo_concurrency] - -# -# From oslo.concurrency -# - -# Enables or disables inter-process locks. (boolean value) -# Deprecated group/name - [DEFAULT]/disable_process_locking -#disable_process_locking = false - -# Directory to use for lock files. For security, the specified -# directory should only be writable by the user running the processes -# that need locking. 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 = - - -[oslo_messaging_amqp] - -# -# From oslo.messaging -# - -# address prefix used when sending to a specific server (string value) -# Deprecated group/name - [amqp1]/server_request_prefix -#server_request_prefix = exclusive - -# address prefix used when broadcasting to all servers (string value) -# Deprecated group/name - [amqp1]/broadcast_prefix -#broadcast_prefix = broadcast - -# address prefix when sending to any server in group (string value) -# Deprecated group/name - [amqp1]/group_request_prefix -#group_request_prefix = unicast - -# Name for the AMQP container (string value) -# Deprecated group/name - [amqp1]/container_name -#container_name = - -# Timeout for inactive connections (in seconds) (integer value) -# Deprecated group/name - [amqp1]/idle_timeout -#idle_timeout = 0 - -# Debug: dump AMQP frames to stdout (boolean value) -# Deprecated group/name - [amqp1]/trace -#trace = false - -# CA certificate PEM file for verifing server certificate (string -# value) -# Deprecated group/name - [amqp1]/ssl_ca_file -#ssl_ca_file = - -# Identifying certificate PEM file to present to clients (string -# value) -# Deprecated group/name - [amqp1]/ssl_cert_file -#ssl_cert_file = - -# Private key PEM file used to sign cert_file certificate (string -# value) -# Deprecated group/name - [amqp1]/ssl_key_file -#ssl_key_file = - -# Password for decrypting ssl_key_file (if encrypted) (string value) -# Deprecated group/name - [amqp1]/ssl_key_password -#ssl_key_password = - -# Accept clients using either SSL or plain TCP (boolean value) -# Deprecated group/name - [amqp1]/allow_insecure_clients -#allow_insecure_clients = false - - -[ssl] - -# -# From ssl.config -# - -# CA certificate file to use to verify connecting clients. (string -# value) -#ca_file = - -# Certificate file to use when starting the server securely. (string -# value) -#cert_file = - -# Private key file to use when starting the server securely. (string -# value) -#key_file = - - -[swift] - -# -# From sahara.config -# - -# Allow to perform insecure SSL requests to swift. (boolean value) -#api_insecure = false - -# Location of ca certificates file to use for swift client requests. -# (string value) -#ca_file = diff --git a/tools/config/check_uptodate.sh b/tools/config/check_uptodate.sh deleted file mode 100755 index 1aa59a9663..0000000000 --- a/tools/config/check_uptodate.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -PROJECT_NAME=${PROJECT_NAME:-sahara} -CFGFILE_NAME=${PROJECT_NAME}.conf.sample - -if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then - CFGFILE=etc/${PROJECT_NAME}/${CFGFILE_NAME} -elif [ -e etc/${CFGFILE_NAME} ]; then - CFGFILE=etc/${CFGFILE_NAME} -else - echo "${0##*/}: can not find config file" - exit 1 -fi - -TEMPDIR=`mktemp -d /tmp/${PROJECT_NAME}.XXXXXX` -trap "rm -rf $TEMPDIR" EXIT - -oslo-config-generator --config-file tools/config/config-generator.sahara.conf --output-file ${TEMPDIR}/${CFGFILE_NAME} - -if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE} -then - echo "${0##*/}: ${PROJECT_NAME}.conf.sample is not up to date." - echo "${0##*/}: Please run tox -egenconfig." - exit 1 -fi diff --git a/tox.ini b/tox.ini index 81e4315a86..b46eaa4b5d 100644 --- a/tox.ini +++ b/tox.ini @@ -66,10 +66,6 @@ commands = oslo-config-generator --config-file tools/config/config-generator.sahara.conf \ --output-file etc/sahara/sahara.conf.sample -[testenv:checkconfig] -commands = - {toxinidir}/tools/config/check_uptodate.sh - [testenv:pip-missing-reqs] # do not install test-requirements as that will pollute the virtualenv for # determining missing packages