openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove deprecated config-download-environment.yaml"

This commit is contained in:
Zuul 2019-06-25 22:32:25 +00:00 committed by Gerrit Code Review
parent e1384be738 0d9efc3785
commit d31dc6a9cc
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
environments/config-download-environment.yaml
View File

@ -1,14 +0,0 @@
# DEPRECATED: these mappings are now the default in
# overcloud-resource-registry-puppet.j2.yaml. This environment file will be
# removed during the Stein release.
resource_registry:
OS::TripleO::SoftwareDeployment: ../config-download-structured.yaml
OS::Heat::SoftwareDeployment: ../config-download-software.yaml
OS::Heat::StructuredDeployment: ../config-download-structured.yaml
OS::TripleO::DeploymentSteps: OS::Heat::None
OS::TripleO::WorkflowSteps: OS::Heat::None
OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None
OS::TripleO::Ssh::HostPubKey: OS::Heat::None

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -103,7 +103,7 @@ resource_registry:
OS::TripleO::DeployedServerEnvironment: OS::Heat::None
OS::TripleO::DeploymentSteps: OS::Heat::None
OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
OS::TripleO::WorkflowSteps: OS::Heat::None
# services
{%- for role in roles %}