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

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

3be824ad16a972f29eaa100544a1fdfddb344258
diff --cc ci/02-maasdeploy.sh
index d08b9004,2f7e2ea0..9f48bd94
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@@ -209,16 -209,15 +209,22 @@@ case "$1" i
          ;;
      '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
          ;;
 +    'orangepod1' )
 +        maas refresh
 +        enableautomodebyname eth2 DHCP "192.168.21.0/24" compute || true
 +        enableautomodebyname eth3 AUTO "192.168.11.0/24" compute || true
 +        enableautomodebyname eth2 DHCP "192.168.21.0/24" control || true
 +        enableautomodebyname eth3 AUTO "192.168.11.0/24" control || true
 +        ;;
      'orangepod2' )
          maas refresh
          enableautomodebyname eth4 DHCP "192.168.22.0/24" compute || true