mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-18 11:34:23 +01:00
a243339faa
CLOUDSTACK-9266: Make deleting static routes in private gw workThe to-be-deleted static routes were removed from the json file, instead of putting them there with revoke=true. The script that parses the json now doesn't find it and thus does not delete it.
Example after adding/removing some:
```
root@r-3-VM:/var/cache/cloud# cat /etc/cloudstack/staticroutes.json
{
"1.2.3.0/24": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.2.3.0/24",
"revoke": true
},
"1.2.3.4/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.2.3.4/32",
"revoke": true
},
"1.2.33.3/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.2.33.3/32",
"revoke": true
},
"1.22.2.2/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.22.2.2/32",
"revoke": true
},
"10.1.2.1/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "10.1.2.1/32",
"revoke": true
},
"10.1.200.0/25": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "10.1.200.0/25",
"revoke": true
},
"10.11.12.13/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "10.11.12.13/32",
"revoke": true
},
"172.16.1.3/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "172.16.1.3/32",
"revoke": true
},
"172.16.15.14/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "172.16.15.14/32",
"revoke": false
},
"172.16.17.0/25": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "172.16.17.0/25",
"revoke": false
},
"id": "staticroutes"
}
```
This results in:
```
root@r-3-VM:/var/cache/cloud# ip route show
default via 192.168.23.1 dev eth1
169.254.0.0/16 dev eth0 proto kernel scope link src 169.254.1.67
172.16.0.0/24 dev eth2 proto kernel scope link src 172.16.0.2
172.16.15.14 via 172.16.0.1 dev eth2
172.16.17.0/25 via 172.16.0.1 dev eth2
192.168.23.0/24 dev eth1 proto kernel scope link src 192.168.23.4
```
Two static routes left, the rest deleted:
```
172.16.15.14 via 172.16.0.1 dev eth2
172.16.17.0/25 via 172.16.0.1 dev eth2
```
That also matches the UI:
<img width="1327" alt="screen shot 2016-01-30 at 06 34 06" src="https://cloud.githubusercontent.com/assets/1630096/12693933/83e67d80-c71b-11e5-9241-9f478522b7a4.png">
* pr/1386:
CLOUDSTACK-9266: Make deleting static routes in private gw work
Signed-off-by: Remi Bergsma <github@remi.nl>
####################################################
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