X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fmaas%2Fintel%2Fpod5%2Fdeployment.yaml;h=bacf6aa5d8d37efe64da513aa627bc08abca3161;hb=3ff5b9114e07349bb4a4b5578394bd799950dcf6;hp=a33f8e0df425cbf05ada1307df39822550626f38;hpb=4e6b5c1045fb67a02f5f61f5e270aae39bdd7a86;p=joid.git

diff --git a/ci/maas/intel/pod5/deployment.yaml b/ci/maas/intel/pod5/deployment.yaml
index a33f8e0d..bacf6aa5 100755
--- a/ci/maas/intel/pod5/deployment.yaml
+++ b/ci/maas/intel/pod5/deployment.yaml
@@ -10,10 +10,10 @@ demo-maas:
         # Contains the virtual machine parameters for creating the MAAS virtual
         # server. Here you can configure the name of the virsh domain, the
         # parameters for how the network is attached.
-        name: maas-boot-vm-dc1
-        interfaces: ['bridge=br0,model=virtio']
+        name: opnfv-maas-intel
+        interfaces: ['bridge=brAdm,model=virtio','bridge=brData,model=virtio','bridge=brPublic,model=virtio']
         memory: 4096
-        vcpus: 2
+        vcpus: 4
         arch: amd64
         pool: default
         disk_size: 160G
@@ -46,7 +46,7 @@ demo-maas:
         settings:
             main_archive: http://us.archive.ubuntu.com/ubuntu
             upstream_dns: 10.4.0.2
-            maas_name: automaas
+            maas_name: intelpod5
             # kernel_opts: "console=tty0 console=ttyS1,115200n8"
             # ntp_server: ntp.ubuntu.com
 
@@ -74,6 +74,19 @@ demo-maas:
             gateway 10.4.0.1
             dns-nameservers 10.4.0.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
+
+            auto eth2
+            iface eth2 inet static
+            address 10.2.65.3
+            netmask 255.255.255.0
+            network 10.2.65.0
+            broadcast 10.2.65.255
             #auto lo
             #iface lo inet loopback
 
@@ -104,11 +117,32 @@ demo-maas:
               dynamic_range:
                   low: 10.4.1.50
                   high: 10.4.1.254
-
+            - device: eth1
+              ip: 10.4.9.2
+              subnet_mask: 255.255.255.0
+              broadcast_ip: 10.4.9.255
+              management: 1
+              static_range:
+                  low: 10.4.9.20
+                  high: 10.4.9.100
+              dynamic_range:
+                  low: 10.4.9.101
+                  high: 10.4.9.200
+            - device: eth2
+              ip: 10.2.65.3
+              subnet_mask: 255.255.255.0
+              broadcast_ip: 10.2.65.255
+              management: 1
+              static_range:
+                  low: 10.2.65.20
+                  high: 10.2.65.100
+              dynamic_range:
+                  low: 10.2.65.101
+                  high: 10.2.65.200
         # Defines the physical nodes which are added to the MAAS cluster
         # controller upon startup of the node.
         nodes:
-            - name: node5
+            - name: node5-compute
               tags: compute
               architecture: amd64/generic
               mac_addresses:
@@ -126,7 +160,7 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
                 
-            - name: node4
+            - name: node4-control
               tags: control
               architecture: amd64/generic
               mac_addresses:
@@ -144,7 +178,7 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node3
+            - name: node3-control
               tags: control
               architecture: amd64/generic
               mac_addresses:
@@ -162,7 +196,7 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node2
+            - name: node2-control
               tags: control
               architecture: amd64/generic
               mac_addresses:
@@ -193,9 +227,9 @@ demo-maas:
     # node virtual machine
     juju-bootstrap:
         name: bootstrap
-        interfaces: ['bridge=br0,model=virtio']
+        interfaces: ['bridge=brAdm,model=virtio','bridge=brData,model=virtio','bridge=brPublic,model=virtio']
         memory: 4096
-        vcpus: 2
+        vcpus: 4
         arch: amd64
         pool: default
         disk_size: 120G