diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-01 14:32:51 -0500 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-02 15:31:47 -0500 |
commit | c21e199a328c1d52232c213d2b243016cca46812 (patch) | |
tree | 8b203ef25e00d7f87b695d7ba6eddfb86cf3a3f9 /ci/03-maasdeploy.sh | |
parent | 6baf75637c2543d26e5887f3cb5903b10185e3e1 (diff) |
added support for install from git repository. please modify
default_deployment_config.yaml to install from release repo
for ocata,master etc. Also user can define their own URL and
more information can be obtained at jujucharms.com
Change-Id: I4943dbf68c6d980b2a2da65417b16631df768b48
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/03-maasdeploy.sh')
-rwxr-xr-x | ci/03-maasdeploy.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 43e95857..f66d0cbd 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -12,7 +12,7 @@ fi #install the packages needed sudo apt-add-repository ppa:juju/stable -y sudo apt-add-repository ppa:maas/stable -y -sudo apt-add-repository cloud-archive:newton -y +sudo apt-add-repository cloud-archive:ocata -y sudo apt-get update -y #sudo apt-get dist-upgrade -y sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin juju \ @@ -404,7 +404,7 @@ addnodes(){ fi sudo virt-install --connect qemu:///system --name bootstrap --ram 4098 --cpu host --vcpus 2 --video \ - cirrus --arch x86_64 --disk size=20,format=qcow2,bus=virtio,io=native,pool=default \ + cirrus --arch x86_64 --disk size=20,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \ $netw --boot network,hd,menu=off --noautoconsole \ --vnc --print-xml | tee bootstrap @@ -437,7 +437,7 @@ addnodes(){ NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 ` sudo virt-install --connect qemu:///system --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \ - --disk size=120,format=qcow2,bus=virtio,io=native,pool=default \ + --disk size=120,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \ $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee $NODE_NAME nodemac=`grep "mac address" $NODE_NAME | head -1 | cut -d '"' -f 2` |