diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-26 20:43:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-26 20:43:18 +0000 |
| commit | 86191f117432c39c91217db0ab8249b5d9b4c57a (patch) | |
| tree | f3ece89584a5056a2458bcdc9161f77313c13b0c | |
| parent | 4cc6cd00d58611154d5d98b4ba86a4d36844507c (diff) | |
| parent | 7d9a7a9d5a258168233eaa61ab8a0c65001b723b (diff) | |
Merge "make the vlan configurable on all interface." into stable/brahmaputra
| -rwxr-xr-x | ci/02-maasdeploy.sh | 14 |
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 |