From 1bcc65762f664c283a9dd6f2731199a6c873c641 Mon Sep 17 00:00:00 2001 From: JUN JIE NAN Date: Tue, 31 Dec 2013 12:41:17 +0800 Subject: [PATCH] Sort the output of config/generator.py by group name To avoid huge changes in the output when adding new option groups. Sync from oslo commit 4b3e32b980cf1d028da9325b21183ff635fbe043. Closes-Bug: #1258363 Change-Id: I9173a38d4d548ce641e19ada30f86148c1f0c53f --- etc/heat/heat.conf.sample | 416 +++++++++++----------- heat/openstack/common/config/generator.py | 4 +- 2 files changed, 210 insertions(+), 210 deletions(-) diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample index 02a8d995aa..784cb7019f 100644 --- a/etc/heat/heat.conf.sample +++ b/etc/heat/heat.conf.sample @@ -473,7 +473,22 @@ #matchmaker_heartbeat_ttl=600 -[clients_swift] +[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= + + +[clients] # # Options defined in heat.common.config @@ -495,39 +510,137 @@ #insecure=false -[auth_password] +[clients_ceilometer] # # 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 +# Optional CA cert file to use in SSL connections (string # value) -#allowed_auth_uris= - - -[ssl] - -# -# Options defined in heat.openstack.common.sslutils -# - -# CA certificate file to use to verify connecting clients -# (string value) #ca_file= -# Certificate file to use when starting the server securely -# (string value) +# Optional PEM-formatted certificate chain file (string value) #cert_file= -# Private key file to use when starting the server securely +# Optional PEM-formatted file that contains the private key # (string value) #key_file= +# If set then the server's certificate will not be verified +# (boolean value) +#insecure=false + + +[clients_cinder] + +# +# Options defined in heat.common.config +# + +# Optional CA cert file to use in SSL connections (string +# value) +#ca_file= + +# Optional PEM-formatted certificate chain file (string value) +#cert_file= + +# Optional PEM-formatted file that contains the private key +# (string value) +#key_file= + +# If set then the server's certificate will not be verified +# (boolean value) +#insecure=false + + +[clients_keystone] + +# +# Options defined in heat.common.config +# + +# Optional CA cert file to use in SSL connections (string +# value) +#ca_file= + +# Optional PEM-formatted certificate chain file (string value) +#cert_file= + +# Optional PEM-formatted file that contains the private key +# (string value) +#key_file= + +# If set then the server's certificate will not be verified +# (boolean value) +#insecure=false + + +[clients_neutron] + +# +# Options defined in heat.common.config +# + +# Optional CA cert file to use in SSL connections (string +# value) +#ca_file= + +# Optional PEM-formatted certificate chain file (string value) +#cert_file= + +# Optional PEM-formatted file that contains the private key +# (string value) +#key_file= + +# If set then the server's certificate will not be verified +# (boolean value) +#insecure=false + + +[clients_nova] + +# +# Options defined in heat.common.config +# + +# Optional CA cert file to use in SSL connections (string +# value) +#ca_file= + +# Optional PEM-formatted certificate chain file (string value) +#cert_file= + +# Optional PEM-formatted file that contains the private key +# (string value) +#key_file= + +# If set then the server's certificate will not be verified +# (boolean value) +#insecure=false + + +[clients_swift] + +# +# Options defined in heat.common.config +# + +# Optional CA cert file to use in SSL connections (string +# value) +#ca_file= + +# Optional PEM-formatted certificate chain file (string value) +#cert_file= + +# Optional PEM-formatted file that contains the private key +# (string value) +#key_file= + +# If set then the server's certificate will not be verified +# (boolean value) +#insecure=false + [database] @@ -612,128 +725,6 @@ #pool_timeout= -[paste_deploy] - -# -# Options defined in heat.common.config -# - -# The flavor to use (string value) -#flavor= - -# The API paste config file to use (string value) -#api_paste_config=api-paste.ini - - -[clients_cinder] - -# -# Options defined in heat.common.config -# - -# Optional CA cert file to use in SSL connections (string -# value) -#ca_file= - -# Optional PEM-formatted certificate chain file (string value) -#cert_file= - -# Optional PEM-formatted file that contains the private key -# (string value) -#key_file= - -# If set then the server's certificate will not be verified -# (boolean value) -#insecure=false - - -[clients] - -# -# Options defined in heat.common.config -# - -# Optional CA cert file to use in SSL connections (string -# value) -#ca_file= - -# Optional PEM-formatted certificate chain file (string value) -#cert_file= - -# Optional PEM-formatted file that contains the private key -# (string value) -#key_file= - -# If set then the server's certificate will not be verified -# (boolean value) -#insecure=false - - -[clients_nova] - -# -# Options defined in heat.common.config -# - -# Optional CA cert file to use in SSL connections (string -# value) -#ca_file= - -# Optional PEM-formatted certificate chain file (string value) -#cert_file= - -# Optional PEM-formatted file that contains the private key -# (string value) -#key_file= - -# If set then the server's certificate will not be verified -# (boolean value) -#insecure=false - - -[matchmaker_ring] - -# -# Options defined in heat.openstack.common.rpc.matchmaker_ring -# - -# Matchmaker ring file (JSON) (string value) -# Deprecated group/name - [DEFAULT]/matchmaker_ringfile -#ringfile=/etc/oslo/matchmaker_ring.json - - -[clients_ceilometer] - -# -# Options defined in heat.common.config -# - -# Optional CA cert file to use in SSL connections (string -# value) -#ca_file= - -# Optional PEM-formatted certificate chain file (string value) -#cert_file= - -# Optional PEM-formatted file that contains the private key -# (string value) -#key_file= - -# If set then the server's certificate will not be verified -# (boolean value) -#insecure=false - - -[rpc_notifier2] - -# -# Options defined in heat.openstack.common.notifier.rpc_notifier2 -# - -# AMQP topic(s) used for OpenStack notifications (list value) -#topics=notifications - - [ec2authtoken] # @@ -752,35 +743,6 @@ #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= - -# Location of the SSL Key File to use for enabling SSL mode -# (string value) -#key_file= - -# Number of workers for Heat service (integer value) -#workers=0 - - [heat_api] # @@ -839,6 +801,35 @@ #workers=0 +[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= + +# Location of the SSL Key File to use for enabling SSL mode +# (string value) +#key_file= + +# Number of workers for Heat service (integer value) +#workers=0 + + [keystone_authtoken] # @@ -953,28 +944,6 @@ #memcache_secret_key= -[clients_neutron] - -# -# Options defined in heat.common.config -# - -# Optional CA cert file to use in SSL connections (string -# value) -#ca_file= - -# Optional PEM-formatted certificate chain file (string value) -#cert_file= - -# Optional PEM-formatted file that contains the private key -# (string value) -#key_file= - -# If set then the server's certificate will not be verified -# (boolean value) -#insecure=false - - [matchmaker_redis] # @@ -991,26 +960,28 @@ #password= -[clients_keystone] +[matchmaker_ring] + +# +# Options defined in heat.openstack.common.rpc.matchmaker_ring +# + +# Matchmaker ring file (JSON) (string value) +# Deprecated group/name - [DEFAULT]/matchmaker_ringfile +#ringfile=/etc/oslo/matchmaker_ring.json + + +[paste_deploy] # # Options defined in heat.common.config # -# Optional CA cert file to use in SSL connections (string -# value) -#ca_file= +# The flavor to use (string value) +#flavor= -# Optional PEM-formatted certificate chain file (string value) -#cert_file= - -# Optional PEM-formatted file that contains the private key -# (string value) -#key_file= - -# If set then the server's certificate will not be verified -# (boolean value) -#insecure=false +# The API paste config file to use (string value) +#api_paste_config=api-paste.ini [revision] @@ -1026,3 +997,32 @@ #heat_revision=unknown +[rpc_notifier2] + +# +# Options defined in heat.openstack.common.notifier.rpc_notifier2 +# + +# AMQP topic(s) used for OpenStack notifications (list value) +#topics=notifications + + +[ssl] + +# +# Options defined in heat.openstack.common.sslutils +# + +# 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= + + diff --git a/heat/openstack/common/config/generator.py b/heat/openstack/common/config/generator.py index 7623737571..f14afbdd3f 100644 --- a/heat/openstack/common/config/generator.py +++ b/heat/openstack/common/config/generator.py @@ -102,8 +102,8 @@ def generate(srcfiles): opts_by_group.setdefault(group, []).append((mod_str, opts)) print_group_opts('DEFAULT', opts_by_group.pop('DEFAULT', [])) - for group, opts in opts_by_group.items(): - print_group_opts(group, opts) + for group in sorted(opts_by_group.keys()): + print_group_opts(group, opts_by_group[group]) def _import_module(mod_str):