aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--overcloud.j2.yaml5
-rw-r--r--puppet/services/ceph-base.yaml2
2 files changed, 5 insertions, 2 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 7e1f496c..2e6412db 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -223,7 +223,10 @@ resources:
{{role.name}}AllNodesDeployment:
type: OS::Heat::StructuredDeployments
- depends_on: {{role.name}}HostsDeployment
+ depends_on:
+{% for role_inner in roles %}
+ - {{role_inner.name}}HostsDeployment
+{% endfor %}
properties:
name: {{role.name}}AllNodesDeployment
config: {get_attr: [allNodesConfig, config_id]}
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index 71d81dc2..786e9ddd 100644
--- a/puppet/services/ceph-base.yaml
+++ b/puppet/services/ceph-base.yaml
@@ -82,7 +82,7 @@ conditions:
- rbd
- equals:
- get_param: NovaEnableRbdBackend
- - false
+ - true
outputs:
role_data: