added the change as per switch in intel pod5.

Change-Id: I757cf4cc90a8f47939aeed464584fbbf650faf19
(cherry picked from commit ca3e6fb9f81240ae141c7edcd5adb2550b8b57b6)

3 files changed, 69 insertions, 71 deletions

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index e1228a80..695cae52 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -40,11 +40,11 @@ case "$3" in
          ;;
      'intelpod5' )
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
-         sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
+         sed -i -- 's/10.4.1.1/10.5.1.2/g' ./bundles.yaml
         # choose the correct interface to use for data network
-         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
+         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.5.12.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2.724"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth5"/g' ./bundles.yaml
         # Provide the gateway MAC to route the traffic externally.
          sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml
         ;;
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 6fa003f3..e1e4f978 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -193,12 +193,8 @@ fi
 case "$1" in
     'intelpod5' )
         maas refresh
-        crvlanupdsubnet vlan721 1 "DataNetwork" 721 2 || true
-        crvlanupdsubnet vlan724 2 "PublicNetwork" 724 3 || true
-        crnodevlanint $vlan721 eth2|| true
-        crnodevlanint $vlan724 eth2|| true
-        enableautomodebyname eth2.721 AUTO "10.4.9.0/24" compute || true
-        enableautomodebyname eth2.721 AUTO "10.4.9.0/24" control || true
+        enableautomodebyname eth4 AUTO "10.5.12.0/24" compute || true
+        enableautomodebyname eth4 AUTO "10.5.12.0/24" control || true
         ;;
     'intelpod6' )
         maas refresh
diff --git a/ci/maas/intel/pod5/deployment.yaml b/ci/maas/intel/pod5/deployment.yaml
index cf276a29..263b3bf6 100755
--- a/ci/maas/intel/pod5/deployment.yaml
+++ b/ci/maas/intel/pod5/deployment.yaml
@@ -11,7 +11,7 @@ demo-maas:
         # server. Here you can configure the name of the virsh domain, the
         # parameters for how the network is attached.
         name: opnfv-maas-intel
-        interfaces: ['bridge=brAdm,model=virtio','bridge=brData,model=virtio','bridge=brPublic,model=virtio']
+        interfaces: ['bridge=brAdm,model=virtio', 'bridge=brData,model=virtio', 'bridge=brPublic,model=virtio', 'bridge=brExt,model=virtio']
         memory: 4096
         vcpus: 4
         arch: amd64
@@ -33,11 +33,11 @@ demo-maas:
         virsh:
             rsa_priv_key: /home/ubuntu/.ssh/id_rsa
             rsa_pub_key: /home/ubuntu/.ssh/id_rsa.pub
-            uri: qemu+ssh://ubuntu@10.4.1.1/system
+            uri: qemu+ssh://jenkins@10.5.1.1/system
 
         # Defines the IP Address that the configuration script will use to
         # to access the MAAS controller via SSH.
-        ip_address: 10.4.1.2
+        ip_address: 10.5.1.2
 
         # This section allows the user to set a series of options on the
         # MAAS server itself. The list of config options can be found in
@@ -45,7 +45,7 @@ demo-maas:
         #  - http://maas.ubuntu.com/docs/api.html#maas-server
         settings:
             main_archive: http://us.archive.ubuntu.com/ubuntu
-            upstream_dns: 10.4.0.2
+            upstream_dns: 8.8.8.8
             maas_name: intelpod5
             # kernel_opts: "console=tty0 console=ttyS1,115200n8"
             # ntp_server: ntp.ubuntu.com
@@ -67,26 +67,27 @@ demo-maas:
 
             auto eth0
             iface eth0 inet static
-            address 10.4.1.2
-            netmask 255.255.248.0
-            network 10.4.0.0
-            broadcast 10.4.7.255
-            gateway 10.4.0.1
-            dns-nameservers 10.4.0.2 127.0.0.1
+            address 10.5.1.2
+            netmask 255.255.255.0
+            network 10.5.1.0
+            broadcast 10.5.1.255
+            gateway 10.5.1.1
+            dns-nameservers 8.8.8.8 10.5.1.2 127.0.0.1
 
             auto eth1
             iface eth1 inet static
-            address 10.4.9.2
-            netmask 255.255.248.0
-            network 10.4.8.0
-            broadcast 10.4.15.255
+            address 10.5.12.2
+            netmask 255.255.255.0
 
             auto eth2
             iface eth2 inet static
-            address 10.2.65.3
+            address 10.5.13.2
+            netmask 255.255.255.0
+
+            auto eth3
+            iface eth3 inet static
+            address 10.2.117.92
             netmask 255.255.255.0
-            network 10.2.65.0
-            broadcast 10.2.65.255
             #auto lo
             #iface lo inet loopback
 
@@ -107,76 +108,77 @@ demo-maas:
         #   ${maas_ip} - the ip address of the MAAS controller 
         node_group_ifaces:
             - device: eth0
-              ip: 10.4.1.2
-              subnet_mask: 255.255.248.0
-              broadcast_ip: 10.4.7.255
-              router_ip: 10.4.0.1
+              ip: 10.5.1.2
+              subnet_mask: 255.255.255.0
+              broadcast_ip: 10.5.1.255
+              router_ip: 10.5.1.1
               static_range:
-                  low: 10.4.2.20
-                  high: 10.4.2.254
+                  low: 10.5.1.50
+                  high: 10.5.1.80
               dynamic_range:
-                  low: 10.4.1.50
-                  high: 10.4.1.254
+                  low: 10.5.1.81
+                  high: 10.5.1.250
             - device: eth1
-              ip: 10.4.9.2
+              ip: 10.5.12.2
               subnet_mask: 255.255.255.0
-              broadcast_ip: 10.4.9.255
+              broadcast_ip: 10.5.12.255
               management: 1
               static_range:
-                  low: 10.4.9.20
-                  high: 10.4.9.100
+                  low: 10.5.12.20
+                  high: 10.5.12.150
               dynamic_range:
-                  low: 10.4.9.101
-                  high: 10.4.9.200
+                  low: 10.5.12.151
+                  high: 10.5.12.200
             - device: eth2
-              ip: 10.2.65.3
+              ip: 10.5.13.2
               subnet_mask: 255.255.255.0
-              broadcast_ip: 10.2.65.255
+              broadcast_ip: 10.5.13.255
               management: 1
               static_range:
-                  low: 10.2.65.20
-                  high: 10.2.65.100
+                  low: 10.5.13.20
+                  high: 10.5.13.150
               dynamic_range:
-                  low: 10.2.65.101
-                  high: 10.2.65.200
+                  low: 10.5.13.151
+                  high: 10.5.13.200
+
         # Defines the physical nodes which are added to the MAAS cluster
         # controller upon startup of the node.
         nodes:
-            - name: node6-control
+            - name: node1-control
               tags: control
               architecture: amd64/generic
               mac_addresses:
-                  - "00:15:17:ac:3b:b4"
+                  - "00:1e:67:cf:bb:54"
               power:
                   type: ipmi
-                  address: 10.4.7.6
+                  address: 10.2.117.81
                   user: root
                   pass: root
                   driver: LAN_2_0
-
-            - name: node5-compute
-              tags: compute
+#              sticky_ip_address:
+#                  mac_address: "38:63:bb:43:b8:9c"
+#                  requested_address: 192.168.122.5
+#
+            - name: node2-control
+              tags: control
               architecture: amd64/generic
               mac_addresses:
-                  - "00:1e:67:e0:0a:4a"
+                  - "00:1e:67:cf:b8:93"
               power:
                   type: ipmi
-                  address: 10.4.7.5
+                  address: 10.2.117.82
                   user: root
                   pass: root
                   driver: LAN_2_0
-#              sticky_ip_address:
-#                  mac_address: "38:63:bb:43:b8:9c"
-#                  requested_address: 192.168.122.5
-                
-            - name: node4-compute
-              tags: compute
+
+            - name: node3-control
+              tags: control
               architecture: amd64/generic
               mac_addresses:
-                  - "00:1e:67:e0:08:b0"
+                  - "00:1e:67:e0:08:7f"
               power:
                   type: ipmi
-                  address: 10.4.7.4
+                  address: 10.2.117.83
                   user: root
                   pass: root
                   driver: LAN_2_0
@@ -184,14 +186,14 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node3-control
-              tags: control
+            - name: node4-compute
+              tags: compute
               architecture: amd64/generic
               mac_addresses:
-                  - "00:1e:67:e0:08:7e"
+                  - "00:1e:67:e0:08:b1"
               power:
                   type: ipmi
-                  address: 10.4.7.3
+                  address: 10.2.117.84
                   user: root
                   pass: root
                   driver: LAN_2_0
@@ -199,14 +201,14 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node2-control
-              tags: control
+            - name: node5-compute
+              tags: compute
               architecture: amd64/generic
               mac_addresses:
-                  - "00:1e:67:cf:b8:92"
+                  - "00:1e:67:e0:0a:4b"
               power:
                   type: ipmi
-                  address: 10.4.7.2
+                  address: 10.2.117.85
                   user: root
                   pass: root
                   driver: LAN_2_0
@@ -227,7 +229,7 @@ demo-maas:
     # node virtual machine
     juju-bootstrap:
         name: bootstrap
-        interfaces: ['bridge=brAdm,model=virtio','bridge=brPublic,model=virtio']
+        interfaces: ['bridge=brAdm,model=virtio', 'bridge=brPublic,model=virtio', 'bridge=brExt,model=virtio']
         memory: 4096
         vcpus: 4
         arch: amd64