Remove cluster_type from conf and Update conf example for opts changes.
Closes-Bug: #1449313 Change-Id: I0841e522e8d87a6a48c83abc87676c426d7e16a2
This commit is contained in:
parent
2a5b60d7d3
commit
88e0fa840d
|
@ -8,9 +8,6 @@
|
|||
# Default value is True. (boolean value)
|
||||
#enable_authentication = true
|
||||
|
||||
# make exception message format errors fatal (boolean value)
|
||||
#fatal_exception_format_errors = false
|
||||
|
||||
# Subset of trustor roles to be delegated to magnum. (list value)
|
||||
#trusts_delegated_roles = magnum_assembly_update
|
||||
|
||||
|
@ -136,7 +133,7 @@
|
|||
#rpc_zmq_bind_address = *
|
||||
|
||||
# MatchMaker driver. (string value)
|
||||
#rpc_zmq_matchmaker = local
|
||||
#rpc_zmq_matchmaker = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost
|
||||
|
||||
# ZeroMQ receiver listening port. (integer value)
|
||||
#rpc_zmq_port = 9501
|
||||
|
@ -233,6 +230,18 @@
|
|||
# value)
|
||||
#swarm_atomic_template_path = $pybasedir/templates/docker-swarm/swarm.yaml
|
||||
|
||||
# Format string to use for swarm discovery url. Available values:
|
||||
# bay_id, bay_uuid. Example: "etcd://etcd.example.com/\%(bay_uuid)s"
|
||||
# (string value)
|
||||
#swarm_discovery_url_format = <None>
|
||||
|
||||
# Indicates Swarm discovery should use public endpoint. (boolean
|
||||
# value)
|
||||
#public_swarm_discovery = true
|
||||
|
||||
# Url for swarm public discovery endpoint. (string value)
|
||||
#public_swarm_discovery_url = https://discovery-stage.hub.docker.com/v1/clusters
|
||||
|
||||
# Enabled bay definition entry points. (list value)
|
||||
#enabled_definitions = magnum_vm_atomic_k8s,magnum_vm_coreos_k8s,magnum_vm_atomic_swarm
|
||||
|
||||
|
@ -370,13 +379,6 @@
|
|||
# From magnum
|
||||
#
|
||||
|
||||
# Path to use as the root of the Docker runtime. (string value)
|
||||
#root_directory = /var/lib/docker
|
||||
|
||||
# tcp://host:port to bind/connect to or unix://path/to/socket to use
|
||||
# (string value)
|
||||
#host_url = unix:///var/run/docker.sock
|
||||
|
||||
# Docker remote api version. Override it according to specific docker
|
||||
# api version in your environment. (string value)
|
||||
#docker_remote_api_version = 1.17
|
||||
|
@ -432,28 +434,25 @@
|
|||
# From magnum
|
||||
#
|
||||
|
||||
# Cluster types are fedora-atomic, coreos, ironic. (string value)
|
||||
#cluster_type = fedora-atomic
|
||||
|
||||
# Container Orchestration Environments are kubernetes or swarm.
|
||||
# (string value)
|
||||
#cluster_coe = kubernetes
|
||||
|
||||
# Number of attempts to query the Heat stack for
|
||||
# finding out the status of the created stack and
|
||||
# getting template outputs. This value is ignored
|
||||
# during bay creation if timeout is set as the poll
|
||||
# will continue until bay creation either ends
|
||||
# or times out.
|
||||
# Number of attempts to query the Heat stack for finding out the
|
||||
# status of the created stack and getting template outputs. This
|
||||
# value is ignored during bay creation if timeout is set as the poll
|
||||
# will continue until bay creation either ends or times out. (integer
|
||||
# value)
|
||||
#max_attempts = 2000
|
||||
|
||||
# Sleep time interval between two attempts of querying the Heat stack.
|
||||
# This interval is in seconds. (integer value)
|
||||
#wait_interval = 1
|
||||
|
||||
# The length of time to let bay creation continue. This
|
||||
# interval is in minutes. Set to None for no timeout.
|
||||
#bay_create_timeout = None
|
||||
# The length of time to let bay creation continue. This interval is
|
||||
# in minutes. The default is no timeout. (integer value)
|
||||
#bay_create_timeout = <None>
|
||||
|
||||
|
||||
[keystone_authtoken]
|
||||
|
||||
|
@ -540,7 +539,7 @@
|
|||
#memcache_pool_maxsize = 10
|
||||
|
||||
# (Optional) Socket timeout in seconds for communicating with a
|
||||
# memcache server. (integer value)
|
||||
# memcached server. (integer value)
|
||||
#memcache_pool_socket_timeout = 3
|
||||
|
||||
# (Optional) Number of seconds a connection to memcached is held
|
||||
|
@ -548,10 +547,10 @@
|
|||
#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)
|
||||
# memcached client connection from the pool. (integer value)
|
||||
#memcache_pool_conn_get_timeout = 10
|
||||
|
||||
# (Optional) Use the advanced (eventlet safe) memcache client pool.
|
||||
# (Optional) Use the advanced (eventlet safe) memcached client pool.
|
||||
# The advanced pool will only work under python 2.x. (boolean value)
|
||||
#memcache_use_advanced_pool = false
|
||||
|
||||
|
@ -730,7 +729,6 @@
|
|||
#
|
||||
|
||||
# Use durable queues in AMQP. (boolean value)
|
||||
# Deprecated group/name - [DEFAULT]/amqp_durable_queues
|
||||
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
|
||||
#amqp_durable_queues = false
|
||||
|
||||
|
@ -799,7 +797,6 @@
|
|||
#
|
||||
|
||||
# Use durable queues in AMQP. (boolean value)
|
||||
# Deprecated group/name - [DEFAULT]/amqp_durable_queues
|
||||
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
|
||||
#amqp_durable_queues = false
|
||||
|
||||
|
|
Loading…
Reference in New Issue