summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2017-05-24 15:00:22 +0200
committerJiri Stransky <jistr@redhat.com>2017-05-24 15:00:22 +0200
commit76ee9d1d38ea841f9739822d7ae17f97cc4b6806 (patch)
tree59d5085e97b47d4a0070f19212d5145108ff7e2d /docker
parenta42b93d503690cb56d6a1053759f5b9a9a65fd4e (diff)
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
Diffstat (limited to 'docker')
-rw-r--r--docker/docker-steps.j27
1 files changed, 0 insertions, 7 deletions
diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2
index 030942ef..86811b86 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: