X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fextraconfig%2Fpre_deploy%2Fcontroller%2Fneutron-ml2-cisco-n1kv.yaml;h=6eae812fbe00ea0046d83404feee4b7a9eced1ed;hb=f2d5f8a5c0c8a562cc27908ee775e3add95e9ea3;hp=5985116be3b5c16eb5d20ca700796899997b26ae;hpb=f453291db56b1504c4e0c0e5df96061ed0950775;p=apex-tripleo-heat-templates.git

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..6eae812f 100644
--- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: Configure hieradata for Cisco N1KV configuration
 
@@ -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}
@@ -138,6 +142,7 @@ resources:
   CiscoN1kvDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
+      name: CiscoN1kvDeployment
       config: {get_resource: CiscoN1kvConfig}
       server: {get_param: server}
       input_values:
@@ -159,6 +164,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}