Merge "[tls] Make a cert SLS IDs globally unique"
diff --git a/README.rst b/README.rst
index fc9691a..41b793b 100644
--- a/README.rst
+++ b/README.rst
@@ -67,6 +67,7 @@
virtual_host: '/openstack'
ha_queues: True
max_stacks_per_tenant: 150
+ max_nested_stack_depth: 10
Define server clients keystone parameter
diff --git a/heat/files/juno/heat.conf.Debian b/heat/files/juno/heat.conf.Debian
index 08cab0e..1673e2b 100644
--- a/heat/files/juno/heat.conf.Debian
+++ b/heat/files/juno/heat.conf.Debian
@@ -57,6 +57,9 @@
{%- if server.max_stacks_per_tenant is defined %}
max_stacks_per_tenant = {{ server.max_stacks_per_tenant }}
{%- endif %}
+{%- if server.max_nested_stack_depth is defined %}
+max_nested_stack_depth = {{ server.max_nested_stack_depth }}
+{%- endif %}
# Number of times to retry to bring a resource to a non-error
# state. Set to 0 to disable retries. (integer value)
diff --git a/heat/files/kilo/heat.conf.Debian b/heat/files/kilo/heat.conf.Debian
index 4e8147d..f9224c2 100644
--- a/heat/files/kilo/heat.conf.Debian
+++ b/heat/files/kilo/heat.conf.Debian
@@ -197,6 +197,9 @@
{%- if server.max_stacks_per_tenant is defined %}
max_stacks_per_tenant = {{ server.max_stacks_per_tenant }}
{%- endif %}
+{%- if server.max_nested_stack_depth is defined %}
+max_nested_stack_depth = {{ server.max_nested_stack_depth }}
+{%- endif %}
[heat_api]
diff --git a/heat/files/liberty/heat.conf.Debian b/heat/files/liberty/heat.conf.Debian
index 68f47d5..0f1a06d 100644
--- a/heat/files/liberty/heat.conf.Debian
+++ b/heat/files/liberty/heat.conf.Debian
@@ -204,6 +204,9 @@
{%- if server.max_stacks_per_tenant is defined %}
max_stacks_per_tenant = {{ server.max_stacks_per_tenant }}
{%- endif %}
+{%- if server.max_nested_stack_depth is defined %}
+max_nested_stack_depth = {{ server.max_nested_stack_depth }}
+{%- endif %}
[heat_api]
diff --git a/heat/files/mitaka/heat.conf.Debian b/heat/files/mitaka/heat.conf.Debian
index 8ba4eb7..de8ef4b 100644
--- a/heat/files/mitaka/heat.conf.Debian
+++ b/heat/files/mitaka/heat.conf.Debian
@@ -209,6 +209,9 @@
{%- if server.max_stacks_per_tenant is defined %}
max_stacks_per_tenant = {{ server.max_stacks_per_tenant }}
{%- endif %}
+{%- if server.max_nested_stack_depth is defined %}
+max_nested_stack_depth = {{ server.max_nested_stack_depth }}
+{%- endif %}
[heat_api]
diff --git a/heat/files/mitaka/heat.conf.RedHat b/heat/files/mitaka/heat.conf.RedHat
index 768eb72..7c088c3 100644
--- a/heat/files/mitaka/heat.conf.RedHat
+++ b/heat/files/mitaka/heat.conf.RedHat
@@ -197,6 +197,9 @@
{%- if server.max_stacks_per_tenant is defined %}
max_stacks_per_tenant = {{ server.max_stacks_per_tenant }}
{%- endif %}
+{%- if server.max_nested_stack_depth is defined %}
+max_nested_stack_depth = {{ server.max_nested_stack_depth }}
+{%- endif %}
[heat_api]
diff --git a/heat/files/newton/heat.conf.Debian b/heat/files/newton/heat.conf.Debian
index 1f97cd8..1a99387 100644
--- a/heat/files/newton/heat.conf.Debian
+++ b/heat/files/newton/heat.conf.Debian
@@ -219,6 +219,9 @@
{%- if server.max_stacks_per_tenant is defined %}
max_stacks_per_tenant = {{ server.max_stacks_per_tenant }}
{%- endif %}
+{%- if server.max_nested_stack_depth is defined %}
+max_nested_stack_depth = {{ server.max_nested_stack_depth }}
+{%- endif %}
[heat_api]
diff --git a/heat/files/ocata/heat.conf.Debian b/heat/files/ocata/heat.conf.Debian
index 048fc3f..9375e27 100644
--- a/heat/files/ocata/heat.conf.Debian
+++ b/heat/files/ocata/heat.conf.Debian
@@ -243,6 +243,9 @@
# Maximum depth allowed when using nested stacks. (integer value)
#max_nested_stack_depth = 5
+{%- if server.max_nested_stack_depth is defined %}
+max_nested_stack_depth = {{ server.max_nested_stack_depth }}
+{%- endif %}
# Number of heat-engine processes to fork and run. Will default to either to 4
# or number of CPUs on the host, whichever is greater. (integer value)
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 0c5f303..14f0750 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -59,3 +59,4 @@
'cloudformation:ValidateTemplate': 'rule:deny_stack_user'
'cloudformation:DescribeStackResource':
max_stacks_per_tenant: 150
+ max_nested_stack_depth: 10