mirror of https://github.com/apache/cloudstack.git
b4ebfb640e
CLOUDSTACK-9204 Do not error when staticroute is already goneWhen deleting a static route fails because it isn't there any more (KeyError), it should succeed instead. Error seen: ``` [INFO] Processing JSON file static_routes.json.1451560145 Traceback (most recent call last): File "/opt/cloud/bin/update_config.py", line 140, in <module> process_file() File "/opt/cloud/bin/update_config.py", line 52, in process_file qf.load(None) File "/opt/cloud/bin/merge.py", line 258, in load proc = updateDataBag(self) File "/opt/cloud/bin/merge.py", line 91, in _init_ self.process() File "/opt/cloud/bin/merge.py", line 131, in process dbag = self.process_staticroutes(self.db.getDataBag()) File "/opt/cloud/bin/merge.py", line 179, in process_staticroutes return cs_staticroutes.merge(dbag, self.qFile.data) File "/opt/cloud/bin/cs_staticroutes.py", line 26, in merge del dbag[key] KeyError: u'192.168.0.3' ``` * pr/1298: CLOUDSTACK-9204 Do not error when staticroute is already gone Signed-off-by: Remi Bergsma <github@remi.nl> |
||
|---|---|---|
| .. | ||
| config | ||
| vpn | ||
| xe | ||
| README | ||
| buildsystemvm.sh | ||
| config.dat | ||
| convert.sh | ||
| qemuconvert.sh | ||
| systemvm.vmx | ||
| systemvm.xml | ||
| vhdconvert.sh | ||
README
####################################################
Note there is a new systemvm build script based on
Veewee(Vagrant) under tools/appliance.
####################################################
1. The buildsystemvm.sh script builds a 32-bit system vm disk based on the Debian Squeeze distro. This system vm can boot on any hypervisor thanks to the pvops support in the kernel. It is fully automated
2. The files under config/ are the specific tweaks to the default Debian configuration that are required for CloudStack operation.
3. The variables at the top of the buildsystemvm.sh script can be customized:
IMAGENAME=systemvm # dont touch this
LOCATION=/var/lib/images/systemvm #
MOUNTPOINT=/mnt/$IMAGENAME/ # this is where the image is mounted on your host while the vm image is built
IMAGELOC=$LOCATION/$IMAGENAME.img
PASSWORD=password # password for the vm
APT_PROXY= #you can put in an APT cacher such as apt-cacher-ng
HOSTNAME=systemvm # dont touch this
SIZE=2000 # dont touch this for now
DEBIAN_MIRROR=ftp.us.debian.org/debian
MINIMIZE=true # if this is true, a lot of docs, fonts, locales and apt cache is wiped out
4. The systemvm includes the (non-free) Sun JRE. You can put in the standard debian jre-headless package instead but it pulls in X and bloats the image.
5. You need to be 'root' to run the buildsystemvm.sh script
6. The image is a raw image. You can run the convert.sh tool to produce images suitable for Citrix Xenserver, VMWare and KVM.
* Conversion to Citrix Xenserver VHD format requires the vhd-util tool. You can use the
-- checked in config/bin/vhd-util) OR
-- build the vhd-util tool yourself as follows:
a. The xen repository has a tool called vhd-util that compiles and runs on any linux system (http://xenbits.xensource.com/xen-4.0-testing.hg?file/8e8dd38374e9/tools/blktap2/vhd/ or full Xen source at http://www.xen.org/products/xen_source.html).
b. Apply this patch: http://lists.xensource.com/archives/cgi-bin/mesg.cgi?a=xen-devel&i=006101cb22f6%242004dd40%24600e97c0%24%40zhuo%40cloudex.cn.
c. Build the vhd-util tool
cd tools/blktap2
make
sudo make install
* Conversion to ova (VMWare) requires the ovf tool, available from
http://communities.vmware.com/community/vmtn/server/vsphere/automationtools/ovf
* Conversion to QCOW2 requires qemu-img