summaryrefslogtreecommitdiffstats
path: root/ci/02-maasdeploy.sh
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-25 15:16:00 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-26 20:08:47 +0000
commit7d9a7a9d5a258168233eaa61ab8a0c65001b723b (patch)
tree08a0ffc7c498961f3966ef40bf2ef318c8e97afe /ci/02-maasdeploy.sh
parentbee790b3b2ef7c1af626e79373b277272dc23d73 (diff)
make the vlan configurable on all interface.
Change-Id: I3804e03769a2e940f4b783417a04922e3e478841 (cherry picked from commit 5795660c064530e2684b4567f456c512d997ca12)
Diffstat (limited to 'ci/02-maasdeploy.sh')
-rwxr-xr-xci/02-maasdeploy.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index e0e3ca89..dc926361 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -122,7 +122,7 @@ crnodevlanint() {
for nodes in $listofnodes
do
- parentid=`maas maas interface read $nodes eth2 | grep interfaces | cut -d '/' -f 8`
+ parentid=`maas maas interface read $nodes $2 | grep interfaces | cut -d '/' -f 8`
maas maas interfaces create-vlan $nodes vlan=$1 parent=$parentid
done
}
@@ -176,8 +176,8 @@ case "$1" in
maas refresh
crvlanupdsubnet vlan721 1 "DataNetwork" 721 2 || true
crvlanupdsubnet vlan724 2 "PublicNetwork" 724 3 || true
- crnodevlanint $vlan721 || true
- crnodevlanint $vlan724 || 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
;;
@@ -201,10 +201,10 @@ case "$1" in
maas refresh
crvlanupdsubnet vlan1201 1 "DataNetwork" 1201 2 || true
crvlanupdsubnet vlan1202 2 "PublicNetwork" 1202 3 || true
- crnodevlanint $vlan1201 || true
- crnodevlanint $vlan1202 || true
- enableautomode eth2.1201 AUTO "172.16.121.3/24" compute || true
- enableautomode eth2.1201 AUTO "172.16.121.3/24" control || true
+ crnodevlanint $vlan1201 eth1 || true
+ crnodevlanint $vlan1202 eth1 || true
+ enableautomode eth1.1201 AUTO "172.16.121.3/24" compute || true
+ enableautomode eth1.1201 AUTO "172.16.121.3/24" control || true
;;
esac