commit: d21df595f4612ff21bf30a094af20e4f3a53cdd0
Author: Matthew Thode gentoo org>
AuthorDate: Tue Feb 28 16:29:09 2017 +
Commit: Matt Thode gentoo org>
CommitDate: Tue Feb 28 16:29:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21df595
sys-cluster/heat: moving ocata heat.conf.sample to d.g.o bug 611208
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-cluster/heat/Manifest |2 +
sys-cluster/heat/files/ocata-heat.conf.sample | 2635 -
sys-cluster/heat/heat-2017.1..ebuild |3 +-
sys-cluster/heat/heat-8.0.0.ebuild|5 +-
4 files changed, 7 insertions(+), 2638 deletions(-)
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 31d8b385c4..cd5f9569ff 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,2 +1,4 @@
DIST heat-7.0.2.tar.gz 2257003 SHA256
5fb78bdb8859e3f037ffe11180b9a526830e8ce56a294bbb2dc79b638b7c99da SHA512
0655b8e264bbfa227405759d28d74c9f71eefb8d2abce3f75d3a72fd0d927c114a5bb4658e73c553302632a086af34faa1e37f5bbef1b84f3564ca3fbac624e7
WHIRLPOOL
d1e3806534ad5d2930cd7b135ee78200b1d43f937cfcc3c3864263c6da8d0271476450f86b0ea2b84461a05ee794a3a1f3ed08086db9f0c1d1ed9d4f05a37db3
DIST heat-8.0.0.tar.gz 2311784 SHA256
edccf56b31a9c4cc01ba47c66f7b7197e3056f66c333c0c3f29b4ee44000f583 SHA512
bbc4d19b254069e46f2bda554336f4fd0bc5eeb96974e1c997efca94304e32668ca6584671b5121af07004925829c770345356ebb0b113a4c1ff5dc2a949bcd7
WHIRLPOOL
7787008629aba8ad4e369822e2fd555df2d95a127246bd080de5d7b728bcc3ab049cd8097cc9618ce29e10e1f66af9335b58fa45cb604ca1b01208219cf3bc3c
+DIST heat.conf.sample-2017.1. 88798 SHA256
688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512
5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
WHIRLPOOL
9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
+DIST heat.conf.sample-8.0.0 88798 SHA256
688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512
5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
WHIRLPOOL
9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
diff --git a/sys-cluster/heat/files/ocata-heat.conf.sample
b/sys-cluster/heat/files/ocata-heat.conf.sample
deleted file mode 100644
index 200ae61940..00
--- a/sys-cluster/heat/files/ocata-heat.conf.sample
+++ /dev/null
@@ -1,2635 +0,0 @@
-[DEFAULT]
-
-#
-# From heat.api.middleware.ssl
-#
-
-# The HTTP Header that will be used to determine what the original request
-# protocol scheme was, even if it was removed by an SSL terminator proxy.
-# (string value)
-# Deprecated group/name - [DEFAULT]/secure_proxy_ssl_header
-#secure_proxy_ssl_header = X-Forwarded-Proto
-
-#
-# From heat.common.config
-#
-
-# Name of the engine node. This can be an opaque identifier. It is not
-# necessarily a hostname, FQDN, or IP address. (string value)
-#host = slaanesh
-
-# List of directories to search for plug-ins. (list value)
-#plugin_dirs =
/usr/lib64/heat,/usr/lib/heat,/usr/local/lib/heat,/usr/local/lib64/heat
-
-# The directory to search for environment files. (string value)
-#environment_dir = /etc/heat/environment.d
-
-# The directory to search for template files. (string value)
-#template_dir = /etc/heat/templates
-
-# Select deferred auth method, stored password or trusts. (string value)
-# Allowed values: password, trusts
-#deferred_auth_method = trusts
-
-# Allow reauthentication on token expiry, such that long-running tasks may
-# complete. Note this defeats the expiry of any provided user tokens. (string
-# value)
-# Allowed values: '', trusts
-#reauthentication_auth_method =
-
-# Gap, in seconds, to determine whether the given token is about to expire.
-# (integer value)
-#stale_token_duration = 30
-
-# Subset of trustor roles to be delegated to heat. If left unset, all roles of
-# a user will be delegated to heat when creating a stack. (list value)
-#trusts_delegated_roles =
-
-# Maximum resources allowed per top-level stack. -1 stands for unlimited.
-# (integer value)
-#max_resources_per_stack = 1000
-
-# Maximum number of stacks any one tenant may have active at one time. (integer
-# value)
-#max_stacks_per_tenant = 100
-
-# Number of times to retry to bring a resource to a non-error state. Set to 0
-# to disable retries. (integer value)
-#action_retry_limit = 5
-
-# Number of times to retry when a client encounters an expected intermittent
-# error. Set to 0 to disable retries. (integer value)
-#client_retry_limit = 2
-
-# Maximum length of a server name to be used in nova. (integer value)
-# Maximum value: 53
-#max_server_name_length = 53
-
-# Number of times to check whether an interface has been attached