Merge "Update/upgrade prepare/converge in config-download era"

environments/config-download-environment.yaml

@@ -8,6 +8,7 @@ resource_registry:
   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

environments/lifecycle/ffwd-upgrade-converge.yaml

@@ -1,12 +1,6 @@
 # Environment file used in the last step of a ffwd overcloud upgrade.
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml.
-resource_registry:
-  OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
-  OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
-  OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
-  OS::Heat::SoftwareDeployment:  OS::TripleO::Heat::SoftwareDeployment
-  OS::Heat::StructuredDeployment: OS::TripleO::Heat::StructuredDeployment
 parameter_defaults:
   CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
   UpgradeLevelNovaCompute: ''

environments/lifecycle/ffwd-upgrade-prepare.yaml

@@ -4,14 +4,6 @@
 resource_registry:
   OS::TripleO::Services::Core: OS::Heat::None
   OS::TripleO::Services::VipHosts: OS::Heat::None
-  # Set the config-download environment for the stack update:
-  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
   # Deprecated/Name changed services
   OS::TripleO::Services::FluentdClient: OS::Heat::None
 

environments/lifecycle/update-converge.yaml

@@ -1,9 +1,6 @@
 # Environment file used in the last step of an overcloud update.
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml for customizations.
-resource_registry:
-  OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
-  OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
 parameter_defaults:
   CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
   UpgradeLevelNovaCompute: ''

environments/lifecycle/update-prepare.yaml

@@ -2,7 +2,5 @@
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml for customizations.
 resource_registry:
-  OS::TripleO::DeploymentSteps: OS::Heat::None
-  OS::TripleO::WorkflowSteps: OS::Heat::None
   OS::TripleO::Tasks::*PreConfig: OS::Heat::None
   OS::TripleO::Tasks::*PostConfig: OS::Heat::None

environments/lifecycle/upgrade-converge.yaml

@@ -1,9 +1,6 @@
 # Environment file used in the last step of an overcloud upgrade.
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml.
-resource_registry:
-  OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
-  OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
 parameter_defaults:
   CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
   UpgradeLevelNovaCompute: ''

environments/lifecycle/upgrade-prepare.yaml

@@ -2,12 +2,8 @@
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml.
 resource_registry:
-  OS::TripleO::DeploymentSteps: OS::Heat::None
-  OS::TripleO::WorkflowSteps: OS::Heat::None
   OS::TripleO::Tasks::*PreConfig: OS::Heat::None
   OS::TripleO::Tasks::*PostConfig: OS::Heat::None
-  # Deprecated/Name changed services
-  OS::TripleO::Services::FluentdClient: OS::Heat::None
 
 parameter_defaults:
   UpgradeLevelNovaCompute: auto