openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[stable/queens] Disable default config-download method for PreNetworkConfig" into stable/queens

This commit is contained in:
Zuul 2019-03-07 09:05:02 +00:00 committed by Gerrit Code Review
parent 984aec7345 967542fcb1
commit 27a6520bf9
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,3 +9,7 @@ resource_registry:
OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None
OS::TripleO::Ssh::HostPubKey: OS::Heat::None
# stable/queens fix to enable config-download for PreNetworkConfig
OS::TripleO::Services::BootParams: ../extraconfig/pre_network/boot-params-service.yaml
OS::TripleO::Reboot::SoftwareDeployment: OS::Heat::None

11
environments/disable-config-download-environment.yaml
View File

@ -1,11 +0,0 @@
# 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
# Used only for config-download deployment, for non-config-download deployment,
# PreNetworkConfig (host-config-and-reboot.yaml) stack will handle it.
OS::TripleO::Services::BootParams: OS::Heat::None
OS::TripleO::Reboot::SoftwareDeployment: OS::TripleO::SoftwareDeployment

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

@ -14,7 +14,8 @@ resource_registry:
# Tasks (for internal TripleO usage)
OS::TripleO::Tasks::UpdateWorkflow: OS::Heat::None
OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
OS::TripleO::Reboot::SoftwareDeployment: OS::Heat::None
# stable/queens fix to enabled PreNetworkConfig via heat
OS::TripleO::Reboot::SoftwareDeployment: OS::TripleO::SoftwareDeployment
{% for role in roles %}
OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None
@ -357,7 +358,8 @@ resource_registry:
OS::TripleO::Services::Logging::NovaPlacement: docker/services/logging/files/nova-placement.yaml
OS::TripleO::Services::Logging::PankoApi: docker/services/logging/files/panko-api.yaml
OS::TripleO::Services::BootParams: extraconfig/pre_network/boot-params-service.yaml
# stable/queens fix to disable BootParams service (required for config-download)
OS::TripleO::Services::BootParams: OS::Heat::None
parameter_defaults:
EnablePackageInstall: false