From: James Slagle <jslagle@redhat.com>
Date: Thu, 17 Jul 2014 15:13:34 +0000 (-0400)
Subject: Remove extra list
X-Git-Tag: opnfv-6.0.0~2797^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2a55b0be688db98405de3632ff3d9e8fe3e80034;p=apex-tripleo-heat-templates.git

Remove extra list

We are using "ctlplane" as the first parameter to Fn::Select here, so
the second parameter must be a map, not a list. Fixes the following
error:

ERROR: Property error : BlockStorage0Deployment: input_values Index to
"Fn::Select" must be an integer

Change-Id: I34153543f8c3152df449e1b42e1f76a78a7d6ba3
---

diff --git a/block-storage.yaml b/block-storage.yaml
index 16363b59..55a629a0 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -30,7 +30,7 @@ Resources:
       input_values:
         controller_host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
         cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , '/cinder']]}
-        neutron_local_ip: {"Fn::Select": [0, "Fn::Select": [ctlplane, [{"Fn::GetAtt": [BlockStorage0 , networks]}]]]}
+        neutron_local_ip: {"Fn::Select": [0, "Fn::Select": [ctlplane, {"Fn::GetAtt": [BlockStorage0 , networks]}]]}
   BlockStorageConfig:
     Type: OS::Heat::StructuredConfig
     Properties: