openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Switch to config-download by default"

Browse Source
This commit is contained in:
Zuul 2018-04-27 08:14:36 +00:00 committed by Gerrit Code Review
commit 68bfa9828f
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,6 @@
# 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

6
environments/disable-config-download-environment.yaml Normal file
View File

@ -0,0 +1,6 @@
# Deprecated as config-download is now the default.
resource_registry:
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
OS::TripleO::Ssh::HostPubKey: ../extraconfig/tasks/ssh/host_public_key.yaml
OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::StructuredDeployments
OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup

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

@ -1,13 +1,15 @@
resource_registry:
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
OS::TripleO::SoftwareDeployment: config-download-structured.yaml
OS::Heat::SoftwareDeployment: config-download-software.yaml
OS::Heat::StructuredDeployment: config-download-structured.yaml
OS::TripleO::PostDeploySteps: common/post.yaml
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
OS::TripleO::AllNodesDeployment: OS::Heat::StructuredDeployments
OS::TripleO::Hosts::SoftwareConfig: hosts-config.yaml
OS::TripleO::Ssh::HostPubKey: extraconfig/tasks/ssh/host_public_key.yaml
OS::TripleO::Ssh::HostPubKey: OS::Heat::None
OS::TripleO::Ssh::KnownHostsConfig: extraconfig/tasks/ssh/known_hosts_config.yaml
OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::StructuredDeployments
OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None
OS::TripleO::DefaultPasswords: default_passwords.yaml
OS::TripleO::RandomString: OS::Heat::RandomString
@ -94,7 +96,7 @@ resource_registry:
OS::TripleO::DeployedServerEnvironment: OS::Heat::None
OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
OS::TripleO::DeploymentSteps: OS::Heat::None
OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
# services

10
releasenotes/notes/config-download-default-to-true-2331debd56c396eb.yaml Normal file
View File

@ -0,0 +1,10 @@
---
features:
- The mappings from environments/config-download-environment.yaml are now
included by default in overcloud-resource-registry.j2.yaml. config-download
is now the default way of deploying. An environment at
environments/disable-config-download.yaml is added to enable the previous
method, but that method is deprecated.
deprecations:
- environments/disable-config-download.yaml can be used to disable
config-download but is deprecated.