summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2014-12-05 21:07:32 -0500
committerDan Prince <dprince@redhat.com>2014-12-05 21:07:32 -0500
commitb91f8cd4928d82a84ac291cd5320b9952a01c4ae (patch)
tree858d46e5430ce559d85a4ffb33916392560eb909
parent4c35b1b35837e2abd3419a2bd23c4453a61695e9 (diff)
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
-rw-r--r--overcloud-without-mergepy.yaml4
1 files changed, 0 insertions, 4 deletions
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}