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
This commit is contained in:
Dan Prince 2014-12-05 21:07:32 -05:00
parent 4c35b1b358
commit b91f8cd492

@ -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}