From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 13 May 2016 17:36:14 +0000 (-0600)
Subject: modfiied as per specs from intel pod6 page and real experience.
X-Git-Tag: colorado.1.0~190^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fbfff35468e2843d2df4209cf376fd34da25a6ab;p=joid.git

modfiied as per specs from intel pod6 page and real experience.

Change-Id: Ibc6449532637d5d2d7cbce88456c2721a9ed8cb4
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index e85d57c1..cf8d3844 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -61,7 +61,7 @@ case "$3" in
         # choose the correct interface to use for data network
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.9.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: "eth5"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1.905"/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 fa65c117..2f7e2ea0 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -209,8 +209,14 @@ case "$1" in
         ;;
     'intelpod9' )
         maas refresh
-        enableautomodebyname eth4 AUTO "10.9.12.0/24" compute || true
-        enableautomodebyname eth4 AUTO "10.9.12.0/24" control || true
+        crvlanupdsubnet vlan902 1 "DataNetwork" 902 2 || true
+        crvlanupdsubnet vlan905 2 "PublicNetwork" 905 3 || true
+        crnodevlanint $vlan902 eth0 || true
+        crnodevlanint $vlan905 eth1 || true
+        enableautomodebyname eth0.902 AUTO "10.9.12.0/24" compute || true
+        enableautomodebyname eth1.905 AUTO "10.9.15.0/24" compute || true
+        enableautomodebyname eth0.902 AUTO "10.9.12.0/24" control || true
+        enableautomodebyname eth1.905 AUTO "10.9.15.0/24" control || true
         ;;
     'orangepod2' )
         maas refresh
diff --git a/ci/maas/intel/pod9/deployment.yaml b/ci/maas/intel/pod9/deployment.yaml
index 4b03abd0..b11f1ee7 100755
--- a/ci/maas/intel/pod9/deployment.yaml
+++ b/ci/maas/intel/pod9/deployment.yaml
@@ -145,8 +145,8 @@ demo-maas:
         # Defines the physical nodes which are added to the MAAS cluster
         # controller upon startup of the node.
         nodes:
-            - name: node1-control
-              tags: control
+            - name: node1-compute
+              tags: compute
               architecture: amd64/generic
               mac_addresses:
                   - "00:1E:67:D4:30:38"
@@ -160,11 +160,11 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node4-compute
+            - name: node2-compute
               tags: compute
               architecture: amd64/generic
               mac_addresses:
-                  - "00:1E:67:D4:33:A2"
+                  - "00:1E:67:D4:33:A3"
               power:
                   type: ipmi
                   address: 10.2.117.144
@@ -175,8 +175,8 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node5-compute
-              tags: compute
+            - name: node3-control
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "00:1E:67:D4:2F:BA"