Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 3c5521d)
Combine parameter_default fields
authorRyan Hallisey <rhallise@redhat.com>
Thu, 5 May 2016 14:15:33 +0000 (14:15 +0000)
committerRyan Hallisey <rhallise@redhat.com>
Thu, 5 May 2016 14:18:09 +0000 (14:18 +0000)
The paramaters field was changed to parameter_defaults
everywhere.  Combine both parameter_default fields.

Change-Id: Ia1874463cdd6bf81be5739363e639bd11312abec

environments/docker.yaml patch | blob | history

diff --git a/environments/docker.yaml b/environments/docker.yaml
index a7e2504..c03d851 100644 (file)
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -5,8 +5,6 @@ resource_registry:
 
 parameter_defaults:
   NovaImage: atomic-image
-
-parameter_defaults:
   # Defaults to 'tripleoupstream'.  Specify a local docker registry
   # Example: 192.0.2.1:8787/tripleoupstream
   DockerNamespace: tripleoupstream