From fc3c0db9f89a56407b80c4752d959017bde50689 Mon Sep 17 00:00:00 2001 From: Ricardo Noriega Date: Wed, 8 Nov 2017 14:52:01 +1100 Subject: [PATCH] Fixing typos in the Bagpipe driver environment file It avoids to successfully deploy BGPVPN with Bagpipe driver. Change-Id: Icfac1a842475e123310cae52f0c701c96cc55bb4 Closes-Bug: #1730859 Signed-off-by: Ricardo Noriega --- environments/neutron-bgpvpn-bagpipe.yaml | 12 ++++++------ puppet/services/neutron-bgpvpn-bagpipe.yaml | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/environments/neutron-bgpvpn-bagpipe.yaml b/environments/neutron-bgpvpn-bagpipe.yaml index 9236663c22..1812be9def 100644 --- a/environments/neutron-bgpvpn-bagpipe.yaml +++ b/environments/neutron-bgpvpn-bagpipe.yaml @@ -16,11 +16,11 @@ parameter_defaults: BgpvpnServiceProvider: 'BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default' # Required (example) - # BapipeMyAs: 64512 + # BagpipeMyAs: 64512 # Optional (example) - # BapipeApiPort: 8084 - # BapipeDataplaneDriverIpVpn: 'ovs' - # BapipeEnableRtc: true - # BapipeOvsBridge: br-mpls - # BapipePeers: 192.168.10.1,192.168.10.2 + # BagpipeApiPort: 8084 + # BagpipeDataplaneDriverIpVpn: 'ovs' + # BagpipeEnableRtc: true + # BagpipeOvsBridge: br-mpls + # BagpipePeers: 192.168.10.1,192.168.10.2 diff --git a/puppet/services/neutron-bgpvpn-bagpipe.yaml b/puppet/services/neutron-bgpvpn-bagpipe.yaml index 88a0bfe9f7..52d776a885 100644 --- a/puppet/services/neutron-bgpvpn-bagpipe.yaml +++ b/puppet/services/neutron-bgpvpn-bagpipe.yaml @@ -4,27 +4,27 @@ description: > Bagpipe Driver configured with Puppet parameters: - BapipeMyAs: + BagpipeMyAs: default: description: Private Autonomous System number type: number - BapipeApiPort: + BagpipeApiPort: default: 8084 description: BGP component API port type: number - BapipeDataplaneDriverIpVpn: + BagpipeDataplaneDriverIpVpn: default: 'ovs' description: IP VPN dataplane drvier class type: string - BapipeEnableRtc: + BagpipeEnableRtc: default: true description: Enable Route Target Constraint type: boolean - BapipeOvsBridge: + BagpipeOvsBridge: default: 'br-mpls' description: OVS bridge to use type: string - BapipePeers: + BagpipePeers: default: '' description: List of peers' IPs to establish BGP connections type: comma_delimited_list @@ -64,7 +64,7 @@ outputs: neutron::agents::bagpipe::my_as: {get_param: BagpipeMyAs} neutron::agents::bagpipe::api_port: {get_param: BagpipeApiPort} neutron::agents::bagpipe::dataplane_driver_ipvpn: {get_param: BagpipeDataplaneDriverIpVpn} - neutron::agents::bagpipe::enable_rtc: {get_param: BapipeEnableRtc} + neutron::agents::bagpipe::enable_rtc: {get_param: BagpipeEnableRtc} neutron::agents::bagpipe::ovs_bridge: {get_param: BagpipeOvsBridge} neutron::agents::bagpipe::peers: {get_param: BagpipePeers} step_config: |