aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorShiva Prasad Rao <shivrao@cisco.com>2015-11-05 15:40:26 -0800
committerShiva Prasad Rao <shivrao@cisco.com>2015-11-05 15:41:28 -0800
commit152f266cb3121698bcd1c2cf1782fd83a186b9d1 (patch)
treee07ad4b5e13b7ae2137dd48670ac57cf09bb9a4d /puppet
parentd635adad148775337c195676bb5c038c1d268d94 (diff)
Add support to tag patch port for Cisco Nexus1000v VSM bringup
In some deployments we will need to tag the patch port connecting to vsm-br in order for traffic to go out. This patch takes passes the vlan parameter to the puppet. Change-Id: I18734ae39007985769db9371abe1740e0f2872f7
Diffstat (limited to 'puppet')
-rw-r--r--puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
index 5985116b..6730ddf1 100644
--- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
@@ -69,6 +69,9 @@ parameters:
N1000vExistingBridge:
type: boolean
default: true
+ N1000vVSMHostMgmtIntfVlan:
+ type: number
+ default: 0
#Plugin Parameters
N1000vVSMUser:
type: string
@@ -125,6 +128,7 @@ resources:
n1k_vsm::vsm_mgmt_netmask: {get_input: n1kv_vsm_mgmt_netmask}
n1k_vsm::vsm_mgmt_gateway: {get_input: n1kv_vsm_gateway_ip}
n1k_vsm::phy_gateway: {get_input: n1kv_vsm_gateway_ip}
+ n1k_vsm::phy_bridge_vlan: {get_input: n1kv_phy_brige_vlan}
# Cisco N1KV driver Parameters
neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_ip: {get_input: n1kv_vsm_ip}
neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_username: {get_input: n1kv_vsm_username}
@@ -159,6 +163,7 @@ resources:
n1kv_vsm_password: {get_param: N1000vVSMPassword}
n1kv_vsm_mgmt_netmask: {get_param: N1000vMgmtNetmask}
n1kv_vsm_gateway_ip: {get_param: N1000vMgmtGatewayIP}
+ n1kv_phy_brige_vlan: {get_param: N1000vVSMHostMgmtIntfVlan}
n1kv_vsm_pacemaker_ctrl: {get_param: N1000vPacemakerControl}
n1kv_vsm_existing_br: {get_param: N1000vExistingBridge}
n1kv_vsm_username: {get_param: N1000vVSMUser}