From 93ff09e8b1a8c3b0affab9ef5fb8e8ecfd867b81 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Fri, 20 Nov 2015 10:50:35 -0700
Subject: [PATCH] Add a new variable mitel_vlan_id.

---
 resources/templates/provision/mitel/5324/MN_${mac}.cfg | 3 +--
 resources/templates/provision/mitel/5340/MN_${mac}.cfg | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/templates/provision/mitel/5324/MN_${mac}.cfg b/resources/templates/provision/mitel/5324/MN_${mac}.cfg
index e6e9c4746d..b081d013c3 100644
--- a/resources/templates/provision/mitel/5324/MN_${mac}.cfg
+++ b/resources/templates/provision/mitel/5324/MN_${mac}.cfg
@@ -11,7 +11,7 @@
 	<local_sip_port>5060</local_sip_port>
 	<tos>0</tos>
 	<e802_priority>-1</e802_priority>
-	<vlan_id>-1</vlan_id>
+	{if isset($mitel_vlan_id)}<vlan_id>{$mitel_vlan_id}</vlan_id>{else}<vlan_id>-1</vlan_id>{/if}
 	<host_name>sip1</host_name>
 	<domain>-example.com</domain>
 	<addr_type>0</addr_type>
@@ -349,7 +349,6 @@
 		<User State="1" ID="user" DispName="disp username" Pwd="hello" AuthName="user" Realm="" RegSvr="" RegPort="5060" RegScheme="2" ProxySvr="" ProxyPort="5060" ProxyScheme="2" VMSvr="" VMPort="5060" VMScheme="2" OutSvr="" OutPort="5060" OutCtr="0" Ring="1" Line="0" EventSvr="" EventPort="5060" EventScheme="2" NatMode="0" NatType="option" NatIp="0"></User>
 		-->
 	</user_list>
-	{/foreach}
 
 	<!--
 	<ipadr>10.7.0.12</ipadr>
diff --git a/resources/templates/provision/mitel/5340/MN_${mac}.cfg b/resources/templates/provision/mitel/5340/MN_${mac}.cfg
index e643b73d5f..ea1c742f2d 100644
--- a/resources/templates/provision/mitel/5340/MN_${mac}.cfg
+++ b/resources/templates/provision/mitel/5340/MN_${mac}.cfg
@@ -11,7 +11,7 @@
 	<local_sip_port>5060</local_sip_port>
 	<tos>0</tos>
 	<e802_priority>-1</e802_priority>
-	<vlan_id>-1</vlan_id>
+	{if isset($mitel_vlan_id)}<vlan_id>{$mitel_vlan_id}</vlan_id>{else}<vlan_id>-1</vlan_id>{/if}
 	<host_name>sip1</host_name>
 	<domain>-example.com</domain>
 	<addr_type>0</addr_type>
@@ -349,7 +349,6 @@
 		<User State="1" ID="user" DispName="disp username" Pwd="hello" AuthName="user" Realm="" RegSvr="" RegPort="5060" RegScheme="2" ProxySvr="" ProxyPort="5060" ProxyScheme="2" VMSvr="" VMPort="5060" VMScheme="2" OutSvr="" OutPort="5060" OutCtr="0" Ring="1" Line="0" EventSvr="" EventPort="5060" EventScheme="2" NatMode="0" NatType="option" NatIp="0"></User>
 		-->
 	</user_list>
-	{/foreach}
 
 	<!--
 	<ipadr>10.7.0.12</ipadr>