obinstall

Merge lp:~secroft/obinstall/obinstallvmfix into lp:obinstall

  1. obinstallvmfix
  2. Merge into 15.10
Proposed by Scott Croft
Status: Needs review
Proposed branch: lp:~secroft/obinstall/obinstallvmfix
Merge into: lp:obinstall
Diff against target: 26 lines (+4/-4)
1 file modified
04-add_virtual_nodes.sh (+4/-4)
To merge this branch: bzr merge lp:~secroft/obinstall/obinstallvmfix
Reviewer Review Type Date Requested Status
David Diez (community) Approve
Review via email: mp+291430@code.launchpad.net

Description of the change

Changed the vm location from /var/lib/orange-box to /srv/orange-box

To post a comment you must log in.
Revision history for this message
David Diez (davediez) wrote :

Looks simple enough fix. Approved.

review: Approve
Reply

Unmerged revisions

73. By Scott Croft

Changed vm location to /srv/orange-box

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '04-add_virtual_nodes.sh'
2--- 04-add_virtual_nodes.sh 2016-02-04 22:56:43 +0000
3+++ 04-add_virtual_nodes.sh 2016-04-09 01:19:01 +0000
4@@ -42,8 +42,8 @@
5 # If directory exist then change ownership
6 [ -d /var/lib/maas ] || install -d /var/lib/maas --owner maas --group maas
7
8-# Create the /var/lib/orange-box directory
9-[ -d /var/lib/orange-box ] || mkdir /var/lib/orange-box
10+# Create the /srv/orange-box directory
11+[ -d /srv/orange-box ] || mkdir /srv/orange-box
12
13 # Change login shell to Bash for MAAS user
14 chsh maas -s /bin/bash
15@@ -101,9 +101,9 @@
16 virsh undefine $hostname || true
17 echo "INFO: Installing virtual machine"
18 if [ $i = 0 ]; then
19- virt-install --debug --name $hostname --ram 6144 --disk=path=/var/lib/orange-box/${hostname}-1.img,size=20 --disk=path=/var/lib/orange-box/${hostname}-2.img,size=2 --vcpus=2 --os-type=linux --pxe --network=bridge=br0 --network=bridge=br0 --boot network --video=cirrus --graphics vnc|| true
20+ virt-install --debug --name $hostname --ram 6144 --disk=path=/srv/orange-box/${hostname}-1.img,size=20 --disk=path=/srv/orange-box/${hostname}-2.img,size=2 --vcpus=2 --os-type=linux --pxe --network=bridge=br0 --network=bridge=br0 --boot network --video=cirrus --graphics vnc|| true
21 else
22- virt-install --debug --name $hostname --ram 4096 --disk=path=/var/lib/orange-box/${hostname}-1.img,size=20 --disk=path=/var/lib/orange-box/${hostname}-2.img,size=2 --vcpus=2 --os-type=linux --pxe --network=bridge=br0 --network=bridge=br0 --boot network --video=cirrus --graphics vnc|| true
23+ virt-install --debug --name $hostname --ram 4096 --disk=path=/srv/orange-box/${hostname}-1.img,size=20 --disk=path=/srv/orange-box/${hostname}-2.img,size=2 --vcpus=2 --os-type=linux --pxe --network=bridge=br0 --network=bridge=br0 --boot network --video=cirrus --graphics vnc|| true
24 fi
25 virsh console $hostname || true
26 virsh autostart $hostname

Subscribers

People subscribed via source and target branches

to all changes: