From: Ryan Hallisey <rhallise@redhat.com>
Date: Thu, 5 May 2016 14:15:33 +0000 (+0000)
Subject: Combine parameter_default fields
X-Git-Tag: opnfv-6.0.0~1861^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c777279600193040c4ce5ceb7a4a6ef11a3eb470;p=apex-tripleo-heat-templates.git

Combine parameter_default fields

The paramaters field was changed to parameter_defaults
everywhere.  Combine both parameter_default fields.

Change-Id: Ia1874463cdd6bf81be5739363e639bd11312abec
---

diff --git a/environments/docker.yaml b/environments/docker.yaml
index a7e2504c..c03d8511 100644
--- 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