From: Dan Prince <dprince@redhat.com>
Date: Sat, 6 Dec 2014 02:07:32 +0000 (-0500)
Subject: Remove missing cinder-storage Neutron* parameters
X-Git-Tag: opnfv-6.0.0~2710
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b91f8cd4928d82a84ac291cd5320b9952a01c4ae;p=apex-tripleo-heat-templates.git

Remove missing cinder-storage Neutron* parameters

In I00af10e07feed6c9c97ee6cad545dbff88cd6afc we removed the
Neutron* parameters from cinder-storage.yaml but we forgot to
also remove them from overcloud-without-mergepy.yaml.

Change-Id: I09f2eb278fa0eba1dff80884f12b6f682c7b0484
---

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 73ca25ea..c2891204 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -610,10 +610,6 @@ resources:
           CinderPassword: {get_param: CinderPassword}
           VirtualIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
           KeyName: {get_param: KeyName}
-          NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling}
-          NeutronNetworkType: {get_param: NeutronNetworkType}
-          NeutronPassword: {get_param: NeutronPassword}
-          NeutronPublicInterface: {get_param: NeutronPublicInterface}
           Flavor: {get_param: OvercloudBlockStorageFlavor}
           RabbitPassword: {get_param: RabbitPassword}
           RabbitUserName: {get_param: RabbitUserName}