diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-18 10:57:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-18 10:57:39 +0000 |
| commit | 756035b8e0110a5d8ea04052f42885f2a1bfc05b (patch) | |
| tree | b188ccb317d7fe7400cb966c5d3b2c4b7df162d6 /etc | |
| parent | 957fd8ecd0849ca155e868731c8f1acb6deddbf2 (diff) | |
| parent | 4fd5087499b0f3dae16b183eba825e642efb0e95 (diff) | |
| download | heat-756035b8e0110a5d8ea04052f42885f2a1bfc05b.tar.gz | |
Merge "unconfigured clients look in the [clients] section for defaults"
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 438b19b29..a52df2664 100644 --- a/etc/heat/heat.conf.sample +++ b/etc/heat/heat.conf.sample @@ -579,7 +579,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) @@ -595,7 +595,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_cinder] @@ -606,7 +606,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) @@ -622,7 +622,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> # @@ -641,7 +641,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) @@ -657,7 +657,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_heat] @@ -668,7 +668,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) @@ -684,7 +684,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> # @@ -693,7 +693,7 @@ # Optional heat url in format like # http://0.0.0.0:8004/v1/%(tenant_id)s. (string value) -#url=<None> +#url= [clients_keystone] @@ -704,7 +704,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) @@ -720,7 +720,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_neutron] @@ -731,7 +731,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) @@ -747,7 +747,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_nova] @@ -758,7 +758,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) @@ -774,7 +774,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> # @@ -793,7 +793,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) @@ -809,7 +809,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [clients_trove] @@ -820,7 +820,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) @@ -836,7 +836,7 @@ # If set, then the server's certificate will not be verified. # (boolean value) -#insecure=false +#insecure=<None> [database] |