diff options
-rw-r--r-- | overcloud.j2.yaml | 5 | ||||
-rw-r--r-- | puppet/services/ceph-base.yaml | 2 | ||||
-rw-r--r-- | puppet/services/nova-api.yaml | 2 |
3 files changed, 6 insertions, 3 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: diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index a12742ff..6ac287a8 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -117,7 +117,6 @@ outputs: '"%{::fqdn_$NETWORK}"' params: $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]} - nova::wsgi::apache::workers: {get_param: NovaWorkers} nova::wsgi::apache::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]} nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} nova::api::instance_name_template: {get_param: InstanceNameTemplate} @@ -127,6 +126,7 @@ outputs: - nova_workers_zero - {} - nova::api::osapi_compute_workers: {get_param: NovaWorkers} + nova::wsgi::apache::workers: {get_param: NovaWorkers} step_config: | include tripleo::profile::base::nova::api service_config_settings: |