diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-11 20:52:35 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-11 20:52:35 +0000 |
commit | 81ee3b79d01f065528b0e17675aba311863c25b2 (patch) | |
tree | d48c5dd39acc0ec98f9ac94ce71feaf5978a4438 | |
parent | cf8b152c31303f7f4c8d562dbbbc3c1399c6c4dd (diff) | |
parent | c777279600193040c4ce5ceb7a4a6ef11a3eb470 (diff) |
Merge "Combine parameter_default fields"
-rw-r--r-- | environments/docker.yaml | 2 |
1 files changed, 0 insertions, 2 deletions
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 |