From 76ee9d1d38ea841f9739822d7ae17f97cc4b6806 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Wed, 24 May 2017 15:00:22 +0200 Subject: [PATCH] Remove duplicate PreConfig definition We had two exactly the same definitions of PreConfig in docker_steps.j2.yaml. We should remove one of them. I chose to remove the first definition, as the 2nd definition is amended by change I674a4d9d2c77d1f6fbdb0996f6c9321848e32662, so we'll avoid a conflict. Change-Id: If65e30daefcf6552e085c7648c6691b7068834d4 --- docker/docker-steps.j2 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2 index 030942efa1..86811b86e2 100644 --- a/docker/docker-steps.j2 +++ b/docker/docker-steps.j2 @@ -102,13 +102,6 @@ resources: servers: {get_param: [servers, {{role.name}}]} config: {get_resource: {{role.name}}ArtifactsConfig} - {{role.name}}PreConfig: - type: OS::TripleO::Tasks::{{role.name}}PreConfig - properties: - servers: {get_param: [servers, {{role.name}}]} - input_values: - update_identifier: {get_param: DeployIdentifier} - {{role.name}}HostPrepConfig: type: OS::Heat::SoftwareConfig properties: