diff options
| author | Miguel Grinberg <miguelgrinberg50@gmail.com> | 2014-10-10 16:02:41 -0700 |
|---|---|---|
| committer | Miguel Grinberg <miguel.grinberg@gmail.com> | 2014-11-04 02:50:47 +0000 |
| commit | 4fd5087499b0f3dae16b183eba825e642efb0e95 (patch) | |
| tree | 83b7292ca203a0ed2d642a0dc395562f80fd469b /etc | |
| parent | 5725b0e8b1d0a02e83331a136fc35eb7a76c6e74 (diff) | |
| download | heat-4fd5087499b0f3dae16b183eba825e642efb0e95.tar.gz | |
unconfigured clients look in the [clients] section for defaults
This change enables clients that have no specific settings in
the [clients_xxx] sections of the configuration file to get defaults
from the [clients] section.
Change-Id: I071bd77a2e1f0ad366b80c095917a8debc5cef2b
Closes-Bug: 1379958
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/heat/heat.conf.sample | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample index 9d723b217..51d47d2de 100644 --- a/etc/heat/heat.conf.sample +++ b/etc/heat/heat.conf.sample @@ -585,7 +585,7 @@ # Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. (string value) -#endpoint_type=publicURL +#endpoint_type=<None> # Optional CA cert file to use in SSL connections. (string # value) @@ -601,7 +601,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_cinder] @@ -612,7 +612,7 @@ # Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. (string value) -#endpoint_type=publicURL +#endpoint_type=<None> # Optional CA cert file to use in SSL connections. (string # value) @@ -628,7 +628,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> # @@ -647,7 +647,7 @@ # Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. (string value) -#endpoint_type=publicURL +#endpoint_type=<None> # Optional CA cert file to use in SSL connections. (string # value) @@ -663,7 +663,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_heat] @@ -674,7 +674,7 @@ # Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. (string value) -#endpoint_type=publicURL +#endpoint_type=<None> # Optional CA cert file to use in SSL connections. (string # value) @@ -690,7 +690,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> # @@ -699,7 +699,7 @@ # Optional heat url in format like # http://0.0.0.0:8004/v1/%(tenant_id)s. (string value) -#url=<None> +#url= [clients_keystone] @@ -710,7 +710,7 @@ # Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. (string value) -#endpoint_type=publicURL +#endpoint_type=<None> # Optional CA cert file to use in SSL connections. (string # value) @@ -726,7 +726,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_neutron] @@ -737,7 +737,7 @@ # Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. (string value) -#endpoint_type=publicURL +#endpoint_type=<None> # Optional CA cert file to use in SSL connections. (string # value) @@ -753,7 +753,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_nova] @@ -764,7 +764,7 @@ # Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. (string value) -#endpoint_type=publicURL +#endpoint_type=<None> # Optional CA cert file to use in SSL connections. (string # value) @@ -780,7 +780,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> # @@ -799,7 +799,7 @@ # Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. (string value) -#endpoint_type=publicURL +#endpoint_type=<None> # Optional CA cert file to use in SSL connections. (string # value) @@ -815,7 +815,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_trove] @@ -826,7 +826,7 @@ # Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. (string value) -#endpoint_type=publicURL +#endpoint_type=<None> # Optional CA cert file to use in SSL connections. (string # value) @@ -842,7 +842,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [database] |