You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/11/29 14:12:04 UTC

[cloudstack] branch debian9-systemvmtemplate updated (f449c77 -> d4ad866)

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from f449c77  remove inserv, rearrange pkgs
     new ff94807  remove old dead code/files
     new d4ad866  refactor files, remove old cruft

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../tomcatconf/commands-simulator.properties.in    |  21 --
 client/pom.xml                                     |   1 -
 pom.xml                                            |  35 +-
 systemvm/{ => agent}/certs/localhost.crt           |   0
 systemvm/{ => agent}/certs/localhost.key           |   0
 systemvm/{ => agent}/certs/realhostip.crt          |   0
 systemvm/{ => agent}/certs/realhostip.csr          |   0
 systemvm/{ => agent}/certs/realhostip.key          |   0
 systemvm/{ => agent}/certs/realhostip.keystore     | Bin
 systemvm/{ => agent}/conf/agent.properties         |   0
 systemvm/{ => agent}/conf/consoleproxy.properties  |   0
 systemvm/{ => agent}/conf/environment.properties   |   0
 systemvm/{ => agent}/conf/log4j-cloud.xml          |   0
 systemvm/{ => agent}/css/ajaxviewer.css            |   0
 systemvm/{ => agent}/css/logger.css                |   0
 systemvm/{ => agent}/images/back.gif               | Bin
 systemvm/{ => agent}/images/bright-green.png       | Bin
 systemvm/{ => agent}/images/cad.gif                | Bin
 systemvm/{ => agent}/images/cannotconnect.jpg      | Bin
 systemvm/{ => agent}/images/clr_button.gif         | Bin
 systemvm/{ => agent}/images/clr_button_hover.gif   | Bin
 systemvm/{ => agent}/images/dot.cur                | Bin
 systemvm/{ => agent}/images/gray-green.png         | Bin
 systemvm/{ => agent}/images/grid_headerbg.gif      | Bin
 systemvm/{ => agent}/images/left.png               | Bin
 systemvm/{ => agent}/images/minimize_button.gif    | Bin
 .../{ => agent}/images/minimize_button_hover.gif   | Bin
 systemvm/{ => agent}/images/notready.jpg           | Bin
 systemvm/{ => agent}/images/play_button.gif        | Bin
 systemvm/{ => agent}/images/play_button_hover.gif  | Bin
 systemvm/{ => agent}/images/right.png              | Bin
 systemvm/{ => agent}/images/right2.png             | Bin
 systemvm/{ => agent}/images/shrink_button.gif      | Bin
 .../{ => agent}/images/shrink_button_hover.gif     | Bin
 systemvm/{ => agent}/images/stop_button.gif        | Bin
 systemvm/{ => agent}/images/stop_button_hover.gif  | Bin
 systemvm/{ => agent}/images/winlog.png             | Bin
 systemvm/{ => agent}/js/ajaxkeys.js                |   0
 systemvm/{ => agent}/js/ajaxviewer.js              |   0
 systemvm/{ => agent}/js/cloud.logger.js            |   0
 systemvm/{ => agent}/js/handler.js                 |   0
 systemvm/{ => agent}/js/jquery.flot.navigate.js    |   0
 systemvm/{ => agent}/js/jquery.js                  |   0
 systemvm/{ => agent}/scripts/_run.sh               |   0
 systemvm/{ => agent}/scripts/config_auth.sh        |   0
 systemvm/{ => agent}/scripts/config_ssl.sh         |   0
 systemvm/{ => agent}/scripts/consoleproxy.sh       |   0
 systemvm/{ => agent}/scripts/ipfirewall.sh         |   0
 systemvm/{ => agent}/scripts/run-proxy.sh          |   0
 systemvm/{ => agent}/scripts/run.sh                |   0
 systemvm/{ => agent}/scripts/secstorage.sh         |   0
 systemvm/{ => agent}/scripts/ssvm-check.sh         |   0
 systemvm/{ => agent}/scripts/utils.sh              |   0
 systemvm/{ => agent}/ui/viewer-bad-sid.ftl         |   0
 systemvm/{ => agent}/ui/viewer-connect-failed.ftl  |   0
 systemvm/{ => agent}/ui/viewer-update.ftl          |   0
 systemvm/{ => agent}/ui/viewer.ftl                 |   0
 systemvm/bindir/cloud-setup-console-proxy.in       | 220 ------------
 systemvm/conf.dom0/agent.properties.in             |  46 ---
 systemvm/conf.dom0/consoleproxy.properties.in      |  23 --
 systemvm/conf.dom0/log4j-cloud.xml.in              | 111 ------
 systemvm/conf/agent.properties.ssvm                |  21 --
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |  96 -----
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |  96 -----
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |  96 -----
 .../SYSCONFDIR/init.d/cloud-console-proxy.in       | 110 ------
 systemvm/libexec/console-proxy-runner.in           |  90 -----
 systemvm/patches/debian/README                     |  34 --
 systemvm/patches/debian/config.dat                 | 398 ---------------------
 systemvm/patches/debian/config/etc/chef/node.json  |   5 -
 systemvm/patches/debian/config/etc/chef/solo.rb    |  21 --
 systemvm/patches/debian/convert.sh                 |  64 ----
 .../debian/{config => }/etc/apache2/httpd.conf     |   0
 .../debian/{config => }/etc/apache2/vhost.template |   0
 .../debian/{config => }/etc/cloud-nic.rules        |   0
 .../debian/{config => }/etc/dnsmasq.conf.tmpl      |   0
 .../debian/{config => }/etc/haproxy/haproxy.cfg    |   0
 .../{config => }/etc/init.d/cloud-early-config     |   0
 .../{config => }/etc/init.d/cloud-passwd-srvr      |   0
 .../etc/iptables/iptables-consoleproxy             |   0
 .../{config => }/etc/iptables/iptables-dhcpsrvr    |   0
 .../{config => }/etc/iptables/iptables-elbvm       |   0
 .../{config => }/etc/iptables/iptables-ilbvm       |   0
 .../{config => }/etc/iptables/iptables-router      |   0
 .../{config => }/etc/iptables/iptables-secstorage  |   0
 .../{config => }/etc/iptables/iptables-vpcrouter   |   0
 .../{config => }/etc/iptables/rt_tables_init       |   0
 .../patches/debian/{config => }/etc/iptables/rules |   0
 .../patches/debian/{config => }/etc/logrotate.conf |   0
 .../debian/{config => }/etc/logrotate.d/apache2    |   0
 .../debian/{config => }/etc/logrotate.d/cloud      |   0
 .../debian/{config => }/etc/logrotate.d/conntrackd |   0
 .../debian/{config => }/etc/logrotate.d/dnsmasq    |   0
 .../debian/{config => }/etc/logrotate.d/haproxy    |   0
 .../debian/{config => }/etc/logrotate.d/ppp        |   0
 .../debian/{config => }/etc/logrotate.d/rsyslog    |   0
 .../{config => }/etc/modprobe.d/aesni_intel.conf   |   0
 .../debian/{config => }/etc/modprobe.d/pcspkr.conf |   0
 .../debian/{config => }/etc/profile.d/cloud.sh     |   0
 systemvm/patches/debian/{config => }/etc/rc.local  |   0
 .../patches/debian/{config => }/etc/rsyslog.conf   |   0
 .../debian/{config => }/etc/ssh/sshd_config        |   6 +-
 .../patches/debian/{config => }/etc/sysctl.conf    |   0
 .../debian/{config => }/etc/vpcdnsmasq.conf        |   0
 .../{config => }/opt/cloud/bin/baremetal-vr.py     |   0
 .../{config => }/opt/cloud/bin/baremetal_snat.sh   |   0
 .../{config => }/opt/cloud/bin/bumpup_priority.sh  |   0
 .../{config => }/opt/cloud/bin/checkbatchs2svpn.sh |   0
 .../{config => }/opt/cloud/bin/checkrouter.sh      |   0
 .../{config => }/opt/cloud/bin/checks2svpn.sh      |   0
 .../debian/{config => }/opt/cloud/bin/cloud-nic.sh |   0
 .../debian/{config => }/opt/cloud/bin/configure.py |   0
 .../{config => }/opt/cloud/bin/cs/CsAddress.py     |   0
 .../debian/{config => }/opt/cloud/bin/cs/CsApp.py  |   0
 .../{config => }/opt/cloud/bin/cs/CsConfig.py      |   0
 .../{config => }/opt/cloud/bin/cs/CsDatabag.py     |   0
 .../debian/{config => }/opt/cloud/bin/cs/CsDhcp.py |   0
 .../debian/{config => }/opt/cloud/bin/cs/CsFile.py |   0
 .../opt/cloud/bin/cs/CsGuestNetwork.py             |   0
 .../{config => }/opt/cloud/bin/cs/CsHelper.py      |   0
 .../opt/cloud/bin/cs/CsLoadBalancer.py             |   0
 .../{config => }/opt/cloud/bin/cs/CsMonitor.py     |   0
 .../{config => }/opt/cloud/bin/cs/CsNetfilter.py   |   0
 .../{config => }/opt/cloud/bin/cs/CsProcess.py     |   0
 .../{config => }/opt/cloud/bin/cs/CsRedundant.py   |   0
 .../{config => }/opt/cloud/bin/cs/CsRoute.py       |   0
 .../debian/{config => }/opt/cloud/bin/cs/CsRule.py |   0
 .../opt/cloud/bin/cs/CsStaticRoutes.py             |   0
 .../{config => }/opt/cloud/bin/cs/__init__.py      |   0
 .../{config => }/opt/cloud/bin/cs_cmdline.py       |   0
 .../debian/{config => }/opt/cloud/bin/cs_dhcp.py   |   0
 .../{config => }/opt/cloud/bin/cs_firewallrules.py |   0
 .../opt/cloud/bin/cs_forwardingrules.py            |   0
 .../{config => }/opt/cloud/bin/cs_guestnetwork.py  |   0
 .../debian/{config => }/opt/cloud/bin/cs_ip.py     |   0
 .../{config => }/opt/cloud/bin/cs_loadbalancer.py  |   0
 .../opt/cloud/bin/cs_monitorservice.py             |   0
 .../{config => }/opt/cloud/bin/cs_network_acl.py   |   0
 .../opt/cloud/bin/cs_remoteaccessvpn.py            |   0
 .../{config => }/opt/cloud/bin/cs_site2sitevpn.py  |   0
 .../{config => }/opt/cloud/bin/cs_staticroutes.py  |   0
 .../debian/{config => }/opt/cloud/bin/cs_vmdata.py |   0
 .../debian/{config => }/opt/cloud/bin/cs_vmp.py    |   0
 .../{config => }/opt/cloud/bin/cs_vpnusers.py      |   0
 .../debian/{config => }/opt/cloud/bin/dnsmasq.sh   |   0
 .../debian/{config => }/opt/cloud/bin/edithosts.sh |   0
 .../{config => }/opt/cloud/bin/getRouterAlerts.sh  |   0
 .../opt/cloud/bin/get_template_version.sh          |   0
 .../debian/{config => }/opt/cloud/bin/ilb.sh       |   0
 .../debian/{config => }/opt/cloud/bin/ipassoc.sh   |   0
 .../{config => }/opt/cloud/bin/ipsectunnel.sh      |   0
 .../debian/{config => }/opt/cloud/bin/line_edit.py |   0
 .../{config => }/opt/cloud/bin/loadbalancer.sh     |   0
 .../debian/{config => }/opt/cloud/bin/master.py    |   0
 .../debian/{config => }/opt/cloud/bin/merge.py     |   0
 .../{config => }/opt/cloud/bin/monitor_service.sh  |   0
 .../debian/{config => }/opt/cloud/bin/netusage.sh  |   0
 .../{config => }/opt/cloud/bin/passwd_server       |   0
 .../{config => }/opt/cloud/bin/passwd_server_ip    |   0
 .../{config => }/opt/cloud/bin/passwd_server_ip.py |   0
 .../{config => }/opt/cloud/bin/prepare_pxe.sh      |   0
 .../{config => }/opt/cloud/bin/savepassword.sh     |   0
 .../{config => }/opt/cloud/bin/set_redundant.py    |   0
 .../{config => }/opt/cloud/bin/setup/common.sh     |   0
 .../opt/cloud/bin/setup/consoleproxy.sh            |   0
 .../{config => }/opt/cloud/bin/setup/default.sh    |   0
 .../{config => }/opt/cloud/bin/setup/dhcpsrvr.sh   |   0
 .../{config => }/opt/cloud/bin/setup/elbvm.sh      |   0
 .../{config => }/opt/cloud/bin/setup/ilbvm.sh      |   0
 .../opt/cloud/bin/setup/patchsystemvm.sh           |   4 +-
 .../{config => }/opt/cloud/bin/setup/router.sh     |   0
 .../{config => }/opt/cloud/bin/setup/secstorage.sh |   0
 .../{config => }/opt/cloud/bin/setup/vpcrouter.sh  |   0
 .../{config => }/opt/cloud/bin/update_config.py    |   0
 .../debian/{config => }/opt/cloud/bin/vmdata.py    |   0
 .../debian/{config => }/opt/cloud/bin/vpc_func.sh  |   0
 .../{config => }/opt/cloud/bin/vpc_netusage.sh     |   0
 .../{config => }/opt/cloud/bin/vpc_passwd_server   |   0
 .../debian/{config => }/opt/cloud/bin/vpc_snat.sh  |   0
 .../{config => }/opt/cloud/bin/vpc_staticroute.sh  |   0
 .../debian/{config => }/opt/cloud/bin/vr_cfg.sh    |   0
 .../debian/{config => }/opt/cloud/templates/README |   0
 .../opt/cloud/templates/arping_gateways.sh.templ   |   0
 .../opt/cloud/templates/check_bumpup.sh            |   0
 .../opt/cloud/templates/check_heartbeat.sh.templ   |   0
 .../opt/cloud/templates/checkrouter.sh.templ       |   0
 .../opt/cloud/templates/conntrackd.conf.templ      |   0
 .../opt/cloud/templates/heartbeat.sh.templ         |   0
 .../opt/cloud/templates/keepalived.conf.templ      |   0
 .../debian/{config => }/opt/cloud/testdata/README  |   0
 .../{config => }/opt/cloud/testdata/acl0001.json   |   0
 .../{config => }/opt/cloud/testdata/dhcp0001.json  |   0
 .../{config => }/opt/cloud/testdata/gn0001.json    |   0
 .../{config => }/opt/cloud/testdata/ips0001.json   |   0
 .../{config => }/opt/cloud/testdata/ips0002.json   |   0
 .../{config => }/opt/cloud/testdata/ips0003.json   |   0
 .../{config => }/opt/cloud/testdata/s2s0001.json   |   0
 .../opt/cloud/bin => opt/cloud/testdata}/test.sh   |   0
 .../{config => }/opt/cloud/testdata/vmp0001.json   |   0
 systemvm/patches/debian/qemuconvert.sh             |  32 --
 .../debian/{config => }/root/.ssh/authorized_keys  |   0
 .../debian/{config => }/root/clearUsageRules.sh    |   0
 systemvm/patches/debian/{config => }/root/func.sh  |   0
 .../debian/{config => }/root/monitorServices.py    |   0
 .../patches/debian/{config => }/root/reconfigLB.sh |   0
 systemvm/patches/debian/systemvm.vmx               |  37 --
 systemvm/patches/debian/systemvm.xml               |  53 ---
 .../{config => }/var/www/html/latest/.htaccess     |   0
 .../{config => }/var/www/html/userdata/.htaccess   |   0
 systemvm/patches/debian/vhdconvert.sh              |  40 ---
 systemvm/patches/debian/xe/xe-daemon               |  65 ----
 systemvm/patches/debian/xe/xe-linux-distribution   | 267 --------------
 systemvm/patches/debian/xe/xe-update-guest-attrs   | 226 ------------
 .../{test/python => patches/test}/TestCsAddress.py |   0
 .../{test/python => patches/test}/TestCsApp.py     |   0
 .../{test/python => patches/test}/TestCsCmdLine.py |   0
 .../{test/python => patches/test}/TestCsConfig.py  |   0
 .../{test/python => patches/test}/TestCsDatabag.py |   0
 .../{test/python => patches/test}/TestCsDhcp.py    |   0
 .../{test/python => patches/test}/TestCsFile.py    |   0
 .../python => patches/test}/TestCsGuestNetwork.py  |   0
 .../{test/python => patches/test}/TestCsHelper.py  |   0
 .../python => patches/test}/TestCsInterface.py     |   0
 .../python => patches/test}/TestCsNetfilter.py     |   0
 .../{test/python => patches/test}/TestCsProcess.py |   0
 .../python => patches/test}/TestCsRedundant.py     |   0
 .../{test/python => patches/test}/TestCsRoute.py   |   0
 .../{test/python => patches/test}/TestCsRule.py    |   0
 systemvm/{test/python => patches/test}/runtests.sh |   2 +-
 systemvm/patches/{debian => }/vpn/etc/ipsec.conf   |   0
 .../patches/{debian => }/vpn/etc/ipsec.d/l2tp.conf |   0
 .../patches/{debian => }/vpn/etc/ipsec.secrets     |   0
 .../{debian => }/vpn/etc/ppp/options.xl2tpd        |   0
 .../{debian => }/vpn/etc/xl2tpd/xl2tpd.conf        |   0
 .../{debian => }/vpn/opt/cloud/bin/vpn_l2tp.sh     |   0
 systemvm/pom.xml                                   |  26 +-
 systemvm/scripts/run.bat                           |  18 -
 ...escriptor.xml => systemvm-agent-descriptor.xml} |  16 +-
 systemvm/vm-script/vmops                           | 119 ------
 239 files changed, 27 insertions(+), 2372 deletions(-)
 delete mode 100644 agent-simulator/tomcatconf/commands-simulator.properties.in
 rename systemvm/{ => agent}/certs/localhost.crt (100%)
 rename systemvm/{ => agent}/certs/localhost.key (100%)
 rename systemvm/{ => agent}/certs/realhostip.crt (100%)
 rename systemvm/{ => agent}/certs/realhostip.csr (100%)
 rename systemvm/{ => agent}/certs/realhostip.key (100%)
 rename systemvm/{ => agent}/certs/realhostip.keystore (100%)
 rename systemvm/{ => agent}/conf/agent.properties (100%)
 rename systemvm/{ => agent}/conf/consoleproxy.properties (100%)
 rename systemvm/{ => agent}/conf/environment.properties (100%)
 rename systemvm/{ => agent}/conf/log4j-cloud.xml (100%)
 rename systemvm/{ => agent}/css/ajaxviewer.css (100%)
 rename systemvm/{ => agent}/css/logger.css (100%)
 rename systemvm/{ => agent}/images/back.gif (100%)
 rename systemvm/{ => agent}/images/bright-green.png (100%)
 rename systemvm/{ => agent}/images/cad.gif (100%)
 rename systemvm/{ => agent}/images/cannotconnect.jpg (100%)
 rename systemvm/{ => agent}/images/clr_button.gif (100%)
 rename systemvm/{ => agent}/images/clr_button_hover.gif (100%)
 rename systemvm/{ => agent}/images/dot.cur (100%)
 rename systemvm/{ => agent}/images/gray-green.png (100%)
 rename systemvm/{ => agent}/images/grid_headerbg.gif (100%)
 rename systemvm/{ => agent}/images/left.png (100%)
 rename systemvm/{ => agent}/images/minimize_button.gif (100%)
 rename systemvm/{ => agent}/images/minimize_button_hover.gif (100%)
 rename systemvm/{ => agent}/images/notready.jpg (100%)
 rename systemvm/{ => agent}/images/play_button.gif (100%)
 rename systemvm/{ => agent}/images/play_button_hover.gif (100%)
 rename systemvm/{ => agent}/images/right.png (100%)
 rename systemvm/{ => agent}/images/right2.png (100%)
 rename systemvm/{ => agent}/images/shrink_button.gif (100%)
 rename systemvm/{ => agent}/images/shrink_button_hover.gif (100%)
 rename systemvm/{ => agent}/images/stop_button.gif (100%)
 rename systemvm/{ => agent}/images/stop_button_hover.gif (100%)
 rename systemvm/{ => agent}/images/winlog.png (100%)
 rename systemvm/{ => agent}/js/ajaxkeys.js (100%)
 rename systemvm/{ => agent}/js/ajaxviewer.js (100%)
 rename systemvm/{ => agent}/js/cloud.logger.js (100%)
 rename systemvm/{ => agent}/js/handler.js (100%)
 rename systemvm/{ => agent}/js/jquery.flot.navigate.js (100%)
 rename systemvm/{ => agent}/js/jquery.js (100%)
 rename systemvm/{ => agent}/scripts/_run.sh (100%)
 rename systemvm/{ => agent}/scripts/config_auth.sh (100%)
 rename systemvm/{ => agent}/scripts/config_ssl.sh (100%)
 rename systemvm/{ => agent}/scripts/consoleproxy.sh (100%)
 rename systemvm/{ => agent}/scripts/ipfirewall.sh (100%)
 rename systemvm/{ => agent}/scripts/run-proxy.sh (100%)
 rename systemvm/{ => agent}/scripts/run.sh (100%)
 rename systemvm/{ => agent}/scripts/secstorage.sh (100%)
 rename systemvm/{ => agent}/scripts/ssvm-check.sh (100%)
 rename systemvm/{ => agent}/scripts/utils.sh (100%)
 rename systemvm/{ => agent}/ui/viewer-bad-sid.ftl (100%)
 rename systemvm/{ => agent}/ui/viewer-connect-failed.ftl (100%)
 rename systemvm/{ => agent}/ui/viewer-update.ftl (100%)
 rename systemvm/{ => agent}/ui/viewer.ftl (100%)
 delete mode 100755 systemvm/bindir/cloud-setup-console-proxy.in
 delete mode 100644 systemvm/conf.dom0/agent.properties.in
 delete mode 100644 systemvm/conf.dom0/consoleproxy.properties.in
 delete mode 100644 systemvm/conf.dom0/log4j-cloud.xml.in
 delete mode 100644 systemvm/conf/agent.properties.ssvm
 delete mode 100644 systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
 delete mode 100644 systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
 delete mode 100644 systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
 delete mode 100755 systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
 delete mode 100755 systemvm/libexec/console-proxy-runner.in
 delete mode 100644 systemvm/patches/debian/README
 delete mode 100644 systemvm/patches/debian/config.dat
 delete mode 100644 systemvm/patches/debian/config/etc/chef/node.json
 delete mode 100644 systemvm/patches/debian/config/etc/chef/solo.rb
 delete mode 100755 systemvm/patches/debian/convert.sh
 rename systemvm/patches/debian/{config => }/etc/apache2/httpd.conf (100%)
 rename systemvm/patches/debian/{config => }/etc/apache2/vhost.template (100%)
 rename systemvm/patches/debian/{config => }/etc/cloud-nic.rules (100%)
 rename systemvm/patches/debian/{config => }/etc/dnsmasq.conf.tmpl (100%)
 rename systemvm/patches/debian/{config => }/etc/haproxy/haproxy.cfg (100%)
 rename systemvm/patches/debian/{config => }/etc/init.d/cloud-early-config (100%)
 rename systemvm/patches/debian/{config => }/etc/init.d/cloud-passwd-srvr (100%)
 rename systemvm/patches/debian/{config => }/etc/iptables/iptables-consoleproxy (100%)
 rename systemvm/patches/debian/{config => }/etc/iptables/iptables-dhcpsrvr (100%)
 rename systemvm/patches/debian/{config => }/etc/iptables/iptables-elbvm (100%)
 rename systemvm/patches/debian/{config => }/etc/iptables/iptables-ilbvm (100%)
 rename systemvm/patches/debian/{config => }/etc/iptables/iptables-router (100%)
 rename systemvm/patches/debian/{config => }/etc/iptables/iptables-secstorage (100%)
 rename systemvm/patches/debian/{config => }/etc/iptables/iptables-vpcrouter (100%)
 rename systemvm/patches/debian/{config => }/etc/iptables/rt_tables_init (100%)
 rename systemvm/patches/debian/{config => }/etc/iptables/rules (100%)
 rename systemvm/patches/debian/{config => }/etc/logrotate.conf (100%)
 rename systemvm/patches/debian/{config => }/etc/logrotate.d/apache2 (100%)
 rename systemvm/patches/debian/{config => }/etc/logrotate.d/cloud (100%)
 rename systemvm/patches/debian/{config => }/etc/logrotate.d/conntrackd (100%)
 rename systemvm/patches/debian/{config => }/etc/logrotate.d/dnsmasq (100%)
 rename systemvm/patches/debian/{config => }/etc/logrotate.d/haproxy (100%)
 rename systemvm/patches/debian/{config => }/etc/logrotate.d/ppp (100%)
 rename systemvm/patches/debian/{config => }/etc/logrotate.d/rsyslog (100%)
 rename systemvm/patches/debian/{config => }/etc/modprobe.d/aesni_intel.conf (100%)
 rename systemvm/patches/debian/{config => }/etc/modprobe.d/pcspkr.conf (100%)
 rename systemvm/patches/debian/{config => }/etc/profile.d/cloud.sh (100%)
 rename systemvm/patches/debian/{config => }/etc/rc.local (100%)
 rename systemvm/patches/debian/{config => }/etc/rsyslog.conf (100%)
 rename systemvm/patches/debian/{config => }/etc/ssh/sshd_config (97%)
 rename systemvm/patches/debian/{config => }/etc/sysctl.conf (100%)
 rename systemvm/patches/debian/{config => }/etc/vpcdnsmasq.conf (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/baremetal-vr.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/baremetal_snat.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/bumpup_priority.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/checkbatchs2svpn.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/checkrouter.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/checks2svpn.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cloud-nic.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/configure.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsAddress.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsApp.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsConfig.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsDatabag.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsDhcp.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsFile.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsGuestNetwork.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsHelper.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsLoadBalancer.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsMonitor.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsNetfilter.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsProcess.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsRedundant.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsRoute.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsRule.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/CsStaticRoutes.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs/__init__.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_cmdline.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_dhcp.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_firewallrules.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_forwardingrules.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_guestnetwork.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_ip.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_loadbalancer.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_monitorservice.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_network_acl.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_remoteaccessvpn.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_site2sitevpn.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_staticroutes.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_vmdata.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_vmp.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/cs_vpnusers.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/dnsmasq.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/edithosts.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/getRouterAlerts.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/get_template_version.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/ilb.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/ipassoc.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/ipsectunnel.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/line_edit.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/loadbalancer.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/master.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/merge.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/monitor_service.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/netusage.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/passwd_server (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/passwd_server_ip (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/passwd_server_ip.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/prepare_pxe.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/savepassword.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/set_redundant.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/common.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/consoleproxy.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/default.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/dhcpsrvr.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/elbvm.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/ilbvm.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/patchsystemvm.sh (95%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/router.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/secstorage.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/setup/vpcrouter.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/update_config.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/vmdata.py (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/vpc_func.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/vpc_netusage.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/vpc_passwd_server (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/vpc_snat.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/vpc_staticroute.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/bin/vr_cfg.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/templates/README (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/templates/arping_gateways.sh.templ (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/templates/check_bumpup.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/templates/check_heartbeat.sh.templ (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/templates/checkrouter.sh.templ (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/templates/conntrackd.conf.templ (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/templates/heartbeat.sh.templ (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/templates/keepalived.conf.templ (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/testdata/README (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/testdata/acl0001.json (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/testdata/dhcp0001.json (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/testdata/gn0001.json (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/testdata/ips0001.json (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/testdata/ips0002.json (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/testdata/ips0003.json (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/testdata/s2s0001.json (100%)
 rename systemvm/patches/debian/{config/opt/cloud/bin => opt/cloud/testdata}/test.sh (100%)
 rename systemvm/patches/debian/{config => }/opt/cloud/testdata/vmp0001.json (100%)
 delete mode 100755 systemvm/patches/debian/qemuconvert.sh
 rename systemvm/patches/debian/{config => }/root/.ssh/authorized_keys (100%)
 rename systemvm/patches/debian/{config => }/root/clearUsageRules.sh (100%)
 rename systemvm/patches/debian/{config => }/root/func.sh (100%)
 rename systemvm/patches/debian/{config => }/root/monitorServices.py (100%)
 rename systemvm/patches/debian/{config => }/root/reconfigLB.sh (100%)
 delete mode 100644 systemvm/patches/debian/systemvm.vmx
 delete mode 100644 systemvm/patches/debian/systemvm.xml
 rename systemvm/patches/debian/{config => }/var/www/html/latest/.htaccess (100%)
 rename systemvm/patches/debian/{config => }/var/www/html/userdata/.htaccess (100%)
 delete mode 100755 systemvm/patches/debian/vhdconvert.sh
 delete mode 100644 systemvm/patches/debian/xe/xe-daemon
 delete mode 100644 systemvm/patches/debian/xe/xe-linux-distribution
 delete mode 100644 systemvm/patches/debian/xe/xe-update-guest-attrs
 rename systemvm/{test/python => patches/test}/TestCsAddress.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsApp.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsCmdLine.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsConfig.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsDatabag.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsDhcp.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsFile.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsGuestNetwork.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsHelper.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsInterface.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsNetfilter.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsProcess.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsRedundant.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsRoute.py (100%)
 rename systemvm/{test/python => patches/test}/TestCsRule.py (100%)
 rename systemvm/{test/python => patches/test}/runtests.sh (94%)
 rename systemvm/patches/{debian => }/vpn/etc/ipsec.conf (100%)
 rename systemvm/patches/{debian => }/vpn/etc/ipsec.d/l2tp.conf (100%)
 rename systemvm/patches/{debian => }/vpn/etc/ipsec.secrets (100%)
 rename systemvm/patches/{debian => }/vpn/etc/ppp/options.xl2tpd (100%)
 rename systemvm/patches/{debian => }/vpn/etc/xl2tpd/xl2tpd.conf (100%)
 rename systemvm/patches/{debian => }/vpn/opt/cloud/bin/vpn_l2tp.sh (100%)
 delete mode 100644 systemvm/scripts/run.bat
 rename systemvm/{systemvm-descriptor.xml => systemvm-agent-descriptor.xml} (92%)
 delete mode 100644 systemvm/vm-script/vmops

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].

[cloudstack] 02/02: refactor files, remove old cruft

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit d4ad8663d435b45c43d1d052dbb97fa251496bef
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Nov 29 18:37:56 2017 +0530

    refactor files, remove old cruft
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
 .../tomcatconf/commands-simulator.properties.in    |  21 -------------
 client/pom.xml                                     |   1 -
 pom.xml                                            |  34 ++++-----------------
 systemvm/{ => agent}/certs/localhost.crt           |   0
 systemvm/{ => agent}/certs/localhost.key           |   0
 systemvm/{ => agent}/certs/realhostip.crt          |   0
 systemvm/{ => agent}/certs/realhostip.csr          |   0
 systemvm/{ => agent}/certs/realhostip.key          |   0
 systemvm/{ => agent}/certs/realhostip.keystore     | Bin
 systemvm/{ => agent}/conf/agent.properties         |   0
 systemvm/{ => agent}/conf/consoleproxy.properties  |   0
 systemvm/{ => agent}/conf/environment.properties   |   0
 systemvm/{ => agent}/conf/log4j-cloud.xml          |   0
 systemvm/{ => agent}/css/ajaxviewer.css            |   0
 systemvm/{ => agent}/css/logger.css                |   0
 systemvm/{ => agent}/images/back.gif               | Bin
 systemvm/{ => agent}/images/bright-green.png       | Bin
 systemvm/{ => agent}/images/cad.gif                | Bin
 systemvm/{ => agent}/images/cannotconnect.jpg      | Bin
 systemvm/{ => agent}/images/clr_button.gif         | Bin
 systemvm/{ => agent}/images/clr_button_hover.gif   | Bin
 systemvm/{ => agent}/images/dot.cur                | Bin
 systemvm/{ => agent}/images/gray-green.png         | Bin
 systemvm/{ => agent}/images/grid_headerbg.gif      | Bin
 systemvm/{ => agent}/images/left.png               | Bin
 systemvm/{ => agent}/images/minimize_button.gif    | Bin
 .../{ => agent}/images/minimize_button_hover.gif   | Bin
 systemvm/{ => agent}/images/notready.jpg           | Bin
 systemvm/{ => agent}/images/play_button.gif        | Bin
 systemvm/{ => agent}/images/play_button_hover.gif  | Bin
 systemvm/{ => agent}/images/right.png              | Bin
 systemvm/{ => agent}/images/right2.png             | Bin
 systemvm/{ => agent}/images/shrink_button.gif      | Bin
 .../{ => agent}/images/shrink_button_hover.gif     | Bin
 systemvm/{ => agent}/images/stop_button.gif        | Bin
 systemvm/{ => agent}/images/stop_button_hover.gif  | Bin
 systemvm/{ => agent}/images/winlog.png             | Bin
 systemvm/{ => agent}/js/ajaxkeys.js                |   0
 systemvm/{ => agent}/js/ajaxviewer.js              |   0
 systemvm/{ => agent}/js/cloud.logger.js            |   0
 systemvm/{ => agent}/js/handler.js                 |   0
 systemvm/{ => agent}/js/jquery.flot.navigate.js    |   0
 systemvm/{ => agent}/js/jquery.js                  |   0
 systemvm/{ => agent}/scripts/_run.sh               |   0
 systemvm/{ => agent}/scripts/config_auth.sh        |   0
 systemvm/{ => agent}/scripts/config_ssl.sh         |   0
 systemvm/{ => agent}/scripts/consoleproxy.sh       |   0
 systemvm/{ => agent}/scripts/ipfirewall.sh         |   0
 systemvm/{ => agent}/scripts/run-proxy.sh          |   0
 systemvm/{ => agent}/scripts/run.sh                |   0
 systemvm/{ => agent}/scripts/secstorage.sh         |   0
 systemvm/{ => agent}/scripts/ssvm-check.sh         |   0
 systemvm/{ => agent}/scripts/utils.sh              |   0
 systemvm/{ => agent}/ui/viewer-bad-sid.ftl         |   0
 systemvm/{ => agent}/ui/viewer-connect-failed.ftl  |   0
 systemvm/{ => agent}/ui/viewer-update.ftl          |   0
 systemvm/{ => agent}/ui/viewer.ftl                 |   0
 systemvm/patches/debian/config/etc/chef/node.json  |   5 ---
 systemvm/patches/debian/config/etc/chef/solo.rb    |  21 -------------
 .../debian/{config => }/etc/apache2/httpd.conf     |   0
 .../debian/{config => }/etc/apache2/vhost.template |   0
 .../debian/{config => }/etc/cloud-nic.rules        |   0
 .../debian/{config => }/etc/dnsmasq.conf.tmpl      |   0
 .../debian/{config => }/etc/haproxy/haproxy.cfg    |   0
 .../{config => }/etc/init.d/cloud-early-config     |   0
 .../{config => }/etc/init.d/cloud-passwd-srvr      |   0
 .../etc/iptables/iptables-consoleproxy             |   0
 .../{config => }/etc/iptables/iptables-dhcpsrvr    |   0
 .../{config => }/etc/iptables/iptables-elbvm       |   0
 .../{config => }/etc/iptables/iptables-ilbvm       |   0
 .../{config => }/etc/iptables/iptables-router      |   0
 .../{config => }/etc/iptables/iptables-secstorage  |   0
 .../{config => }/etc/iptables/iptables-vpcrouter   |   0
 .../{config => }/etc/iptables/rt_tables_init       |   0
 .../patches/debian/{config => }/etc/iptables/rules |   0
 .../patches/debian/{config => }/etc/logrotate.conf |   0
 .../debian/{config => }/etc/logrotate.d/apache2    |   0
 .../debian/{config => }/etc/logrotate.d/cloud      |   0
 .../debian/{config => }/etc/logrotate.d/conntrackd |   0
 .../debian/{config => }/etc/logrotate.d/dnsmasq    |   0
 .../debian/{config => }/etc/logrotate.d/haproxy    |   0
 .../debian/{config => }/etc/logrotate.d/ppp        |   0
 .../debian/{config => }/etc/logrotate.d/rsyslog    |   0
 .../{config => }/etc/modprobe.d/aesni_intel.conf   |   0
 .../debian/{config => }/etc/modprobe.d/pcspkr.conf |   0
 .../debian/{config => }/etc/profile.d/cloud.sh     |   0
 systemvm/patches/debian/{config => }/etc/rc.local  |   0
 .../patches/debian/{config => }/etc/rsyslog.conf   |   0
 .../debian/{config => }/etc/ssh/sshd_config        |   6 ++--
 .../patches/debian/{config => }/etc/sysctl.conf    |   0
 .../debian/{config => }/etc/vpcdnsmasq.conf        |   0
 .../{config => }/opt/cloud/bin/baremetal-vr.py     |   0
 .../{config => }/opt/cloud/bin/baremetal_snat.sh   |   0
 .../{config => }/opt/cloud/bin/bumpup_priority.sh  |   0
 .../{config => }/opt/cloud/bin/checkbatchs2svpn.sh |   0
 .../{config => }/opt/cloud/bin/checkrouter.sh      |   0
 .../{config => }/opt/cloud/bin/checks2svpn.sh      |   0
 .../debian/{config => }/opt/cloud/bin/cloud-nic.sh |   0
 .../debian/{config => }/opt/cloud/bin/configure.py |   0
 .../{config => }/opt/cloud/bin/cs/CsAddress.py     |   0
 .../debian/{config => }/opt/cloud/bin/cs/CsApp.py  |   0
 .../{config => }/opt/cloud/bin/cs/CsConfig.py      |   0
 .../{config => }/opt/cloud/bin/cs/CsDatabag.py     |   0
 .../debian/{config => }/opt/cloud/bin/cs/CsDhcp.py |   0
 .../debian/{config => }/opt/cloud/bin/cs/CsFile.py |   0
 .../opt/cloud/bin/cs/CsGuestNetwork.py             |   0
 .../{config => }/opt/cloud/bin/cs/CsHelper.py      |   0
 .../opt/cloud/bin/cs/CsLoadBalancer.py             |   0
 .../{config => }/opt/cloud/bin/cs/CsMonitor.py     |   0
 .../{config => }/opt/cloud/bin/cs/CsNetfilter.py   |   0
 .../{config => }/opt/cloud/bin/cs/CsProcess.py     |   0
 .../{config => }/opt/cloud/bin/cs/CsRedundant.py   |   0
 .../{config => }/opt/cloud/bin/cs/CsRoute.py       |   0
 .../debian/{config => }/opt/cloud/bin/cs/CsRule.py |   0
 .../opt/cloud/bin/cs/CsStaticRoutes.py             |   0
 .../{config => }/opt/cloud/bin/cs/__init__.py      |   0
 .../{config => }/opt/cloud/bin/cs_cmdline.py       |   0
 .../debian/{config => }/opt/cloud/bin/cs_dhcp.py   |   0
 .../{config => }/opt/cloud/bin/cs_firewallrules.py |   0
 .../opt/cloud/bin/cs_forwardingrules.py            |   0
 .../{config => }/opt/cloud/bin/cs_guestnetwork.py  |   0
 .../debian/{config => }/opt/cloud/bin/cs_ip.py     |   0
 .../{config => }/opt/cloud/bin/cs_loadbalancer.py  |   0
 .../opt/cloud/bin/cs_monitorservice.py             |   0
 .../{config => }/opt/cloud/bin/cs_network_acl.py   |   0
 .../opt/cloud/bin/cs_remoteaccessvpn.py            |   0
 .../{config => }/opt/cloud/bin/cs_site2sitevpn.py  |   0
 .../{config => }/opt/cloud/bin/cs_staticroutes.py  |   0
 .../debian/{config => }/opt/cloud/bin/cs_vmdata.py |   0
 .../debian/{config => }/opt/cloud/bin/cs_vmp.py    |   0
 .../{config => }/opt/cloud/bin/cs_vpnusers.py      |   0
 .../debian/{config => }/opt/cloud/bin/dnsmasq.sh   |   0
 .../debian/{config => }/opt/cloud/bin/edithosts.sh |   0
 .../{config => }/opt/cloud/bin/getRouterAlerts.sh  |   0
 .../opt/cloud/bin/get_template_version.sh          |   0
 .../debian/{config => }/opt/cloud/bin/ilb.sh       |   0
 .../debian/{config => }/opt/cloud/bin/ipassoc.sh   |   0
 .../{config => }/opt/cloud/bin/ipsectunnel.sh      |   0
 .../debian/{config => }/opt/cloud/bin/line_edit.py |   0
 .../{config => }/opt/cloud/bin/loadbalancer.sh     |   0
 .../debian/{config => }/opt/cloud/bin/master.py    |   0
 .../debian/{config => }/opt/cloud/bin/merge.py     |   0
 .../{config => }/opt/cloud/bin/monitor_service.sh  |   0
 .../debian/{config => }/opt/cloud/bin/netusage.sh  |   0
 .../{config => }/opt/cloud/bin/passwd_server       |   0
 .../{config => }/opt/cloud/bin/passwd_server_ip    |   0
 .../{config => }/opt/cloud/bin/passwd_server_ip.py |   0
 .../{config => }/opt/cloud/bin/prepare_pxe.sh      |   0
 .../{config => }/opt/cloud/bin/savepassword.sh     |   0
 .../{config => }/opt/cloud/bin/set_redundant.py    |   0
 .../{config => }/opt/cloud/bin/setup/common.sh     |   0
 .../opt/cloud/bin/setup/consoleproxy.sh            |   0
 .../{config => }/opt/cloud/bin/setup/default.sh    |   0
 .../{config => }/opt/cloud/bin/setup/dhcpsrvr.sh   |   0
 .../{config => }/opt/cloud/bin/setup/elbvm.sh      |   0
 .../{config => }/opt/cloud/bin/setup/ilbvm.sh      |   0
 .../opt/cloud/bin/setup/patchsystemvm.sh           |   4 +--
 .../{config => }/opt/cloud/bin/setup/router.sh     |   0
 .../{config => }/opt/cloud/bin/setup/secstorage.sh |   0
 .../{config => }/opt/cloud/bin/setup/vpcrouter.sh  |   0
 .../{config => }/opt/cloud/bin/update_config.py    |   0
 .../debian/{config => }/opt/cloud/bin/vmdata.py    |   0
 .../debian/{config => }/opt/cloud/bin/vpc_func.sh  |   0
 .../{config => }/opt/cloud/bin/vpc_netusage.sh     |   0
 .../{config => }/opt/cloud/bin/vpc_passwd_server   |   0
 .../debian/{config => }/opt/cloud/bin/vpc_snat.sh  |   0
 .../{config => }/opt/cloud/bin/vpc_staticroute.sh  |   0
 .../debian/{config => }/opt/cloud/bin/vr_cfg.sh    |   0
 .../debian/{config => }/opt/cloud/templates/README |   0
 .../opt/cloud/templates/arping_gateways.sh.templ   |   0
 .../opt/cloud/templates/check_bumpup.sh            |   0
 .../opt/cloud/templates/check_heartbeat.sh.templ   |   0
 .../opt/cloud/templates/checkrouter.sh.templ       |   0
 .../opt/cloud/templates/conntrackd.conf.templ      |   0
 .../opt/cloud/templates/heartbeat.sh.templ         |   0
 .../opt/cloud/templates/keepalived.conf.templ      |   0
 .../debian/{config => }/opt/cloud/testdata/README  |   0
 .../{config => }/opt/cloud/testdata/acl0001.json   |   0
 .../{config => }/opt/cloud/testdata/dhcp0001.json  |   0
 .../{config => }/opt/cloud/testdata/gn0001.json    |   0
 .../{config => }/opt/cloud/testdata/ips0001.json   |   0
 .../{config => }/opt/cloud/testdata/ips0002.json   |   0
 .../{config => }/opt/cloud/testdata/ips0003.json   |   0
 .../{config => }/opt/cloud/testdata/s2s0001.json   |   0
 .../opt/cloud/bin => opt/cloud/testdata}/test.sh   |   0
 .../{config => }/opt/cloud/testdata/vmp0001.json   |   0
 .../debian/{config => }/root/.ssh/authorized_keys  |   0
 .../debian/{config => }/root/clearUsageRules.sh    |   0
 systemvm/patches/debian/{config => }/root/func.sh  |   0
 .../debian/{config => }/root/monitorServices.py    |   0
 .../patches/debian/{config => }/root/reconfigLB.sh |   0
 .../{config => }/var/www/html/latest/.htaccess     |   0
 .../{config => }/var/www/html/userdata/.htaccess   |   0
 .../{test/python => patches/test}/TestCsAddress.py |   0
 .../{test/python => patches/test}/TestCsApp.py     |   0
 .../{test/python => patches/test}/TestCsCmdLine.py |   0
 .../{test/python => patches/test}/TestCsConfig.py  |   0
 .../{test/python => patches/test}/TestCsDatabag.py |   0
 .../{test/python => patches/test}/TestCsDhcp.py    |   0
 .../{test/python => patches/test}/TestCsFile.py    |   0
 .../python => patches/test}/TestCsGuestNetwork.py  |   0
 .../{test/python => patches/test}/TestCsHelper.py  |   0
 .../python => patches/test}/TestCsInterface.py     |   0
 .../python => patches/test}/TestCsNetfilter.py     |   0
 .../{test/python => patches/test}/TestCsProcess.py |   0
 .../python => patches/test}/TestCsRedundant.py     |   0
 .../{test/python => patches/test}/TestCsRoute.py   |   0
 .../{test/python => patches/test}/TestCsRule.py    |   0
 systemvm/{test/python => patches/test}/runtests.sh |   2 +-
 systemvm/patches/{debian => }/vpn/etc/ipsec.conf   |   0
 .../patches/{debian => }/vpn/etc/ipsec.d/l2tp.conf |   0
 .../patches/{debian => }/vpn/etc/ipsec.secrets     |   0
 .../{debian => }/vpn/etc/ppp/options.xl2tpd        |   0
 .../{debian => }/vpn/etc/xl2tpd/xl2tpd.conf        |   0
 .../{debian => }/vpn/opt/cloud/bin/vpn_l2tp.sh     |   0
 systemvm/pom.xml                                   |  15 +++++----
 systemvm/scripts/run.bat                           |  18 -----------
 ...escriptor.xml => systemvm-agent-descriptor.xml} |  16 +++++-----
 218 files changed, 27 insertions(+), 116 deletions(-)

diff --git a/agent-simulator/tomcatconf/commands-simulator.properties.in b/agent-simulator/tomcatconf/commands-simulator.properties.in
deleted file mode 100644
index 4350bb7..0000000
--- a/agent-simulator/tomcatconf/commands-simulator.properties.in
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-configureSimulator=com.cloud.api.commands.ConfigureSimulatorCmd;1
-querySimulatorMock=com.cloud.api.commands.QuerySimulatorMockCmd;1
-cleanupSimulatorMock=com.cloud.api.commands.CleanupSimulatorMockCmd;1
diff --git a/client/pom.xml b/client/pom.xml
index 63980b9..6bf0552 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -798,7 +798,6 @@
                   <target>
                     <copy todir="${basedir}/target/common/vms">
                       <fileset dir="${basedir}/../systemvm/dist">
-                        <include name="systemvm.zip"/>
                         <include name="systemvm.iso"/>
                       </fileset>
                     </copy>
diff --git a/pom.xml b/pom.xml
index 08aa81e..d4d1a37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -925,34 +925,12 @@
               <exclude>ui/lib/reset.css</exclude>
               <exclude>ui/lib/require.js</exclude>
               <exclude>utils/testsmallfileinactive</exclude>
-              <exclude>systemvm/conf/agent.properties</exclude>
-              <exclude>systemvm/conf/environment.properties</exclude>
-              <exclude>systemvm/js/jquery.js</exclude>
-              <exclude>systemvm/js/jquery.flot.navigate.js</exclude>
-              <exclude>systemvm/patches/debian/config/root/.ssh/authorized_keys</exclude>
-              <exclude>systemvm/patches/debian/config/etc/apache2/httpd.conf</exclude>
-              <exclude>systemvm/patches/debian/config/etc/apache2/vhost.template</exclude>
-              <exclude>systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl</exclude>
-              <exclude>systemvm/patches/debian/config/etc/vpcdnsmasq.conf</exclude>
-              <exclude>systemvm/patches/debian/config/etc/ssh/sshd_config</exclude>
-              <exclude>systemvm/patches/debian/config/etc/rsyslog.conf</exclude>
-              <exclude>systemvm/patches/debian/config/etc/logrotate.conf</exclude>
-              <exclude>systemvm/patches/debian/config/etc/logrotate.d/*</exclude>
-              <exclude>systemvm/patches/debian/config/etc/sysctl.conf</exclude>
-              <exclude>systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
-              <exclude>systemvm/patches/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
-              <exclude>systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ</exclude>
-              <exclude>systemvm/patches/debian/vpn/etc/ipsec.conf</exclude>
-              <exclude>systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd</exclude>
-              <exclude>systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>
-              <exclude>systemvm/patches/debian/vpn/etc/ipsec.secrets</exclude>
-              <exclude>systemvm/patches/debian/config/etc/haproxy/haproxy.cfg</exclude>
-              <exclude>systemvm/patches/debian/config/etc/cloud-nic.rules</exclude>
-              <exclude>systemvm/patches/debian/config/etc/modprobe.d/aesni_intel</exclude>
-              <exclude>systemvm/patches/debian/config/etc/rc.local</exclude>
-              <exclude>systemvm/patches/debian/config/var/www/html/userdata/.htaccess</exclude>
-              <exclude>systemvm/patches/debian/config/var/www/html/latest/.htaccess</exclude>
-              <exclude>systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
+              <exclude>systemvm/agent/conf/agent.properties</exclude>
+              <exclude>systemvm/agent/conf/environment.properties</exclude>
+              <exclude>systemvm/agent/js/jquery.js</exclude>
+              <exclude>systemvm/agent/js/jquery.flot.navigate.js</exclude>
+              <exclude>systemvm/patches/debian/**</exclude>
+              <exclude>systemvm/patches/vpn/**</exclude>
               <exclude>tools/transifex/.tx/config</exclude>
               <exclude>tools/logo/apache_cloudstack.png</exclude>
               <exclude>tools/marvin/marvin/sandbox/advanced/sandbox.cfg</exclude>
diff --git a/systemvm/certs/localhost.crt b/systemvm/agent/certs/localhost.crt
similarity index 100%
rename from systemvm/certs/localhost.crt
rename to systemvm/agent/certs/localhost.crt
diff --git a/systemvm/certs/localhost.key b/systemvm/agent/certs/localhost.key
similarity index 100%
rename from systemvm/certs/localhost.key
rename to systemvm/agent/certs/localhost.key
diff --git a/systemvm/certs/realhostip.crt b/systemvm/agent/certs/realhostip.crt
similarity index 100%
rename from systemvm/certs/realhostip.crt
rename to systemvm/agent/certs/realhostip.crt
diff --git a/systemvm/certs/realhostip.csr b/systemvm/agent/certs/realhostip.csr
similarity index 100%
rename from systemvm/certs/realhostip.csr
rename to systemvm/agent/certs/realhostip.csr
diff --git a/systemvm/certs/realhostip.key b/systemvm/agent/certs/realhostip.key
similarity index 100%
rename from systemvm/certs/realhostip.key
rename to systemvm/agent/certs/realhostip.key
diff --git a/systemvm/certs/realhostip.keystore b/systemvm/agent/certs/realhostip.keystore
similarity index 100%
rename from systemvm/certs/realhostip.keystore
rename to systemvm/agent/certs/realhostip.keystore
diff --git a/systemvm/conf/agent.properties b/systemvm/agent/conf/agent.properties
similarity index 100%
rename from systemvm/conf/agent.properties
rename to systemvm/agent/conf/agent.properties
diff --git a/systemvm/conf/consoleproxy.properties b/systemvm/agent/conf/consoleproxy.properties
similarity index 100%
rename from systemvm/conf/consoleproxy.properties
rename to systemvm/agent/conf/consoleproxy.properties
diff --git a/systemvm/conf/environment.properties b/systemvm/agent/conf/environment.properties
similarity index 100%
rename from systemvm/conf/environment.properties
rename to systemvm/agent/conf/environment.properties
diff --git a/systemvm/conf/log4j-cloud.xml b/systemvm/agent/conf/log4j-cloud.xml
similarity index 100%
rename from systemvm/conf/log4j-cloud.xml
rename to systemvm/agent/conf/log4j-cloud.xml
diff --git a/systemvm/css/ajaxviewer.css b/systemvm/agent/css/ajaxviewer.css
similarity index 100%
rename from systemvm/css/ajaxviewer.css
rename to systemvm/agent/css/ajaxviewer.css
diff --git a/systemvm/css/logger.css b/systemvm/agent/css/logger.css
similarity index 100%
rename from systemvm/css/logger.css
rename to systemvm/agent/css/logger.css
diff --git a/systemvm/images/back.gif b/systemvm/agent/images/back.gif
similarity index 100%
rename from systemvm/images/back.gif
rename to systemvm/agent/images/back.gif
diff --git a/systemvm/images/bright-green.png b/systemvm/agent/images/bright-green.png
similarity index 100%
rename from systemvm/images/bright-green.png
rename to systemvm/agent/images/bright-green.png
diff --git a/systemvm/images/cad.gif b/systemvm/agent/images/cad.gif
similarity index 100%
rename from systemvm/images/cad.gif
rename to systemvm/agent/images/cad.gif
diff --git a/systemvm/images/cannotconnect.jpg b/systemvm/agent/images/cannotconnect.jpg
similarity index 100%
rename from systemvm/images/cannotconnect.jpg
rename to systemvm/agent/images/cannotconnect.jpg
diff --git a/systemvm/images/clr_button.gif b/systemvm/agent/images/clr_button.gif
similarity index 100%
rename from systemvm/images/clr_button.gif
rename to systemvm/agent/images/clr_button.gif
diff --git a/systemvm/images/clr_button_hover.gif b/systemvm/agent/images/clr_button_hover.gif
similarity index 100%
rename from systemvm/images/clr_button_hover.gif
rename to systemvm/agent/images/clr_button_hover.gif
diff --git a/systemvm/images/dot.cur b/systemvm/agent/images/dot.cur
similarity index 100%
rename from systemvm/images/dot.cur
rename to systemvm/agent/images/dot.cur
diff --git a/systemvm/images/gray-green.png b/systemvm/agent/images/gray-green.png
similarity index 100%
rename from systemvm/images/gray-green.png
rename to systemvm/agent/images/gray-green.png
diff --git a/systemvm/images/grid_headerbg.gif b/systemvm/agent/images/grid_headerbg.gif
similarity index 100%
rename from systemvm/images/grid_headerbg.gif
rename to systemvm/agent/images/grid_headerbg.gif
diff --git a/systemvm/images/left.png b/systemvm/agent/images/left.png
similarity index 100%
rename from systemvm/images/left.png
rename to systemvm/agent/images/left.png
diff --git a/systemvm/images/minimize_button.gif b/systemvm/agent/images/minimize_button.gif
similarity index 100%
rename from systemvm/images/minimize_button.gif
rename to systemvm/agent/images/minimize_button.gif
diff --git a/systemvm/images/minimize_button_hover.gif b/systemvm/agent/images/minimize_button_hover.gif
similarity index 100%
rename from systemvm/images/minimize_button_hover.gif
rename to systemvm/agent/images/minimize_button_hover.gif
diff --git a/systemvm/images/notready.jpg b/systemvm/agent/images/notready.jpg
similarity index 100%
rename from systemvm/images/notready.jpg
rename to systemvm/agent/images/notready.jpg
diff --git a/systemvm/images/play_button.gif b/systemvm/agent/images/play_button.gif
similarity index 100%
rename from systemvm/images/play_button.gif
rename to systemvm/agent/images/play_button.gif
diff --git a/systemvm/images/play_button_hover.gif b/systemvm/agent/images/play_button_hover.gif
similarity index 100%
rename from systemvm/images/play_button_hover.gif
rename to systemvm/agent/images/play_button_hover.gif
diff --git a/systemvm/images/right.png b/systemvm/agent/images/right.png
similarity index 100%
rename from systemvm/images/right.png
rename to systemvm/agent/images/right.png
diff --git a/systemvm/images/right2.png b/systemvm/agent/images/right2.png
similarity index 100%
rename from systemvm/images/right2.png
rename to systemvm/agent/images/right2.png
diff --git a/systemvm/images/shrink_button.gif b/systemvm/agent/images/shrink_button.gif
similarity index 100%
rename from systemvm/images/shrink_button.gif
rename to systemvm/agent/images/shrink_button.gif
diff --git a/systemvm/images/shrink_button_hover.gif b/systemvm/agent/images/shrink_button_hover.gif
similarity index 100%
rename from systemvm/images/shrink_button_hover.gif
rename to systemvm/agent/images/shrink_button_hover.gif
diff --git a/systemvm/images/stop_button.gif b/systemvm/agent/images/stop_button.gif
similarity index 100%
rename from systemvm/images/stop_button.gif
rename to systemvm/agent/images/stop_button.gif
diff --git a/systemvm/images/stop_button_hover.gif b/systemvm/agent/images/stop_button_hover.gif
similarity index 100%
rename from systemvm/images/stop_button_hover.gif
rename to systemvm/agent/images/stop_button_hover.gif
diff --git a/systemvm/images/winlog.png b/systemvm/agent/images/winlog.png
similarity index 100%
rename from systemvm/images/winlog.png
rename to systemvm/agent/images/winlog.png
diff --git a/systemvm/js/ajaxkeys.js b/systemvm/agent/js/ajaxkeys.js
similarity index 100%
rename from systemvm/js/ajaxkeys.js
rename to systemvm/agent/js/ajaxkeys.js
diff --git a/systemvm/js/ajaxviewer.js b/systemvm/agent/js/ajaxviewer.js
similarity index 100%
rename from systemvm/js/ajaxviewer.js
rename to systemvm/agent/js/ajaxviewer.js
diff --git a/systemvm/js/cloud.logger.js b/systemvm/agent/js/cloud.logger.js
similarity index 100%
rename from systemvm/js/cloud.logger.js
rename to systemvm/agent/js/cloud.logger.js
diff --git a/systemvm/js/handler.js b/systemvm/agent/js/handler.js
similarity index 100%
rename from systemvm/js/handler.js
rename to systemvm/agent/js/handler.js
diff --git a/systemvm/js/jquery.flot.navigate.js b/systemvm/agent/js/jquery.flot.navigate.js
similarity index 100%
rename from systemvm/js/jquery.flot.navigate.js
rename to systemvm/agent/js/jquery.flot.navigate.js
diff --git a/systemvm/js/jquery.js b/systemvm/agent/js/jquery.js
similarity index 100%
rename from systemvm/js/jquery.js
rename to systemvm/agent/js/jquery.js
diff --git a/systemvm/scripts/_run.sh b/systemvm/agent/scripts/_run.sh
similarity index 100%
rename from systemvm/scripts/_run.sh
rename to systemvm/agent/scripts/_run.sh
diff --git a/systemvm/scripts/config_auth.sh b/systemvm/agent/scripts/config_auth.sh
similarity index 100%
rename from systemvm/scripts/config_auth.sh
rename to systemvm/agent/scripts/config_auth.sh
diff --git a/systemvm/scripts/config_ssl.sh b/systemvm/agent/scripts/config_ssl.sh
similarity index 100%
rename from systemvm/scripts/config_ssl.sh
rename to systemvm/agent/scripts/config_ssl.sh
diff --git a/systemvm/scripts/consoleproxy.sh b/systemvm/agent/scripts/consoleproxy.sh
similarity index 100%
rename from systemvm/scripts/consoleproxy.sh
rename to systemvm/agent/scripts/consoleproxy.sh
diff --git a/systemvm/scripts/ipfirewall.sh b/systemvm/agent/scripts/ipfirewall.sh
similarity index 100%
rename from systemvm/scripts/ipfirewall.sh
rename to systemvm/agent/scripts/ipfirewall.sh
diff --git a/systemvm/scripts/run-proxy.sh b/systemvm/agent/scripts/run-proxy.sh
similarity index 100%
rename from systemvm/scripts/run-proxy.sh
rename to systemvm/agent/scripts/run-proxy.sh
diff --git a/systemvm/scripts/run.sh b/systemvm/agent/scripts/run.sh
similarity index 100%
rename from systemvm/scripts/run.sh
rename to systemvm/agent/scripts/run.sh
diff --git a/systemvm/scripts/secstorage.sh b/systemvm/agent/scripts/secstorage.sh
similarity index 100%
rename from systemvm/scripts/secstorage.sh
rename to systemvm/agent/scripts/secstorage.sh
diff --git a/systemvm/scripts/ssvm-check.sh b/systemvm/agent/scripts/ssvm-check.sh
similarity index 100%
rename from systemvm/scripts/ssvm-check.sh
rename to systemvm/agent/scripts/ssvm-check.sh
diff --git a/systemvm/scripts/utils.sh b/systemvm/agent/scripts/utils.sh
similarity index 100%
rename from systemvm/scripts/utils.sh
rename to systemvm/agent/scripts/utils.sh
diff --git a/systemvm/ui/viewer-bad-sid.ftl b/systemvm/agent/ui/viewer-bad-sid.ftl
similarity index 100%
rename from systemvm/ui/viewer-bad-sid.ftl
rename to systemvm/agent/ui/viewer-bad-sid.ftl
diff --git a/systemvm/ui/viewer-connect-failed.ftl b/systemvm/agent/ui/viewer-connect-failed.ftl
similarity index 100%
rename from systemvm/ui/viewer-connect-failed.ftl
rename to systemvm/agent/ui/viewer-connect-failed.ftl
diff --git a/systemvm/ui/viewer-update.ftl b/systemvm/agent/ui/viewer-update.ftl
similarity index 100%
rename from systemvm/ui/viewer-update.ftl
rename to systemvm/agent/ui/viewer-update.ftl
diff --git a/systemvm/ui/viewer.ftl b/systemvm/agent/ui/viewer.ftl
similarity index 100%
rename from systemvm/ui/viewer.ftl
rename to systemvm/agent/ui/viewer.ftl
diff --git a/systemvm/patches/debian/config/etc/chef/node.json b/systemvm/patches/debian/config/etc/chef/node.json
deleted file mode 100644
index 1b23e33..0000000
--- a/systemvm/patches/debian/config/etc/chef/node.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "run_list": [
-    "recipe[csip::default]"
-  ]
-}
diff --git a/systemvm/patches/debian/config/etc/chef/solo.rb b/systemvm/patches/debian/config/etc/chef/solo.rb
deleted file mode 100644
index 3207dd1..0000000
--- a/systemvm/patches/debian/config/etc/chef/solo.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-data_bags_path "/var/chef/data_bags"
-cookbook_path "/var/chef/cookbooks"
-log_level :debug
-log_location STDOUT
diff --git a/systemvm/patches/debian/config/etc/apache2/httpd.conf b/systemvm/patches/debian/etc/apache2/httpd.conf
similarity index 100%
rename from systemvm/patches/debian/config/etc/apache2/httpd.conf
rename to systemvm/patches/debian/etc/apache2/httpd.conf
diff --git a/systemvm/patches/debian/config/etc/apache2/vhost.template b/systemvm/patches/debian/etc/apache2/vhost.template
similarity index 100%
rename from systemvm/patches/debian/config/etc/apache2/vhost.template
rename to systemvm/patches/debian/etc/apache2/vhost.template
diff --git a/systemvm/patches/debian/config/etc/cloud-nic.rules b/systemvm/patches/debian/etc/cloud-nic.rules
similarity index 100%
rename from systemvm/patches/debian/config/etc/cloud-nic.rules
rename to systemvm/patches/debian/etc/cloud-nic.rules
diff --git a/systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl b/systemvm/patches/debian/etc/dnsmasq.conf.tmpl
similarity index 100%
rename from systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
rename to systemvm/patches/debian/etc/dnsmasq.conf.tmpl
diff --git a/systemvm/patches/debian/config/etc/haproxy/haproxy.cfg b/systemvm/patches/debian/etc/haproxy/haproxy.cfg
similarity index 100%
rename from systemvm/patches/debian/config/etc/haproxy/haproxy.cfg
rename to systemvm/patches/debian/etc/haproxy/haproxy.cfg
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/etc/init.d/cloud-early-config
similarity index 100%
rename from systemvm/patches/debian/config/etc/init.d/cloud-early-config
rename to systemvm/patches/debian/etc/init.d/cloud-early-config
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr b/systemvm/patches/debian/etc/init.d/cloud-passwd-srvr
similarity index 100%
rename from systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr
rename to systemvm/patches/debian/etc/init.d/cloud-passwd-srvr
diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-consoleproxy b/systemvm/patches/debian/etc/iptables/iptables-consoleproxy
similarity index 100%
rename from systemvm/patches/debian/config/etc/iptables/iptables-consoleproxy
rename to systemvm/patches/debian/etc/iptables/iptables-consoleproxy
diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-dhcpsrvr b/systemvm/patches/debian/etc/iptables/iptables-dhcpsrvr
similarity index 100%
rename from systemvm/patches/debian/config/etc/iptables/iptables-dhcpsrvr
rename to systemvm/patches/debian/etc/iptables/iptables-dhcpsrvr
diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-elbvm b/systemvm/patches/debian/etc/iptables/iptables-elbvm
similarity index 100%
rename from systemvm/patches/debian/config/etc/iptables/iptables-elbvm
rename to systemvm/patches/debian/etc/iptables/iptables-elbvm
diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-ilbvm b/systemvm/patches/debian/etc/iptables/iptables-ilbvm
similarity index 100%
rename from systemvm/patches/debian/config/etc/iptables/iptables-ilbvm
rename to systemvm/patches/debian/etc/iptables/iptables-ilbvm
diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-router b/systemvm/patches/debian/etc/iptables/iptables-router
similarity index 100%
rename from systemvm/patches/debian/config/etc/iptables/iptables-router
rename to systemvm/patches/debian/etc/iptables/iptables-router
diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-secstorage b/systemvm/patches/debian/etc/iptables/iptables-secstorage
similarity index 100%
rename from systemvm/patches/debian/config/etc/iptables/iptables-secstorage
rename to systemvm/patches/debian/etc/iptables/iptables-secstorage
diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-vpcrouter b/systemvm/patches/debian/etc/iptables/iptables-vpcrouter
similarity index 100%
rename from systemvm/patches/debian/config/etc/iptables/iptables-vpcrouter
rename to systemvm/patches/debian/etc/iptables/iptables-vpcrouter
diff --git a/systemvm/patches/debian/config/etc/iptables/rt_tables_init b/systemvm/patches/debian/etc/iptables/rt_tables_init
similarity index 100%
rename from systemvm/patches/debian/config/etc/iptables/rt_tables_init
rename to systemvm/patches/debian/etc/iptables/rt_tables_init
diff --git a/systemvm/patches/debian/config/etc/iptables/rules b/systemvm/patches/debian/etc/iptables/rules
similarity index 100%
rename from systemvm/patches/debian/config/etc/iptables/rules
rename to systemvm/patches/debian/etc/iptables/rules
diff --git a/systemvm/patches/debian/config/etc/logrotate.conf b/systemvm/patches/debian/etc/logrotate.conf
similarity index 100%
rename from systemvm/patches/debian/config/etc/logrotate.conf
rename to systemvm/patches/debian/etc/logrotate.conf
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/apache2 b/systemvm/patches/debian/etc/logrotate.d/apache2
similarity index 100%
rename from systemvm/patches/debian/config/etc/logrotate.d/apache2
rename to systemvm/patches/debian/etc/logrotate.d/apache2
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/cloud b/systemvm/patches/debian/etc/logrotate.d/cloud
similarity index 100%
rename from systemvm/patches/debian/config/etc/logrotate.d/cloud
rename to systemvm/patches/debian/etc/logrotate.d/cloud
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd b/systemvm/patches/debian/etc/logrotate.d/conntrackd
similarity index 100%
rename from systemvm/patches/debian/config/etc/logrotate.d/conntrackd
rename to systemvm/patches/debian/etc/logrotate.d/conntrackd
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq b/systemvm/patches/debian/etc/logrotate.d/dnsmasq
similarity index 100%
rename from systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
rename to systemvm/patches/debian/etc/logrotate.d/dnsmasq
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/haproxy b/systemvm/patches/debian/etc/logrotate.d/haproxy
similarity index 100%
rename from systemvm/patches/debian/config/etc/logrotate.d/haproxy
rename to systemvm/patches/debian/etc/logrotate.d/haproxy
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/ppp b/systemvm/patches/debian/etc/logrotate.d/ppp
similarity index 100%
rename from systemvm/patches/debian/config/etc/logrotate.d/ppp
rename to systemvm/patches/debian/etc/logrotate.d/ppp
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/rsyslog b/systemvm/patches/debian/etc/logrotate.d/rsyslog
similarity index 100%
rename from systemvm/patches/debian/config/etc/logrotate.d/rsyslog
rename to systemvm/patches/debian/etc/logrotate.d/rsyslog
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf b/systemvm/patches/debian/etc/modprobe.d/aesni_intel.conf
similarity index 100%
rename from systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
rename to systemvm/patches/debian/etc/modprobe.d/aesni_intel.conf
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf b/systemvm/patches/debian/etc/modprobe.d/pcspkr.conf
similarity index 100%
rename from systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
rename to systemvm/patches/debian/etc/modprobe.d/pcspkr.conf
diff --git a/systemvm/patches/debian/config/etc/profile.d/cloud.sh b/systemvm/patches/debian/etc/profile.d/cloud.sh
similarity index 100%
rename from systemvm/patches/debian/config/etc/profile.d/cloud.sh
rename to systemvm/patches/debian/etc/profile.d/cloud.sh
diff --git a/systemvm/patches/debian/config/etc/rc.local b/systemvm/patches/debian/etc/rc.local
similarity index 100%
rename from systemvm/patches/debian/config/etc/rc.local
rename to systemvm/patches/debian/etc/rc.local
diff --git a/systemvm/patches/debian/config/etc/rsyslog.conf b/systemvm/patches/debian/etc/rsyslog.conf
similarity index 100%
rename from systemvm/patches/debian/config/etc/rsyslog.conf
rename to systemvm/patches/debian/etc/rsyslog.conf
diff --git a/systemvm/patches/debian/config/etc/ssh/sshd_config b/systemvm/patches/debian/etc/ssh/sshd_config
similarity index 97%
rename from systemvm/patches/debian/config/etc/ssh/sshd_config
rename to systemvm/patches/debian/etc/ssh/sshd_config
index 75f30cc..07f9810 100644
--- a/systemvm/patches/debian/config/etc/ssh/sshd_config
+++ b/systemvm/patches/debian/etc/ssh/sshd_config
@@ -43,8 +43,8 @@ PermitRootLogin yes
 #MaxAuthTries 6
 
 #RSAAuthentication yes
-#PubkeyAuthentication yes
-#AuthorizedKeysFile	.ssh/authorized_keys
+PubkeyAuthentication yes
+AuthorizedKeysFile .ssh/authorized_keys
 
 # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
 #RhostsRSAAuthentication no
@@ -101,7 +101,7 @@ AcceptEnv LC_IDENTIFICATION LC_ALL
 #X11UseLocalhost yes
 #PrintMotd yes
 #PrintLastLog yes
-#TCPKeepAlive yes
+TCPKeepAlive yes
 #UseLogin no
 #UsePrivilegeSeparation yes
 #PermitUserEnvironment no
diff --git a/systemvm/patches/debian/config/etc/sysctl.conf b/systemvm/patches/debian/etc/sysctl.conf
similarity index 100%
rename from systemvm/patches/debian/config/etc/sysctl.conf
rename to systemvm/patches/debian/etc/sysctl.conf
diff --git a/systemvm/patches/debian/config/etc/vpcdnsmasq.conf b/systemvm/patches/debian/etc/vpcdnsmasq.conf
similarity index 100%
rename from systemvm/patches/debian/config/etc/vpcdnsmasq.conf
rename to systemvm/patches/debian/etc/vpcdnsmasq.conf
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/baremetal-vr.py b/systemvm/patches/debian/opt/cloud/bin/baremetal-vr.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/baremetal-vr.py
rename to systemvm/patches/debian/opt/cloud/bin/baremetal-vr.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/baremetal_snat.sh b/systemvm/patches/debian/opt/cloud/bin/baremetal_snat.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/baremetal_snat.sh
rename to systemvm/patches/debian/opt/cloud/bin/baremetal_snat.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/bumpup_priority.sh b/systemvm/patches/debian/opt/cloud/bin/bumpup_priority.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/bumpup_priority.sh
rename to systemvm/patches/debian/opt/cloud/bin/bumpup_priority.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkbatchs2svpn.sh b/systemvm/patches/debian/opt/cloud/bin/checkbatchs2svpn.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/checkbatchs2svpn.sh
rename to systemvm/patches/debian/opt/cloud/bin/checkbatchs2svpn.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh b/systemvm/patches/debian/opt/cloud/bin/checkrouter.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
rename to systemvm/patches/debian/opt/cloud/bin/checkrouter.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checks2svpn.sh b/systemvm/patches/debian/opt/cloud/bin/checks2svpn.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/checks2svpn.sh
rename to systemvm/patches/debian/opt/cloud/bin/checks2svpn.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cloud-nic.sh b/systemvm/patches/debian/opt/cloud/bin/cloud-nic.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cloud-nic.sh
rename to systemvm/patches/debian/opt/cloud/bin/cloud-nic.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/opt/cloud/bin/configure.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/configure.py
rename to systemvm/patches/debian/opt/cloud/bin/configure.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsAddress.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsAddress.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsApp.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsApp.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsConfig.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsConfig.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsDatabag.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsDatabag.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsDhcp.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsDhcp.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsFile.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsFile.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsGuestNetwork.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsGuestNetwork.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsHelper.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsHelper.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsLoadBalancer.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsLoadBalancer.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsLoadBalancer.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsLoadBalancer.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsMonitor.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsMonitor.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsMonitor.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsMonitor.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsNetfilter.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsNetfilter.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsNetfilter.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsNetfilter.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsProcess.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsProcess.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsProcess.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsProcess.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsRedundant.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsRedundant.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRoute.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsRoute.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsRoute.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsRoute.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRule.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsRule.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsRule.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsRule.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsStaticRoutes.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsStaticRoutes.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsStaticRoutes.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/CsStaticRoutes.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/__init__.py b/systemvm/patches/debian/opt/cloud/bin/cs/__init__.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs/__init__.py
rename to systemvm/patches/debian/opt/cloud/bin/cs/__init__.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_cmdline.py b/systemvm/patches/debian/opt/cloud/bin/cs_cmdline.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_cmdline.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_cmdline.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_dhcp.py b/systemvm/patches/debian/opt/cloud/bin/cs_dhcp.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_dhcp.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_dhcp.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py b/systemvm/patches/debian/opt/cloud/bin/cs_firewallrules.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_firewallrules.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_forwardingrules.py b/systemvm/patches/debian/opt/cloud/bin/cs_forwardingrules.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_forwardingrules.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_forwardingrules.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_guestnetwork.py b/systemvm/patches/debian/opt/cloud/bin/cs_guestnetwork.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_guestnetwork.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_guestnetwork.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py b/systemvm/patches/debian/opt/cloud/bin/cs_ip.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_ip.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_loadbalancer.py b/systemvm/patches/debian/opt/cloud/bin/cs_loadbalancer.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_loadbalancer.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_loadbalancer.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_monitorservice.py b/systemvm/patches/debian/opt/cloud/bin/cs_monitorservice.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_monitorservice.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_monitorservice.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_network_acl.py b/systemvm/patches/debian/opt/cloud/bin/cs_network_acl.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_network_acl.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_network_acl.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_remoteaccessvpn.py b/systemvm/patches/debian/opt/cloud/bin/cs_remoteaccessvpn.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_remoteaccessvpn.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_remoteaccessvpn.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_site2sitevpn.py b/systemvm/patches/debian/opt/cloud/bin/cs_site2sitevpn.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_site2sitevpn.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_site2sitevpn.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py b/systemvm/patches/debian/opt/cloud/bin/cs_staticroutes.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_staticroutes.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_vmdata.py b/systemvm/patches/debian/opt/cloud/bin/cs_vmdata.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_vmdata.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_vmdata.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py b/systemvm/patches/debian/opt/cloud/bin/cs_vmp.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_vmp.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_vpnusers.py b/systemvm/patches/debian/opt/cloud/bin/cs_vpnusers.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/cs_vpnusers.py
rename to systemvm/patches/debian/opt/cloud/bin/cs_vpnusers.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/dnsmasq.sh b/systemvm/patches/debian/opt/cloud/bin/dnsmasq.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/dnsmasq.sh
rename to systemvm/patches/debian/opt/cloud/bin/dnsmasq.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh b/systemvm/patches/debian/opt/cloud/bin/edithosts.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
rename to systemvm/patches/debian/opt/cloud/bin/edithosts.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/getRouterAlerts.sh b/systemvm/patches/debian/opt/cloud/bin/getRouterAlerts.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/getRouterAlerts.sh
rename to systemvm/patches/debian/opt/cloud/bin/getRouterAlerts.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/get_template_version.sh b/systemvm/patches/debian/opt/cloud/bin/get_template_version.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/get_template_version.sh
rename to systemvm/patches/debian/opt/cloud/bin/get_template_version.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ilb.sh b/systemvm/patches/debian/opt/cloud/bin/ilb.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/ilb.sh
rename to systemvm/patches/debian/opt/cloud/bin/ilb.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh b/systemvm/patches/debian/opt/cloud/bin/ipassoc.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh
rename to systemvm/patches/debian/opt/cloud/bin/ipassoc.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh b/systemvm/patches/debian/opt/cloud/bin/ipsectunnel.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
rename to systemvm/patches/debian/opt/cloud/bin/ipsectunnel.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/line_edit.py b/systemvm/patches/debian/opt/cloud/bin/line_edit.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/line_edit.py
rename to systemvm/patches/debian/opt/cloud/bin/line_edit.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/loadbalancer.sh b/systemvm/patches/debian/opt/cloud/bin/loadbalancer.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/loadbalancer.sh
rename to systemvm/patches/debian/opt/cloud/bin/loadbalancer.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/master.py b/systemvm/patches/debian/opt/cloud/bin/master.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/master.py
rename to systemvm/patches/debian/opt/cloud/bin/master.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/merge.py b/systemvm/patches/debian/opt/cloud/bin/merge.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/merge.py
rename to systemvm/patches/debian/opt/cloud/bin/merge.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh b/systemvm/patches/debian/opt/cloud/bin/monitor_service.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh
rename to systemvm/patches/debian/opt/cloud/bin/monitor_service.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/netusage.sh b/systemvm/patches/debian/opt/cloud/bin/netusage.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/netusage.sh
rename to systemvm/patches/debian/opt/cloud/bin/netusage.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server b/systemvm/patches/debian/opt/cloud/bin/passwd_server
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/passwd_server
rename to systemvm/patches/debian/opt/cloud/bin/passwd_server
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip b/systemvm/patches/debian/opt/cloud/bin/passwd_server_ip
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip
rename to systemvm/patches/debian/opt/cloud/bin/passwd_server_ip
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py b/systemvm/patches/debian/opt/cloud/bin/passwd_server_ip.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py
rename to systemvm/patches/debian/opt/cloud/bin/passwd_server_ip.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/prepare_pxe.sh b/systemvm/patches/debian/opt/cloud/bin/prepare_pxe.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/prepare_pxe.sh
rename to systemvm/patches/debian/opt/cloud/bin/prepare_pxe.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh b/systemvm/patches/debian/opt/cloud/bin/savepassword.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh
rename to systemvm/patches/debian/opt/cloud/bin/savepassword.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/set_redundant.py b/systemvm/patches/debian/opt/cloud/bin/set_redundant.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/set_redundant.py
rename to systemvm/patches/debian/opt/cloud/bin/set_redundant.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/common.sh b/systemvm/patches/debian/opt/cloud/bin/setup/common.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/common.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/common.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/consoleproxy.sh b/systemvm/patches/debian/opt/cloud/bin/setup/consoleproxy.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/consoleproxy.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/consoleproxy.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/default.sh b/systemvm/patches/debian/opt/cloud/bin/setup/default.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/default.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/default.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/dhcpsrvr.sh b/systemvm/patches/debian/opt/cloud/bin/setup/dhcpsrvr.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/dhcpsrvr.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/dhcpsrvr.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/elbvm.sh b/systemvm/patches/debian/opt/cloud/bin/setup/elbvm.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/elbvm.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/elbvm.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/ilbvm.sh b/systemvm/patches/debian/opt/cloud/bin/setup/ilbvm.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/ilbvm.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/ilbvm.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/patchsystemvm.sh b/systemvm/patches/debian/opt/cloud/bin/setup/patchsystemvm.sh
similarity index 95%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/patchsystemvm.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/patchsystemvm.sh
index 43c3c92..d09cc03 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/setup/patchsystemvm.sh
+++ b/systemvm/patches/debian/opt/cloud/bin/setup/patchsystemvm.sh
@@ -46,9 +46,9 @@ TYPE=$2
 
 echo "Patching systemvm for cloud service with mount=$PATCH_MOUNT for type=$TYPE" >> $logfile
 
-if [ "$TYPE" == "consoleproxy" ] || [ "$TYPE" == "secstorage" ]  && [ -f ${PATCH_MOUNT}/systemvm.zip ]
+if [ "$TYPE" == "consoleproxy" ] || [ "$TYPE" == "secstorage" ]  && [ -f ${PATCH_MOUNT}/agent.zip ]
 then
-  patch_systemvm ${PATCH_MOUNT}/systemvm.zip
+  patch_systemvm ${PATCH_MOUNT}/agent.zip
   if [ $? -gt 0 ]
   then
     echo "Failed to apply patch systemvm\n" >> $logfile
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/router.sh b/systemvm/patches/debian/opt/cloud/bin/setup/router.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/router.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/router.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/secstorage.sh b/systemvm/patches/debian/opt/cloud/bin/setup/secstorage.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/secstorage.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/secstorage.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/vpcrouter.sh b/systemvm/patches/debian/opt/cloud/bin/setup/vpcrouter.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/setup/vpcrouter.sh
rename to systemvm/patches/debian/opt/cloud/bin/setup/vpcrouter.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py b/systemvm/patches/debian/opt/cloud/bin/update_config.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/update_config.py
rename to systemvm/patches/debian/opt/cloud/bin/update_config.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py b/systemvm/patches/debian/opt/cloud/bin/vmdata.py
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
rename to systemvm/patches/debian/opt/cloud/bin/vmdata.py
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_func.sh b/systemvm/patches/debian/opt/cloud/bin/vpc_func.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_func.sh
rename to systemvm/patches/debian/opt/cloud/bin/vpc_func.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_netusage.sh b/systemvm/patches/debian/opt/cloud/bin/vpc_netusage.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_netusage.sh
rename to systemvm/patches/debian/opt/cloud/bin/vpc_netusage.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server b/systemvm/patches/debian/opt/cloud/bin/vpc_passwd_server
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server
rename to systemvm/patches/debian/opt/cloud/bin/vpc_passwd_server
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_snat.sh b/systemvm/patches/debian/opt/cloud/bin/vpc_snat.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_snat.sh
rename to systemvm/patches/debian/opt/cloud/bin/vpc_snat.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_staticroute.sh b/systemvm/patches/debian/opt/cloud/bin/vpc_staticroute.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_staticroute.sh
rename to systemvm/patches/debian/opt/cloud/bin/vpc_staticroute.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh b/systemvm/patches/debian/opt/cloud/bin/vr_cfg.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh
rename to systemvm/patches/debian/opt/cloud/bin/vr_cfg.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/README b/systemvm/patches/debian/opt/cloud/templates/README
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/templates/README
rename to systemvm/patches/debian/opt/cloud/templates/README
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/arping_gateways.sh.templ b/systemvm/patches/debian/opt/cloud/templates/arping_gateways.sh.templ
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/templates/arping_gateways.sh.templ
rename to systemvm/patches/debian/opt/cloud/templates/arping_gateways.sh.templ
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/check_bumpup.sh b/systemvm/patches/debian/opt/cloud/templates/check_bumpup.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/templates/check_bumpup.sh
rename to systemvm/patches/debian/opt/cloud/templates/check_bumpup.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/check_heartbeat.sh.templ b/systemvm/patches/debian/opt/cloud/templates/check_heartbeat.sh.templ
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/templates/check_heartbeat.sh.templ
rename to systemvm/patches/debian/opt/cloud/templates/check_heartbeat.sh.templ
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ b/systemvm/patches/debian/opt/cloud/templates/checkrouter.sh.templ
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
rename to systemvm/patches/debian/opt/cloud/templates/checkrouter.sh.templ
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ b/systemvm/patches/debian/opt/cloud/templates/conntrackd.conf.templ
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ
rename to systemvm/patches/debian/opt/cloud/templates/conntrackd.conf.templ
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/heartbeat.sh.templ b/systemvm/patches/debian/opt/cloud/templates/heartbeat.sh.templ
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/templates/heartbeat.sh.templ
rename to systemvm/patches/debian/opt/cloud/templates/heartbeat.sh.templ
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ b/systemvm/patches/debian/opt/cloud/templates/keepalived.conf.templ
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ
rename to systemvm/patches/debian/opt/cloud/templates/keepalived.conf.templ
diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/README b/systemvm/patches/debian/opt/cloud/testdata/README
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/testdata/README
rename to systemvm/patches/debian/opt/cloud/testdata/README
diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/acl0001.json b/systemvm/patches/debian/opt/cloud/testdata/acl0001.json
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/testdata/acl0001.json
rename to systemvm/patches/debian/opt/cloud/testdata/acl0001.json
diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/dhcp0001.json b/systemvm/patches/debian/opt/cloud/testdata/dhcp0001.json
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/testdata/dhcp0001.json
rename to systemvm/patches/debian/opt/cloud/testdata/dhcp0001.json
diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/gn0001.json b/systemvm/patches/debian/opt/cloud/testdata/gn0001.json
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/testdata/gn0001.json
rename to systemvm/patches/debian/opt/cloud/testdata/gn0001.json
diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/ips0001.json b/systemvm/patches/debian/opt/cloud/testdata/ips0001.json
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/testdata/ips0001.json
rename to systemvm/patches/debian/opt/cloud/testdata/ips0001.json
diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/ips0002.json b/systemvm/patches/debian/opt/cloud/testdata/ips0002.json
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/testdata/ips0002.json
rename to systemvm/patches/debian/opt/cloud/testdata/ips0002.json
diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/ips0003.json b/systemvm/patches/debian/opt/cloud/testdata/ips0003.json
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/testdata/ips0003.json
rename to systemvm/patches/debian/opt/cloud/testdata/ips0003.json
diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/s2s0001.json b/systemvm/patches/debian/opt/cloud/testdata/s2s0001.json
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/testdata/s2s0001.json
rename to systemvm/patches/debian/opt/cloud/testdata/s2s0001.json
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/test.sh b/systemvm/patches/debian/opt/cloud/testdata/test.sh
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/bin/test.sh
rename to systemvm/patches/debian/opt/cloud/testdata/test.sh
diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/vmp0001.json b/systemvm/patches/debian/opt/cloud/testdata/vmp0001.json
similarity index 100%
rename from systemvm/patches/debian/config/opt/cloud/testdata/vmp0001.json
rename to systemvm/patches/debian/opt/cloud/testdata/vmp0001.json
diff --git a/systemvm/patches/debian/config/root/.ssh/authorized_keys b/systemvm/patches/debian/root/.ssh/authorized_keys
similarity index 100%
rename from systemvm/patches/debian/config/root/.ssh/authorized_keys
rename to systemvm/patches/debian/root/.ssh/authorized_keys
diff --git a/systemvm/patches/debian/config/root/clearUsageRules.sh b/systemvm/patches/debian/root/clearUsageRules.sh
similarity index 100%
rename from systemvm/patches/debian/config/root/clearUsageRules.sh
rename to systemvm/patches/debian/root/clearUsageRules.sh
diff --git a/systemvm/patches/debian/config/root/func.sh b/systemvm/patches/debian/root/func.sh
similarity index 100%
rename from systemvm/patches/debian/config/root/func.sh
rename to systemvm/patches/debian/root/func.sh
diff --git a/systemvm/patches/debian/config/root/monitorServices.py b/systemvm/patches/debian/root/monitorServices.py
similarity index 100%
rename from systemvm/patches/debian/config/root/monitorServices.py
rename to systemvm/patches/debian/root/monitorServices.py
diff --git a/systemvm/patches/debian/config/root/reconfigLB.sh b/systemvm/patches/debian/root/reconfigLB.sh
similarity index 100%
rename from systemvm/patches/debian/config/root/reconfigLB.sh
rename to systemvm/patches/debian/root/reconfigLB.sh
diff --git a/systemvm/patches/debian/config/var/www/html/latest/.htaccess b/systemvm/patches/debian/var/www/html/latest/.htaccess
similarity index 100%
rename from systemvm/patches/debian/config/var/www/html/latest/.htaccess
rename to systemvm/patches/debian/var/www/html/latest/.htaccess
diff --git a/systemvm/patches/debian/config/var/www/html/userdata/.htaccess b/systemvm/patches/debian/var/www/html/userdata/.htaccess
similarity index 100%
rename from systemvm/patches/debian/config/var/www/html/userdata/.htaccess
rename to systemvm/patches/debian/var/www/html/userdata/.htaccess
diff --git a/systemvm/test/python/TestCsAddress.py b/systemvm/patches/test/TestCsAddress.py
similarity index 100%
rename from systemvm/test/python/TestCsAddress.py
rename to systemvm/patches/test/TestCsAddress.py
diff --git a/systemvm/test/python/TestCsApp.py b/systemvm/patches/test/TestCsApp.py
similarity index 100%
rename from systemvm/test/python/TestCsApp.py
rename to systemvm/patches/test/TestCsApp.py
diff --git a/systemvm/test/python/TestCsCmdLine.py b/systemvm/patches/test/TestCsCmdLine.py
similarity index 100%
rename from systemvm/test/python/TestCsCmdLine.py
rename to systemvm/patches/test/TestCsCmdLine.py
diff --git a/systemvm/test/python/TestCsConfig.py b/systemvm/patches/test/TestCsConfig.py
similarity index 100%
rename from systemvm/test/python/TestCsConfig.py
rename to systemvm/patches/test/TestCsConfig.py
diff --git a/systemvm/test/python/TestCsDatabag.py b/systemvm/patches/test/TestCsDatabag.py
similarity index 100%
rename from systemvm/test/python/TestCsDatabag.py
rename to systemvm/patches/test/TestCsDatabag.py
diff --git a/systemvm/test/python/TestCsDhcp.py b/systemvm/patches/test/TestCsDhcp.py
similarity index 100%
rename from systemvm/test/python/TestCsDhcp.py
rename to systemvm/patches/test/TestCsDhcp.py
diff --git a/systemvm/test/python/TestCsFile.py b/systemvm/patches/test/TestCsFile.py
similarity index 100%
rename from systemvm/test/python/TestCsFile.py
rename to systemvm/patches/test/TestCsFile.py
diff --git a/systemvm/test/python/TestCsGuestNetwork.py b/systemvm/patches/test/TestCsGuestNetwork.py
similarity index 100%
rename from systemvm/test/python/TestCsGuestNetwork.py
rename to systemvm/patches/test/TestCsGuestNetwork.py
diff --git a/systemvm/test/python/TestCsHelper.py b/systemvm/patches/test/TestCsHelper.py
similarity index 100%
rename from systemvm/test/python/TestCsHelper.py
rename to systemvm/patches/test/TestCsHelper.py
diff --git a/systemvm/test/python/TestCsInterface.py b/systemvm/patches/test/TestCsInterface.py
similarity index 100%
rename from systemvm/test/python/TestCsInterface.py
rename to systemvm/patches/test/TestCsInterface.py
diff --git a/systemvm/test/python/TestCsNetfilter.py b/systemvm/patches/test/TestCsNetfilter.py
similarity index 100%
rename from systemvm/test/python/TestCsNetfilter.py
rename to systemvm/patches/test/TestCsNetfilter.py
diff --git a/systemvm/test/python/TestCsProcess.py b/systemvm/patches/test/TestCsProcess.py
similarity index 100%
rename from systemvm/test/python/TestCsProcess.py
rename to systemvm/patches/test/TestCsProcess.py
diff --git a/systemvm/test/python/TestCsRedundant.py b/systemvm/patches/test/TestCsRedundant.py
similarity index 100%
rename from systemvm/test/python/TestCsRedundant.py
rename to systemvm/patches/test/TestCsRedundant.py
diff --git a/systemvm/test/python/TestCsRoute.py b/systemvm/patches/test/TestCsRoute.py
similarity index 100%
rename from systemvm/test/python/TestCsRoute.py
rename to systemvm/patches/test/TestCsRoute.py
diff --git a/systemvm/test/python/TestCsRule.py b/systemvm/patches/test/TestCsRule.py
similarity index 100%
rename from systemvm/test/python/TestCsRule.py
rename to systemvm/patches/test/TestCsRule.py
diff --git a/systemvm/test/python/runtests.sh b/systemvm/patches/test/runtests.sh
similarity index 94%
rename from systemvm/test/python/runtests.sh
rename to systemvm/patches/test/runtests.sh
index 6d6a196..e64f867 100644
--- a/systemvm/test/python/runtests.sh
+++ b/systemvm/patches/test/runtests.sh
@@ -18,7 +18,7 @@
 
 # requires netaddr
 
-export PYTHONPATH="../../patches/debian/config/opt/cloud/bin/"
+export PYTHONPATH="../debian/opt/cloud/bin/"
 export PYTHONDONTWRITEBYTECODE=False
 
 pep8 --max-line-length=179 --exclude=monitorServices.py,baremetal-vr.py,passwd_server_ip.py `find ../../patches -name \*.py`
diff --git a/systemvm/patches/debian/vpn/etc/ipsec.conf b/systemvm/patches/vpn/etc/ipsec.conf
similarity index 100%
rename from systemvm/patches/debian/vpn/etc/ipsec.conf
rename to systemvm/patches/vpn/etc/ipsec.conf
diff --git a/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf b/systemvm/patches/vpn/etc/ipsec.d/l2tp.conf
similarity index 100%
rename from systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
rename to systemvm/patches/vpn/etc/ipsec.d/l2tp.conf
diff --git a/systemvm/patches/debian/vpn/etc/ipsec.secrets b/systemvm/patches/vpn/etc/ipsec.secrets
similarity index 100%
rename from systemvm/patches/debian/vpn/etc/ipsec.secrets
rename to systemvm/patches/vpn/etc/ipsec.secrets
diff --git a/systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd b/systemvm/patches/vpn/etc/ppp/options.xl2tpd
similarity index 100%
rename from systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd
rename to systemvm/patches/vpn/etc/ppp/options.xl2tpd
diff --git a/systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf b/systemvm/patches/vpn/etc/xl2tpd/xl2tpd.conf
similarity index 100%
rename from systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf
rename to systemvm/patches/vpn/etc/xl2tpd/xl2tpd.conf
diff --git a/systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh b/systemvm/patches/vpn/opt/cloud/bin/vpn_l2tp.sh
similarity index 100%
rename from systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
rename to systemvm/patches/vpn/opt/cloud/bin/vpn_l2tp.sh
diff --git a/systemvm/pom.xml b/systemvm/pom.xml
index f617495..0ae3e02 100644
--- a/systemvm/pom.xml
+++ b/systemvm/pom.xml
@@ -52,10 +52,10 @@
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
-          <finalName>systemvm</finalName>
+          <finalName>agent</finalName>
           <appendAssemblyId>false</appendAssemblyId>
           <descriptors>
-            <descriptor>systemvm-descriptor.xml</descriptor>
+            <descriptor>systemvm-agent-descriptor.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
@@ -84,11 +84,11 @@
                 <resource>
                   <directory>target</directory>
                   <includes>
-                    <include>systemvm.zip</include>
+                    <include>agent.zip</include>
                   </includes>
                 </resource>
                 <resource>
-                  <directory>patches/debian/config/root/.ssh</directory>
+                  <directory>patches/debian/root/.ssh</directory>
                   <includes>
                     <include>authorized_keys</include>
                   </includes>
@@ -111,12 +111,11 @@
               <target>
                 <mkdir dir="${basedir}/dist" />
                 <mkdir dir="${basedir}/target/build-patch" />
-                <mkdir dir="${basedir}/target/build-patch/usr/sbin" />
                 <copy overwrite="true" todir="${basedir}/target/build-patch">
-                  <fileset dir="${basedir}/patches/debian/config/">
+                  <fileset dir="${basedir}/patches/debian/">
                     <include name="**/*" />
                   </fileset>
-                  <fileset dir="${basedir}/patches/debian/vpn/">
+                  <fileset dir="${basedir}/patches/vpn/">
                     <include name="**/*" />
                   </fileset>
                 </copy>
@@ -169,7 +168,7 @@
            <argument>-r</argument>
            <argument>-o</argument>
            <argument>systemvm.iso</argument>
-           <argument>systemvm.zip</argument>
+           <argument>agent.zip</argument>
            <argument>cloud-scripts.tgz</argument>
            <argument>authorized_keys</argument>
          </arguments>
diff --git a/systemvm/scripts/run.bat b/systemvm/scripts/run.bat
deleted file mode 100644
index ce6dc40..0000000
--- a/systemvm/scripts/run.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-rem  Licensed to the Apache Software Foundation (ASF) under one
-rem  or more contributor license agreements.  See the NOTICE file
-rem  distributed with this work for additional information
-rem  regarding copyright ownership.  The ASF licenses this file
-rem  to you under the Apache License, Version 2.0 (the
-rem  "License"); you may not use this file except in compliance
-rem  with the License.  You may obtain a copy of the License at
-rem  
-rem    http://www.apache.org/licenses/LICENSE-2.0
-rem  
-rem  Unless required by applicable law or agreed to in writing,
-rem  software distributed under the License is distributed on an
-rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem  KIND, either express or implied.  See the License for the
-rem  specific language governing permissions and limitations
-rem  under the License.
-
-java -mx700m -cp cloud-console-proxy.jar;;cloud-console-common.jar;log4j-1.2.15.jar;apache-log4j-extras-1.0.jar;gson-1.3.jar;commons-logging-1.1.1.jar;.;.\conf; com.cloud.consoleproxy.ConsoleProxy %*
diff --git a/systemvm/systemvm-descriptor.xml b/systemvm/systemvm-agent-descriptor.xml
similarity index 92%
rename from systemvm/systemvm-descriptor.xml
rename to systemvm/systemvm-agent-descriptor.xml
index ce5ae4b..a3f0453 100644
--- a/systemvm/systemvm-descriptor.xml
+++ b/systemvm/systemvm-agent-descriptor.xml
@@ -19,7 +19,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>systemvm</id>
+  <id>agent</id>
   <formats>
     <format>zip</format>
   </formats>
@@ -46,13 +46,13 @@
       <fileMode>555</fileMode>
     </fileSet>
     <fileSet>
-      <directory>scripts</directory>
+      <directory>agent/scripts</directory>
       <outputDirectory></outputDirectory>
       <directoryMode>555</directoryMode>
       <fileMode>555</fileMode>
     </fileSet>
     <fileSet>
-      <directory>conf</directory>
+      <directory>agent/conf</directory>
       <outputDirectory>conf</outputDirectory>
       <directoryMode>555</directoryMode>
       <fileMode>555</fileMode>
@@ -63,7 +63,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>images</directory>
+      <directory>agent/images</directory>
       <outputDirectory>images</outputDirectory>
       <directoryMode>555</directoryMode>
       <fileMode>555</fileMode>
@@ -75,7 +75,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>js</directory>
+      <directory>agent/js</directory>
       <outputDirectory>js</outputDirectory>
       <directoryMode>555</directoryMode>
       <fileMode>555</fileMode>
@@ -84,7 +84,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>ui</directory>
+      <directory>agent/ui</directory>
       <outputDirectory>ui</outputDirectory>
       <directoryMode>555</directoryMode>
       <fileMode>555</fileMode>
@@ -93,7 +93,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>css</directory>
+      <directory>agent/css</directory>
       <outputDirectory>css</outputDirectory>
       <directoryMode>555</directoryMode>
       <fileMode>555</fileMode>
@@ -102,7 +102,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>certs</directory>
+      <directory>agent/certs</directory>
       <outputDirectory>certs</outputDirectory>
       <directoryMode>555</directoryMode>
       <fileMode>555</fileMode>

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.

[cloudstack] 01/02: remove old dead code/files

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit ff948079b04fb3e9a9a4c19d57190982e160d3e8
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Nov 29 18:01:36 2017 +0530

    remove old dead code/files
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
 pom.xml                                            |   1 -
 systemvm/bindir/cloud-setup-console-proxy.in       | 220 ------------
 systemvm/conf.dom0/agent.properties.in             |  46 ---
 systemvm/conf.dom0/consoleproxy.properties.in      |  23 --
 systemvm/conf.dom0/log4j-cloud.xml.in              | 111 ------
 systemvm/conf/agent.properties.ssvm                |  21 --
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |  96 -----
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |  96 -----
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |  96 -----
 .../SYSCONFDIR/init.d/cloud-console-proxy.in       | 110 ------
 systemvm/libexec/console-proxy-runner.in           |  90 -----
 systemvm/patches/debian/README                     |  34 --
 systemvm/patches/debian/config.dat                 | 398 ---------------------
 systemvm/patches/debian/convert.sh                 |  64 ----
 systemvm/patches/debian/qemuconvert.sh             |  32 --
 systemvm/patches/debian/systemvm.vmx               |  37 --
 systemvm/patches/debian/systemvm.xml               |  53 ---
 systemvm/patches/debian/vhdconvert.sh              |  40 ---
 systemvm/patches/debian/xe/xe-daemon               |  65 ----
 systemvm/patches/debian/xe/xe-linux-distribution   | 267 --------------
 systemvm/patches/debian/xe/xe-update-guest-attrs   | 226 ------------
 systemvm/pom.xml                                   |  11 -
 systemvm/vm-script/vmops                           | 119 ------
 23 files changed, 2256 deletions(-)

diff --git a/pom.xml b/pom.xml
index caa26cd..08aa81e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -929,7 +929,6 @@
               <exclude>systemvm/conf/environment.properties</exclude>
               <exclude>systemvm/js/jquery.js</exclude>
               <exclude>systemvm/js/jquery.flot.navigate.js</exclude>
-              <exclude>systemvm/patches/debian/systemvm.vmx</exclude>
               <exclude>systemvm/patches/debian/config/root/.ssh/authorized_keys</exclude>
               <exclude>systemvm/patches/debian/config/etc/apache2/httpd.conf</exclude>
               <exclude>systemvm/patches/debian/config/etc/apache2/vhost.template</exclude>
diff --git a/systemvm/bindir/cloud-setup-console-proxy.in b/systemvm/bindir/cloud-setup-console-proxy.in
deleted file mode 100755
index 6439c0f..0000000
--- a/systemvm/bindir/cloud-setup-console-proxy.in
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/usr/bin/env python
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-import sys, os, subprocess, errno, re, getopt
-
-# ---- This snippet of code adds the sources path and the waf configured PYTHONDIR to the Python path ----
-# ---- We do this so cloud_utils can be looked up in the following order:
-# ---- 1) Sources directory
-# ---- 2) waf configured PYTHONDIR
-# ---- 3) System Python path
-for pythonpath in (
-		"@PYTHONDIR@",
-		os.path.join(os.path.dirname(__file__),os.path.pardir,os.path.pardir,"python","lib"),
-	):
-		if os.path.isdir(pythonpath): sys.path.insert(0,pythonpath)
-# ---- End snippet of code ----
-import cloud_utils
-from cloud_utils import stderr
-
-E_GENERIC= 1
-E_NOKVM = 2
-E_NODEFROUTE = 3
-E_DHCP = 4
-E_NOPERSISTENTNET = 5
-E_NETRECONFIGFAILED = 6
-E_VIRTRECONFIGFAILED = 7
-E_FWRECONFIGFAILED = 8
-E_CPRECONFIGFAILED = 9
-E_CPFAILEDTOSTART = 10
-E_NOFQDN = 11
-
-def bail(errno=E_GENERIC,message=None,*args):
-	if message: stderr(message,*args)
-	stderr("Cloud Console Proxy setup aborted")
-	sys.exit(errno)
-
-
-#---------------- boilerplate for python 2.4 support 
-
-
-# CENTOS does not have this -- we have to put this here
-try:
-	from subprocess import check_call
-	from subprocess import CalledProcessError
-except ImportError:
-	def check_call(*popenargs, **kwargs):
-		import subprocess
-		retcode = subprocess.call(*popenargs, **kwargs)
-		cmd = kwargs.get("args")
-		if cmd is None: cmd = popenargs[0]
-		if retcode: raise CalledProcessError(retcode, cmd)
-		return retcode
-
-	class CalledProcessError(Exception):
-		def __init__(self, returncode, cmd):
-			self.returncode = returncode ; self.cmd = cmd
-		def __str__(self): return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
-
-# ------------ end boilerplate -------------------------
-
-def check_hostname(): return check_call(["hostname",'--fqdn'])
-
-class Command:
-	def __init__(self,name,parent=None):
-		self.__name = name
-		self.__parent = parent
-	def __getattr__(self,name):
-		if name == "_print": name = "print"
-		return Command(name,self)
-	def __call__(self,*args):
-		cmd = self.__get_recursive_name() + list(args)
-		#print "	",cmd
-		popen = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-		m = popen.communicate()
-		ret = popen.wait()
-		if ret:
-			e = CalledProcessError(ret,cmd)
-			e.stdout,e.stderr = m
-			raise e
-		class CommandOutput:
-			def __init__(self,stdout,stderr):
-				self.stdout = stdout
-				self.stderr = stderr
-		return CommandOutput(*m)
-	def __lt__(self,other):
-		cmd = self.__get_recursive_name()
-		#print "	",cmd,"<",other
-		popen = subprocess.Popen(cmd,stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-		m = popen.communicate(other)
-		ret = popen.wait()
-		if ret:
-			e = CalledProcessError(ret,cmd)
-			e.stdout,e.stderr = m
-			raise e
-		class CommandOutput:
-			def __init__(self,stdout,stderr):
-				self.stdout = stdout
-				self.stderr = stderr
-		return CommandOutput(*m)
-		
-	def __get_recursive_name(self,sep=None):
-		m = self
-		l = []
-		while m is not None:
-			l.append(m.__name)
-			m = m.__parent
-		l.reverse()
-		if sep: return sep.join(l)
-		else: return l
-	def __str__(self):
-		return '<Command %r>'%self.__get_recursive_name(sep=" ")
-		
-	def __repr__(self): return self.__str__()
-
-ip = Command("ip")
-service = Command("service")
-chkconfig = Command("chkconfig")
-ufw = Command("ufw")
-iptables = Command("iptables")
-augtool = Command("augtool")
-ifconfig = Command("ifconfig")
-uuidgen = Command("uuidgen")
-
-Fedora = os.path.exists("/etc/fedora-release")
-CentOS = os.path.exists("/etc/centos-release") or ( os.path.exists("/etc/redhat-release") and not os.path.exists("/etc/fedora-release") )
-
-#--------------- procedure starts here ------------
-
-def main():
-	# parse cmd line	
-	opts, args = getopt.getopt(sys.argv[1:], "a", ["host=", "zone=", "pod="])
-	host=None
-	zone=None
-	pod=None
-    	autoMode=False
-	do_check_kvm = True	
-	for opt, arg in opts:
-		if opt == "--host":
-			if arg != "":
-				host = arg
-		elif opt == "--zone":
-			if arg != "":
-				zone = arg
-		elif opt == "--pod":
-		        if arg != "":
-				pod = arg
-        	elif opt == "-a":
-            		autoMode=True
-	servicename = "@PACKAGE@-console-proxy"
-	
-	if autoMode:
-		cloud_utils.setLogFile("/var/log/cloud/setupConsoleProxy.log")
-
-	stderr("Welcome to the Cloud Console Proxy setup")
-	stderr("")
-
-	try:
-		check_hostname()
-		stderr("The hostname of this machine is properly set up")
-	except CalledProcessError,e:
-		bail(E_NOFQDN,"This machine does not have an FQDN (fully-qualified domain name) for a hostname")
-
-	stderr("Stopping the Cloud Console Proxy")
-	cloud_utils.stop_service(servicename)
-	stderr("Cloud Console Proxy stopped")
-
-	ports = "8002".split()
-	if Fedora or CentOS:
-		try:
-			o = chkconfig("--list","iptables")
-			if ":on" in o.stdout and os.path.exists("/etc/sysconfig/iptables"):
-				stderr("Setting up firewall rules to permit traffic to Cloud services")
-				service.iptables.start() ; print o.stdout + o.stderr
-				for p in ports: iptables("-I","INPUT","1","-p","tcp","--dport",p,'-j','ACCEPT')
-				o = service.iptables.save() ; print o.stdout + o.stderr
-		except CalledProcessError,e:
-			print e.stdout+e.stderr
-			bail(E_FWRECONFIGFAILED,"Firewall rules could not be set")
-	else:
-		stderr("Setting up firewall rules to permit traffic to Cloud services")
-		try:
-			for p in ports: ufw.allow(p)
-			stderr("Rules set")
-		except CalledProcessError,e:
-			print e.stdout+e.stderr
-			bail(E_FWRECONFIGFAILED,"Firewall rules could not be set")
-
-		stderr("We are going to enable ufw now.  This may disrupt network connectivity and service availability.  See the ufw documentation for information on how to manage ufw firewall policies.")
-		try:
-			o = ufw.enable < "y\n" ; print o.stdout + o.stderr
-		except CalledProcessError,e:
-			print e.stdout+e.stderr
-			bail(E_FWRECONFIGFAILED,"Firewall could not be enabled")
-
-	cloud_utils.setup_consoleproxy_config("@CPSYSCONFDIR@/agent.properties", host, zone, pod)
-	stderr("Enabling and starting the Cloud Console Proxy")
-	cloud_utils.enable_service(servicename)
-	stderr("Cloud Console Proxy restarted")
-
-if __name__ == "__main__":
-	main()
-
-# FIXMES: 1) nullify networkmanager on ubuntu (asking the user first) and enable the networking service permanently
diff --git a/systemvm/conf.dom0/agent.properties.in b/systemvm/conf.dom0/agent.properties.in
deleted file mode 100644
index 1920481..0000000
--- a/systemvm/conf.dom0/agent.properties.in
+++ /dev/null
@@ -1,46 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Sample configuration file for VMOPS console proxy
-
-instance=ConsoleProxy
-consoleproxy.httpListenPort=8002
-
-#resource= the java class, which agent load to execute
-resource=com.cloud.agent.resource.consoleproxy.ConsoleProxyResource
-
-#host= The IP address of management server
-host=localhost
-
-#port = The port management server listening on, default is 8250
-port=8250
-
-#pod= The pod, which agent belonged to
-pod=default
-
-#zone= The zone, which agent belonged to
-zone=default
-
-#private.network.device= the private nic device
-# if this is commented, it is autodetected on service startup
-# private.network.device=cloudbr0
-
-#public.network.device= the public nic device
-# if this is commented, it is autodetected on service startup
-# public.network.device=cloudbr0
-
-#guid= a GUID to identify the agent
diff --git a/systemvm/conf.dom0/consoleproxy.properties.in b/systemvm/conf.dom0/consoleproxy.properties.in
deleted file mode 100644
index a3cddbc..0000000
--- a/systemvm/conf.dom0/consoleproxy.properties.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-consoleproxy.tcpListenPort=0
-consoleproxy.httpListenPort=80
-consoleproxy.httpCmdListenPort=8001
-consoleproxy.jarDir=./applet/
-consoleproxy.viewerLinger=180
-consoleproxy.reconnectMaxRetry=5
diff --git a/systemvm/conf.dom0/log4j-cloud.xml.in b/systemvm/conf.dom0/log4j-cloud.xml.in
deleted file mode 100644
index 0d78a95..0000000
--- a/systemvm/conf.dom0/log4j-cloud.xml.in
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.apache.log4j.rolling.RollingFileAppender">
-      <param name="Append" value="true"/>
-      <param name="Threshold" value="WARN"/>
-      <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
-        <param name="FileNamePattern" value="@CPLOG@.%d{yyyy-MM-dd}.gz"/>
-        <param name="ActiveFileName" value="@CPLOG@"/>
-      </rollingPolicy>
-      <layout class="org.apache.log4j.EnhancedPatternLayout">
-         <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%n"/>
-      </layout>
-   </appender>
-   
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="WARN"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="com.cloud.console.ConsoleCanvas">
-     <priority value="WARN"/>
-   </category>
-   
-   <category name="com.cloud.consoleproxy.ConsoleProxyAjaxImageHandler">
-     <priority value="WARN"/>
-   </category>
-   
-   <category name="com.cloud.consoleproxy.ConsoleProxyViwer">
-     <priority value="WARN"/>
-   </category>
-
-   <category name="com.cloud.consoleproxy">
-     <priority value="INFO"/>
-   </category>
-
-   <category name="com.cloud">
-     <priority value="DEBUG"/>
-   </category>
-   
-   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
-   <category name="org.apache">
-      <priority value="INFO"/>
-   </category>
-
-   <category name="org">
-      <priority value="INFO"/>
-   </category>
-   
-   <category name="net">
-     <priority value="INFO"/>
-   </category>
-
-   <!-- Limit the com.amazonaws category to INFO as its DEBUG is verbose -->
-   <category name="com.amazonaws">
-      <priority value="INFO"/>
-   </category>
-
-   <!-- Limit the httpclient.wire category to INFO as its DEBUG is verbose -->
-   <category name="httpclient.wire">
-      <priority value="INFO"/>
-   </category>
-
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <level value="INFO"/>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>
diff --git a/systemvm/conf/agent.properties.ssvm b/systemvm/conf/agent.properties.ssvm
deleted file mode 100644
index 2f87b88..0000000
--- a/systemvm/conf/agent.properties.ssvm
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#mount.path=~/secondary-storage/
-resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource
-testCifsMount=cifs://192.168.1.1/CSHV3?user=administrator&password=1pass%40word1
-#testLocalRoot=test
diff --git a/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
deleted file mode 100644
index 3ec4d06..0000000
--- a/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 35 99 10
-# description: Cloud Console Proxy
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /etc/rc.d/init.d/functions
-
-# set environment variables
-
-SHORTNAME=`basename $0`
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@CPLOG@
-PROGNAME="Cloud Console Proxy"
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME"
-DAEMONIZE=@BINDIR@/@PACKAGE@-daemonize
-PROG=@LIBEXECDIR@/console-proxy-runner
-
-start() {
-        echo -n $"Starting $PROGNAME: "
-	if hostname --fqdn >/dev/null 2>&1 ; then
-		daemon --check=$SHORTNAME --pidfile=${PIDFILE} "$DAEMONIZE" \
-			-n "$SHORTNAME" -p "$PIDFILE" -l "$LOGFILE" "$PROG" $OPTIONS
-		RETVAL=$?
-		echo
-	else
-		failure
-		echo
-		echo The host name does not resolve properly to an IP address.  Cannot start "$PROGNAME". > /dev/stderr
-		RETVAL=9
-	fi
-	[ $RETVAL = 0 ] && touch ${LOCKFILE}
-	return $RETVAL
-}
-
-stop() {
-	echo -n $"Stopping $PROGNAME: "
-	killproc -p ${PIDFILE} $SHORTNAME # -d 10 $SHORTNAME
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
-}
-
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-        status -p ${PIDFILE} $SHORTNAME
-	RETVAL=$?
-	;;
-  restart)
-	stop
-	sleep 3
-	start
-	;;
-  condrestart)
-	if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then
-		stop
-		sleep 3
-		start
-	fi
-	;;
-  *)
-	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
-	RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
deleted file mode 100644
index 3ec4d06..0000000
--- a/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 35 99 10
-# description: Cloud Console Proxy
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /etc/rc.d/init.d/functions
-
-# set environment variables
-
-SHORTNAME=`basename $0`
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@CPLOG@
-PROGNAME="Cloud Console Proxy"
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME"
-DAEMONIZE=@BINDIR@/@PACKAGE@-daemonize
-PROG=@LIBEXECDIR@/console-proxy-runner
-
-start() {
-        echo -n $"Starting $PROGNAME: "
-	if hostname --fqdn >/dev/null 2>&1 ; then
-		daemon --check=$SHORTNAME --pidfile=${PIDFILE} "$DAEMONIZE" \
-			-n "$SHORTNAME" -p "$PIDFILE" -l "$LOGFILE" "$PROG" $OPTIONS
-		RETVAL=$?
-		echo
-	else
-		failure
-		echo
-		echo The host name does not resolve properly to an IP address.  Cannot start "$PROGNAME". > /dev/stderr
-		RETVAL=9
-	fi
-	[ $RETVAL = 0 ] && touch ${LOCKFILE}
-	return $RETVAL
-}
-
-stop() {
-	echo -n $"Stopping $PROGNAME: "
-	killproc -p ${PIDFILE} $SHORTNAME # -d 10 $SHORTNAME
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
-}
-
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-        status -p ${PIDFILE} $SHORTNAME
-	RETVAL=$?
-	;;
-  restart)
-	stop
-	sleep 3
-	start
-	;;
-  condrestart)
-	if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then
-		stop
-		sleep 3
-		start
-	fi
-	;;
-  *)
-	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
-	RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
deleted file mode 100644
index 3ec4d06..0000000
--- a/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 35 99 10
-# description: Cloud Console Proxy
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /etc/rc.d/init.d/functions
-
-# set environment variables
-
-SHORTNAME=`basename $0`
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@CPLOG@
-PROGNAME="Cloud Console Proxy"
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME"
-DAEMONIZE=@BINDIR@/@PACKAGE@-daemonize
-PROG=@LIBEXECDIR@/console-proxy-runner
-
-start() {
-        echo -n $"Starting $PROGNAME: "
-	if hostname --fqdn >/dev/null 2>&1 ; then
-		daemon --check=$SHORTNAME --pidfile=${PIDFILE} "$DAEMONIZE" \
-			-n "$SHORTNAME" -p "$PIDFILE" -l "$LOGFILE" "$PROG" $OPTIONS
-		RETVAL=$?
-		echo
-	else
-		failure
-		echo
-		echo The host name does not resolve properly to an IP address.  Cannot start "$PROGNAME". > /dev/stderr
-		RETVAL=9
-	fi
-	[ $RETVAL = 0 ] && touch ${LOCKFILE}
-	return $RETVAL
-}
-
-stop() {
-	echo -n $"Stopping $PROGNAME: "
-	killproc -p ${PIDFILE} $SHORTNAME # -d 10 $SHORTNAME
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
-}
-
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-        status -p ${PIDFILE} $SHORTNAME
-	RETVAL=$?
-	;;
-  restart)
-	stop
-	sleep 3
-	start
-	;;
-  condrestart)
-	if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then
-		stop
-		sleep 3
-		start
-	fi
-	;;
-  *)
-	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
-	RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in b/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
deleted file mode 100755
index 0c7be73..0000000
--- a/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 35 99 10
-# description: Cloud Console Proxy
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /lib/lsb/init-functions
-. /etc/default/rcS
-
-# set environment variables
-
-SHORTNAME=`basename $0`
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@CPLOG@
-PROGNAME="Cloud Console Proxy"
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-DAEMONIZE=@BINDIR@/@PACKAGE@-daemonize
-PROG=@LIBEXECDIR@/console-proxy-runner
-
-start() {
-        log_daemon_msg $"Starting $PROGNAME" "$SHORTNAME"
-	if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
-	      log_progress_msg "apparently already running"
-	      log_end_msg 0
-	      exit 0
-	fi
-	if hostname --fqdn >/dev/null 2>&1 ; then
-		true
-	else
-		log_failure_msg "The host name does not resolve properly to an IP address.  Cannot start $PROGNAME"
-		log_end_msg 1
-		exit 1
-	fi
- 
-	if start-stop-daemon --start --quiet \
-		--pidfile "$PIDFILE" \
-		--exec "$DAEMONIZE" -- -n "$SHORTNAME" -p "$PIDFILE" -l "$LOGFILE" "$PROG" $OPTIONS
-		RETVAL=$?
-	    then
-		rc=0
-		sleep 1
-		if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
-		    log_failure_msg "$PROG failed to start"
-		    rc=1
-		fi
-	else
-		rc=1
-	fi
-
-	if [ $rc -eq 0 ]; then
-		log_end_msg 0
-	else
-		log_end_msg 1
-		rm -f "$PIDFILE"
-	fi
-}
-
-stop() {
-	echo -n $"Stopping $PROGNAME" "$SHORTNAME"
-	start-stop-daemon --stop --quiet --oknodo --pidfile "$PIDFILE"
-	log_end_msg $?
-	rm -f "$PIDFILE"
-}
-
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-        status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
-	RETVAL=$?
-	;;
-  restart)
-	stop
-	sleep 3
-	start
-	;;
-  *)
-	echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
-	RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/systemvm/libexec/console-proxy-runner.in b/systemvm/libexec/console-proxy-runner.in
deleted file mode 100755
index 4f18aab..0000000
--- a/systemvm/libexec/console-proxy-runner.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-#run.sh runs the agent client.
-
-cd `dirname "$0"`
-
-SYSTEMJARS="@SYSTEMJARS@"
-SCP=$(build-classpath $SYSTEMJARS) ; if [ $? != 0 ] ; then SCP="@SYSTEMCLASSPATH@" ; fi
-DCP="@DEPSCLASSPATH@"
-ACP="@AGENTCLASSPATH@"
-export CLASSPATH=$SCP:$DCP:$ACP:@CPSYSCONFDIR@
-for jarfile in "@PREMIUMJAVADIR@"/* ; do
-	if [ ! -e "$jarfile" ] ; then continue ; fi
-	CLASSPATH=$jarfile:$CLASSPATH
-done
-for plugin in "@PLUGINJAVADIR@"/* ; do
-	if [ ! -e "$plugin" ] ; then continue ; fi
-	CLASSPATH=$plugin:$CLASSPATH
-done
-export CLASSPATH
-
-set -e
-cd "@CPLIBDIR@"
-echo Current directory is "$PWD"
-echo CLASSPATH to run the console proxy: "$CLASSPATH"
-
-export PATH=/sbin:/usr/sbin:"$PATH"
-SERVICEARGS=
-for x in private public ; do
-	configuration=`grep -q "^$x.network.device" "@CPSYSCONFDIR@"/agent.properties || true`
-	if [ -n "$CONFIGURATION" ] ; then
-		echo "Using manually-configured network device $CONFIGURATION"
-	else
-		defaultroute=`ip route | grep ^default | cut -d ' ' -f 5`
-		test -n "$defaultroute"
-		echo "Using auto-discovered network device $defaultroute which is the default route"
-		SERVICEARGS="$SERVICEARGS $x.network.device="$defaultroute
-	fi
-done
-
-function termagent() {
-    if [ "$agentpid" != "" ] ; then
-	echo Killing VMOps Console Proxy "(PID $agentpid)" with SIGTERM >&2
-	kill -TERM $agentpid
-	echo Waiting for agent to exit >&2
-	wait $agentpid
-	ex=$?
-	echo Agent exited with return code $ex >&2	
-    else
-	echo Agent PID is unknown >&2
-    fi
-}
-
-trap termagent TERM
-while true ; do
-	java -Xms128M -Xmx384M -cp "$CLASSPATH" "$@" com.cloud.agent.AgentShell $SERVICEARGS &
-	agentpid=$!
-	echo "Console Proxy started.  PID: $!" >&2
-	wait $agentpid
-	ex=$?
-	if [ $ex -gt 128 ]; then
-		echo "wait on console proxy process interrupted by SIGTERM" >&2
-		exit $ex
-	fi
-	echo "Console proxy exited with return code $ex" >&2
-	if [ $ex -eq 0 ] || [ $ex -eq 1 ] || [ $ex -eq 66 ] || [ $ex -gt 128 ]; then
-		echo "Exiting..." > /dev/stderr
-		exit $ex
-	fi
-	echo "Restarting console proxy..." > /dev/stderr
-	sleep 1
-done
diff --git a/systemvm/patches/debian/README b/systemvm/patches/debian/README
deleted file mode 100644
index 5d79c35..0000000
--- a/systemvm/patches/debian/README
+++ /dev/null
@@ -1,34 +0,0 @@
-####################################################
- 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
diff --git a/systemvm/patches/debian/config.dat b/systemvm/patches/debian/config.dat
deleted file mode 100644
index b16638f..0000000
--- a/systemvm/patches/debian/config.dat
+++ /dev/null
@@ -1,398 +0,0 @@
-Name: adduser/homedir-permission
-Template: adduser/homedir-permission
-Value: true
-Owners: adduser
-
-Name: ca-certificates/enable_crts
-Template: ca-certificates/enable_crts
-Value: brasil.gov.br/brasil.gov.br.crt, cacert.org/cacert.org.crt, cacert.org/class3.crt, cacert.org/root.crt, debconf.org/ca.crt, gouv.fr/cert_igca_dsa.crt, gouv.fr/cert_igca_rsa.crt, mozilla/ABAecom_=sub.__Am._Bankers_Assn.=_Root_CA.crt, mozilla/AddTrust_External_Root.crt, mozilla/AddTrust_Low-Value_Services_Root.crt, mozilla/AddTrust_Public_Services_Root.crt, mozilla/AddTrust_Qualified_Certificates_Root.crt, mozilla/America_Online_Root_Certification_Authority_1.crt, mozilla/America_On [...]
-Owners: ca-certificates
-Variables:
- enable_crts = brasil.gov.br/brasil.gov.br.crt, cacert.org/cacert.org.crt, cacert.org/class3.crt, cacert.org/root.crt, debconf.org/ca.crt, gouv.fr/cert_igca_dsa.crt, gouv.fr/cert_igca_rsa.crt, mozilla/ABAecom_=sub.__Am._Bankers_Assn.=_Root_CA.crt, mozilla/AddTrust_External_Root.crt, mozilla/AddTrust_Low-Value_Services_Root.crt, mozilla/AddTrust_Public_Services_Root.crt, mozilla/AddTrust_Qualified_Certificates_Root.crt, mozilla/America_Online_Root_Certification_Authority_1.crt, mozilla/Am [...]
-
-Name: ca-certificates/new_crts
-Template: ca-certificates/new_crts
-Owners: ca-certificates
-Variables:
- new_crts = 
-
-Name: ca-certificates/trust_new_crts
-Template: ca-certificates/trust_new_crts
-Value: yes
-Owners: ca-certificates
-
-Name: debconf-apt-progress/info
-Template: debconf-apt-progress/info
-Owners: debconf
-
-Name: debconf-apt-progress/media-change
-Template: debconf-apt-progress/media-change
-Owners: debconf
-
-Name: debconf-apt-progress/preparing
-Template: debconf-apt-progress/preparing
-Owners: debconf
-
-Name: debconf-apt-progress/title
-Template: debconf-apt-progress/title
-Owners: debconf
-
-Name: debconf/frontend
-Template: debconf/frontend
-Value: noninteractive
-Owners: debconf
-
-Name: debconf/priority
-Template: debconf/priority
-Value: high
-Owners: debconf
-
-Name: dhcp3-client/dhclient-needs-restarting
-Template: dhcp3-client/dhclient-needs-restarting
-Owners: dhcp3-client
-
-Name: dhcp3-client/dhclient-script_moved
-Template: dhcp3-client/dhclient-script_moved
-Owners: dhcp3-client
-
-Name: glibc/restart-failed
-Template: glibc/restart-failed
-Owners: libc6
-
-Name: glibc/restart-services
-Template: glibc/restart-services
-Owners: libc6
-
-Name: glibc/upgrade
-Template: glibc/upgrade
-Owners: libc6
-
-Name: libpam-modules/disable-screensaver
-Template: libpam-modules/disable-screensaver
-Owners: libpam-modules
-
-Name: libpam0g/restart-failed
-Template: libpam0g/restart-failed
-Owners: libpam0g
-
-Name: libpam0g/restart-services
-Template: libpam0g/restart-services
-Owners: libpam0g
-
-Name: libpam0g/xdm-needs-restart
-Template: libpam0g/xdm-needs-restart
-Owners: libpam0g
-
-Name: libssl0.9.8/restart-failed
-Template: libssl0.9.8/restart-failed
-Owners: libssl0.9.8
-
-Name: libssl0.9.8/restart-services
-Template: libssl0.9.8/restart-services
-Owners: libssl0.9.8
-
-Name: linux-base/disk-id-convert-auto
-Template: linux-base/disk-id-convert-auto
-Owners: linux-base
-
-Name: linux-base/disk-id-convert-plan
-Template: linux-base/disk-id-convert-plan
-Owners: linux-base
-
-Name: linux-base/disk-id-convert-plan-no-relabel
-Template: linux-base/disk-id-convert-plan-no-relabel
-Owners: linux-base
-
-Name: linux-base/disk-id-manual
-Template: linux-base/disk-id-manual
-Owners: linux-base
-
-Name: linux-base/disk-id-manual-boot-loader
-Template: linux-base/disk-id-manual-boot-loader
-Owners: linux-base
-
-Name: linux-image-2.6.32-bpo.5-686/postinst/bootloader-error-2.6.32-bpo.5-686
-Template: linux-image-2.6.32-bpo.5-686/postinst/bootloader-error-2.6.32-bpo.5-686
-Owners: linux-image-2.6.32-bpo.5-686
-
-Name: linux-image-2.6.32-bpo.5-686/postinst/bootloader-test-error-2.6.32-bpo.5-686
-Template: linux-image-2.6.32-bpo.5-686/postinst/bootloader-test-error-2.6.32-bpo.5-686
-Owners: linux-image-2.6.32-bpo.5-686
-
-Name: linux-image-2.6.32-bpo.5-686/postinst/depmod-error-initrd-2.6.32-bpo.5-686
-Template: linux-image-2.6.32-bpo.5-686/postinst/depmod-error-initrd-2.6.32-bpo.5-686
-Owners: linux-image-2.6.32-bpo.5-686
-
-Name: linux-image-2.6.32-bpo.5-686/postinst/missing-firmware-2.6.32-bpo.5-686
-Template: linux-image-2.6.32-bpo.5-686/postinst/missing-firmware-2.6.32-bpo.5-686
-Owners: linux-image-2.6.32-bpo.5-686
-
-Name: linux-image-2.6.32-bpo.5-686/prerm/removing-running-kernel-2.6.32-bpo.5-686
-Template: linux-image-2.6.32-bpo.5-686/prerm/removing-running-kernel-2.6.32-bpo.5-686
-Owners: linux-image-2.6.32-bpo.5-686
-
-Name: linux-image-2.6.32-bpo.5-686/prerm/would-invalidate-boot-loader-2.6.32-bpo.5-686
-Template: linux-image-2.6.32-bpo.5-686/prerm/would-invalidate-boot-loader-2.6.32-bpo.5-686
-Owners: linux-image-2.6.32-bpo.5-686
-
-Name: linux-image-2.6.32-bpo.5-xen-686/postinst/bootloader-error-2.6.32-bpo.5-xen-686
-Template: linux-image-2.6.32-bpo.5-xen-686/postinst/bootloader-error-2.6.32-bpo.5-xen-686
-Owners: linux-image-2.6.32-bpo.5-xen-686
-
-Name: linux-image-2.6.32-bpo.5-xen-686/postinst/bootloader-test-error-2.6.32-bpo.5-xen-686
-Template: linux-image-2.6.32-bpo.5-xen-686/postinst/bootloader-test-error-2.6.32-bpo.5-xen-686
-Owners: linux-image-2.6.32-bpo.5-xen-686
-
-Name: linux-image-2.6.32-bpo.5-xen-686/postinst/depmod-error-initrd-2.6.32-bpo.5-xen-686
-Template: linux-image-2.6.32-bpo.5-xen-686/postinst/depmod-error-initrd-2.6.32-bpo.5-xen-686
-Owners: linux-image-2.6.32-bpo.5-xen-686
-
-Name: linux-image-2.6.32-bpo.5-xen-686/postinst/missing-firmware-2.6.32-bpo.5-xen-686
-Template: linux-image-2.6.32-bpo.5-xen-686/postinst/missing-firmware-2.6.32-bpo.5-xen-686
-Owners: linux-image-2.6.32-bpo.5-xen-686
-
-Name: linux-image-2.6.32-bpo.5-xen-686/prerm/removing-running-kernel-2.6.32-bpo.5-xen-686
-Template: linux-image-2.6.32-bpo.5-xen-686/prerm/removing-running-kernel-2.6.32-bpo.5-xen-686
-Owners: linux-image-2.6.32-bpo.5-xen-686
-
-Name: linux-image-2.6.32-bpo.5-xen-686/prerm/would-invalidate-boot-loader-2.6.32-bpo.5-xen-686
-Template: linux-image-2.6.32-bpo.5-xen-686/prerm/would-invalidate-boot-loader-2.6.32-bpo.5-xen-686
-Owners: linux-image-2.6.32-bpo.5-xen-686
-
-Name: locales/default_environment_locale
-Template: locales/default_environment_locale
-Value: en_US.UTF-8
-Owners: locales
-Variables:
- locales = en_US.UTF-8
-
-Name: locales/locales_to_be_generated
-Template: locales/locales_to_be_generated
-Value: en_US.UTF-8 UTF-8
-Owners: locales
-Variables:
- locales = aa_DJ ISO-8859-1, aa_DJ.UTF-8 UTF-8, aa_ER UTF-8, aa_ER@saaho UTF-8, aa_ET UTF-8, af_ZA ISO-8859-1, af_ZA.UTF-8 UTF-8, am_ET UTF-8, an_ES ISO-8859-15, an_ES.UTF-8 UTF-8, ar_AE ISO-8859-6, ar_AE.UTF-8 UTF-8, ar_BH ISO-8859-6, ar_BH.UTF-8 UTF-8, ar_DZ ISO-8859-6, ar_DZ.UTF-8 UTF-8, ar_EG ISO-8859-6, ar_EG.UTF-8 UTF-8, ar_IN UTF-8, ar_IQ ISO-8859-6, ar_IQ.UTF-8 UTF-8, ar_JO ISO-8859-6, ar_JO.UTF-8 UTF-8, ar_KW ISO-8859-6, ar_KW.UTF-8 UTF-8, ar_LB ISO-8859-6, ar_LB.UTF-8 UTF-8, ar [...]
-
-Name: openswan/create_rsa_key
-Template: openswan/create_rsa_key
-Value: true
-Owners: openswan
-Flags: seen
-
-Name: openswan/enable-oe
-Template: openswan/enable-oe
-Value: false
-Owners: openswan
-Flags: seen
-
-Name: openswan/existing_x509_certificate
-Template: openswan/existing_x509_certificate
-Value: false
-Owners: openswan
-Flags: seen
-
-Name: openswan/existing_x509_certificate_filename
-Template: openswan/existing_x509_certificate_filename
-Owners: openswan
-
-Name: openswan/existing_x509_key_filename
-Template: openswan/existing_x509_key_filename
-Owners: openswan
-
-Name: openswan/restart
-Template: openswan/restart
-Value: true
-Owners: openswan
-
-Name: openswan/rsa_key_length
-Template: openswan/rsa_key_length
-Value: 2048
-Owners: openswan
-
-Name: openswan/rsa_key_type
-Template: openswan/rsa_key_type
-Value: x509
-Owners: openswan
-Flags: seen
-
-Name: openswan/start_level
-Template: openswan/start_level
-Value: earliest
-Owners: openswan
-
-Name: openswan/x509_common_name
-Template: openswan/x509_common_name
-Value: 
-Owners: openswan
-
-Name: openswan/x509_country_code
-Template: openswan/x509_country_code
-Value: AT
-Owners: openswan
-
-Name: openswan/x509_email_address
-Template: openswan/x509_email_address
-Value: 
-Owners: openswan
-
-Name: openswan/x509_locality_name
-Template: openswan/x509_locality_name
-Value: 
-Owners: openswan
-
-Name: openswan/x509_organization_name
-Template: openswan/x509_organization_name
-Value: 
-Owners: openswan
-
-Name: openswan/x509_organizational_unit
-Template: openswan/x509_organizational_unit
-Value: 
-Owners: openswan
-
-Name: openswan/x509_self_signed
-Template: openswan/x509_self_signed
-Value: true
-Owners: openswan
-Flags: seen
-
-Name: openswan/x509_state_name
-Template: openswan/x509_state_name
-Value: 
-Owners: openswan
-
-Name: portmap/loopback
-Template: portmap/loopback
-Value: false
-Owners: portmap
-
-Name: shared/accepted-sun-dlj-v1-1
-Template: shared/accepted-sun-dlj-v1-1
-Value: true
-Owners: sun-java6-bin, sun-java6-jre
-Flags: seen
-
-Name: shared/error-sun-dlj-v1-1
-Template: shared/error-sun-dlj-v1-1
-Owners: sun-java6-bin, sun-java6-jre
-
-Name: shared/kernel-image/really-run-bootloader
-Template: shared/kernel-image/really-run-bootloader
-Owners: linux-image-2.6.32-bpo.5-686, linux-image-2.6.32-bpo.5-xen-686
-
-Name: shared/present-sun-dlj-v1-1
-Template: shared/present-sun-dlj-v1-1
-Value: true
-Owners: sun-java6-bin, sun-java6-jre
-Flags: seen
-
-Name: ssh/disable_cr_auth
-Template: ssh/disable_cr_auth
-Owners: openssh-server
-
-Name: ssh/encrypted_host_key_but_no_keygen
-Template: ssh/encrypted_host_key_but_no_keygen
-Owners: openssh-server
-
-Name: ssh/new_config
-Template: ssh/new_config
-Owners: openssh-server
-
-Name: ssh/use_old_init_script
-Template: ssh/use_old_init_script
-Value: true
-Owners: openssh-server
-Flags: seen
-
-Name: ssh/vulnerable_host_keys
-Template: ssh/vulnerable_host_keys
-Owners: openssh-server
-
-Name: sun-java6-jre/jcepolicy
-Template: sun-java6-jre/jcepolicy
-Owners: sun-java6-jre
-
-Name: sun-java6-jre/stopthread
-Template: sun-java6-jre/stopthread
-Owners: sun-java6-jre
-
-Name: tzdata/Areas
-Template: tzdata/Areas
-Value: Etc
-Owners: tzdata
-Flags: seen
-
-Name: tzdata/Zones/Africa
-Template: tzdata/Zones/Africa
-Owners: tzdata
-
-Name: tzdata/Zones/America
-Template: tzdata/Zones/America
-Owners: tzdata
-
-Name: tzdata/Zones/Antarctica
-Template: tzdata/Zones/Antarctica
-Owners: tzdata
-
-Name: tzdata/Zones/Arctic
-Template: tzdata/Zones/Arctic
-Owners: tzdata
-
-Name: tzdata/Zones/Asia
-Template: tzdata/Zones/Asia
-Owners: tzdata
-
-Name: tzdata/Zones/Atlantic
-Template: tzdata/Zones/Atlantic
-Owners: tzdata
-
-Name: tzdata/Zones/Australia
-Template: tzdata/Zones/Australia
-Owners: tzdata
-
-Name: tzdata/Zones/Etc
-Template: tzdata/Zones/Etc
-Value: UTC
-Owners: tzdata
-Flags: seen
-
-Name: tzdata/Zones/Europe
-Template: tzdata/Zones/Europe
-Owners: tzdata
-
-Name: tzdata/Zones/Indian
-Template: tzdata/Zones/Indian
-Owners: tzdata
-
-Name: tzdata/Zones/Pacific
-Template: tzdata/Zones/Pacific
-Owners: tzdata
-
-Name: tzdata/Zones/SystemV
-Template: tzdata/Zones/SystemV
-Owners: tzdata
-
-Name: ucf/changeprompt
-Template: ucf/changeprompt
-Owners: ucf
-
-Name: ucf/changeprompt_threeway
-Template: ucf/changeprompt_threeway
-Owners: ucf
-
-Name: ucf/show_diff
-Template: ucf/show_diff
-Owners: ucf
-
-Name: ucf/title
-Template: ucf/title
-Owners: ucf
-
-Name: udev/new_kernel_needed
-Template: udev/new_kernel_needed
-Owners: udev
-
-Name: udev/reboot_needed
-Template: udev/reboot_needed
-Owners: udev
-
diff --git a/systemvm/patches/debian/convert.sh b/systemvm/patches/debian/convert.sh
deleted file mode 100755
index 27098a1..0000000
--- a/systemvm/patches/debian/convert.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-
- 
-
-
-begin=$(date +%s)
-echo "Backing up systemvm.img"
-cp systemvm.img systemvm.img.tmp
-echo "Converting raw image to fixed vhd"
-vhd-util convert -s 0 -t 1 -i systemvm.img.tmp -o systemvm.vhd &> /dev/null
-echo "Converting fixed vhd to dynamic vhd"
-vhd-util convert -s 1 -t 2 -i systemvm.vhd -o systemvm.vhd &> /dev/null
-echo "Compressing vhd..."
-bzip2 -c systemvm.vhd > systemvm.vhd.bz2
-echo "Done VHD"
-
-echo "Converting raw image to qcow2"
-qemu-img  convert -f raw -O qcow2 systemvm.img systemvm.qcow2
-echo "Compressing qcow2..."
-bzip2 -c systemvm.qcow2 > systemvm.qcow2.bz2
-echo "Done qcow2"
-echo "Converting raw image to vmdk"
-qemu-img  convert -f raw -O vmdk systemvm.img systemvm.vmdk
-echo "Done creating vmdk"
-echo "Creating ova appliance "
-ovftool systemvm.vmx systemvm.ova
-echo "Done creating OVA"
-echo "Cleaning up..."
-rm -vf systemvm.vmdk
-rm -vf systemvm.vhd.bak
-
-echo "Compressing raw image..."
-bzip2 -c systemvm.img > systemvm.img.bz2
-echo "Done compressing raw image"
-
-echo "Generating md5sums"
-md5sum systemvm.img  > md5sum
-md5sum systemvm.img.bz2  >> md5sum
-md5sum systemvm.vhd  >> md5sum
-md5sum systemvm.vhd.bz2  >> md5sum
-md5sum systemvm.qcow2  >> md5sum
-md5sum systemvm.qcow2.bz2  >> md5sum
-md5sum systemvm.ova  >> md5sum
-fin=$(date +%s)
-t=$((fin-begin))
-echo "Finished compressing/converting image in $t seconds"
diff --git a/systemvm/patches/debian/qemuconvert.sh b/systemvm/patches/debian/qemuconvert.sh
deleted file mode 100755
index dc8eb15..0000000
--- a/systemvm/patches/debian/qemuconvert.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-
- 
-
-echo "Converting raw image to qcow2"
-qemu-img  convert -f raw -O qcow2 systemvm.img systemvm.qcow2
-echo "Compressing qcow2..."
-bzip2 -c systemvm.qcow2 > systemvm.qcow2.bz2
-echo "Done qcow2"
-echo "Converting raw image to vmdk"
-qemu-img  convert -f raw -O vmdk systemvm.img systemvm.vmdk
-echo "Compressing vmdk..."
-bzip2 -c systemvm.vmdk > systemvm.vmdk.bz2
-echo "Done vmdk"
diff --git a/systemvm/patches/debian/systemvm.vmx b/systemvm/patches/debian/systemvm.vmx
deleted file mode 100644
index 9b93449..0000000
--- a/systemvm/patches/debian/systemvm.vmx
+++ /dev/null
@@ -1,37 +0,0 @@
-config.version = "8"
-displayname = "systemvm"
-ethernet0.addressType = "generated"
-ethernet0.connectionType = "bridged"
-ethernet0.present = "true"
-ethernet0.startConnected = "true"
-ethernet0.virtualDev = "e1000"
-floppy0.autodetect = "false"
-floppy0.fileType = "device"
-floppy0.present = "true"
-floppy0.startConnected = "false"
-guestos = "debian5"
-ide0:0.deviceType = "disk"
-ide0:0.fileName = "systemvm.vmdk"
-ide0:0.present = "true"
-ide1:0.autodetect = "true"
-ide1:0.deviceType = "atapi-cdrom"
-ide1:0.present = "true"
-ide1:0.startConnected = "false"
-memsize = "256"
-numvcpus = "1"
-pciBridge0.present = "TRUE"
-pciBridge4.functions = "8"
-pciBridge4.present = "TRUE"
-pciBridge4.virtualDev = "pcieRootPort"
-pciBridge5.functions = "8"
-pciBridge5.present = "TRUE"
-pciBridge5.virtualDev = "pcieRootPort"
-pciBridge6.functions = "8"
-pciBridge6.present = "TRUE"
-pciBridge6.virtualDev = "pcieRootPort"
-pciBridge7.functions = "8"
-pciBridge7.present = "TRUE"
-pciBridge7.virtualDev = "pcieRootPort"
-svga.autodetect = "true"
-virtualhw.version = "7"
-vmci0.present = "TRUE"
diff --git a/systemvm/patches/debian/systemvm.xml b/systemvm/patches/debian/systemvm.xml
deleted file mode 100644
index fffc077..0000000
--- a/systemvm/patches/debian/systemvm.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<domain type='kvm' id='4'>
-  <name>systemvm2</name>
-  <memory>1572864</memory>
-  <currentMemory>1572864</currentMemory>
-  <vcpu>1</vcpu>
-  <os>
-    <type arch='i686' >hvm</type>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <!--<emulator>/usr/bin/qemu-system-x86_64</emulator>-->
-    <emulator>/usr/bin/qemu-kvm</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='raw' cache='writeback'/>
-      <source file='/var/lib/images/systemvm2/systemvm.img'/>
-      <!-- <target dev='hda' bus='ide'/> -->
-      <target dev='vda' bus='virtio'/>
-    </disk>
-    <interface type='network'>
-      <mac address='52:54:00:65:a8:eb'/>
-      <source network='default'/>
-      <target dev='vnet0'/>
-      <model type='virtio' />
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5900' autoport='yes'/>
-  </devices>
-</domain>
-
diff --git a/systemvm/patches/debian/vhdconvert.sh b/systemvm/patches/debian/vhdconvert.sh
deleted file mode 100755
index 0b0dbfb..0000000
--- a/systemvm/patches/debian/vhdconvert.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-
- 
-
-# BUILDING vhd-util on Linux
-# 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).
-# Apply this patch: http://lists.xensource.com/archives/cgi-bin/mesg.cgi?a=xen-devel&i=006101cb22f6%242004dd40%24600e97c0%24%40zhuo%40cloudex.cn.
-# Build the vhd-util tool:
-#    cd tools/blktap2
-#    make
-#    sudo make install
-
-echo "Backing up systemvm.img"
-cp systemvm.img systemvm.img.tmp
-echo "Converting raw image to fixed vhd"
-vhd-util convert -s 0 -t 1 -i systemvm.img.tmp -o systemvm.vhd
-echo "Converting fixed vhd to dynamic vhd"
-vhd-util convert -s 1 -t 2 -i systemvm.vhd -o systemvm.vhd
-echo "Compressing..."
-bzip2 -c systemvm.vhd > systemvm.vhd.bz2
-echo "Done"
diff --git a/systemvm/patches/debian/xe/xe-daemon b/systemvm/patches/debian/xe/xe-daemon
deleted file mode 100644
index bc514d7..0000000
--- a/systemvm/patches/debian/xe/xe-daemon
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-LANG="C"
-export LANG
-
-usage() {
-    echo "$0 [ -p <pidfile> ]" >&2
-    exit 1
-}
-
-# Parse command line opts
-while [ $# -ne 0 ] ; do
-    arg="$1"
-    shift
-    case "$arg" in
-        "-p")
-            [ $# -eq 0 ] && usage
-            pidfile="$1"
-            shift
-            mkdir -p "$(dirname "$pidfile")"
-            echo $$ > "$pidfile"
-            ;;
-        *)
-            usage
-            ;;
-    esac
-done
-
-XE_UPDATE_GUEST_ATTRS=${XE_UPDATE_GUEST_ATTRS:-/usr/sbin/xe-update-guest-attrs}
-XE_DAEMON_RATE=${XE_DAEMON_RATE:-60}                    # run once a minute by default
-XE_MEMORY_UPDATE_DIVISOR=${XE_MEMORY_UPDATE_DIVISOR:-2}  # update mem stats 1/2 as often by dflt
-
-# Delete xenstore cache following each reboot
-rm -rf /var/cache/xenstore
-
-MEMORY_UPDATE_COUNTER=0
-while true ; do 
-    if [ ${MEMORY_UPDATE_COUNTER} -eq 0 ] ; then
-	MEMORY=--memory
-	MEMORY_UPDATE_COUNTER=${XE_MEMORY_UPDATE_DIVISOR}
-    else
-	MEMORY=
-    fi
-    MEMORY_UPDATE_COUNTER=$((${MEMORY_UPDATE_COUNTER} - 1))
-    ${XE_UPDATE_GUEST_ATTRS} ${MEMORY}
-
-    sleep ${XE_DAEMON_RATE}
-done
diff --git a/systemvm/patches/debian/xe/xe-linux-distribution b/systemvm/patches/debian/xe/xe-linux-distribution
deleted file mode 100644
index 774f1c7..0000000
--- a/systemvm/patches/debian/xe/xe-linux-distribution
+++ /dev/null
@@ -1,267 +0,0 @@
-#! /bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Script to write information about the current distribution to stdout or a file.
-# Information collected:
-#   - Distribution name
-#   - Distribution version (major and minor)
-#   - Kernel version (uname)
-
-LANG="C"
-export LANG
-
-
-write_to_output()
-{
-    local distro="$1"
-    local major="$2"
-    local minor="$3"
-    local name="$4"
-    local uname=$(uname -r)
-
-    if [ -n "${TEST_RESULT}" ] ; then
-	MAJOR=$major
-	MINOR=$minor
-	DISTRO=$distro
-	UNAME=$uname
-	return 0
-    fi
-
-    echo "os_distro=\"${distro}\""
-    echo "os_majorver=\"${major}\""
-    echo "os_minorver=\"${minor}\""
-    echo "os_uname=\"${uname}\""
-    echo "os_name=\"${name}\""
-
-    return 0
-}
-
-identify_debian()
-{
-    local debian_version="$1"
-    local major
-    local minor
-
-    # 3.1
-    # 4.0
-    # Ignores testing and unstable which contain ".*/sid".
-
-    if [ ! -f "${debian_version}" ] ; then
-	return 1
-    fi
-
-    eval $(awk -F. '/^[0-9]*\.[0-9]*/ \
-                        { print "major="$1 ; print "minor="$2 ; exit 0 }' \
-                   "${debian_version}")
-    
-    if [ -z "${major}" ] && [ -z "${minor}" ] && ! grep -q /sid "${debian_version}" ; then
-	return 1
-    fi
-
-    write_to_output "debian" "${major}" "${minor}" "Debian $(head -n 1 $debian_version)"
-
-    return 0
-}
-
-identify_redhat()
-{
-    redhat_release="$1"
-    local distro
-    local major
-    local minor
-    local beta
-
-    # distro=rhel
-    # Red Hat Enterprise Linux AS release 3 (Taroon Update 6)
-    # Red Hat Enterprise Linux AS release 3 (Taroon Update 8)
-    # Red Hat Enterprise Linux AS release 4 (Nahant)
-    # Red Hat Enterprise Linux AS release 4 (Nahant Update 1)
-    # Red Hat Enterprise Linux AS release 4 (Nahant Update 2)
-    # Red Hat Enterprise Linux AS release 4 (Nahant Update 3)
-    # Red Hat Enterprise Linux AS release 4 (Nahant Update 4)
-    # Red Hat Enterprise Linux Server release 4.92 (Tikanga)
-    # Red Hat Enterprise Linux Server release 5 (Tikanga)
-    # Red Hat Enterprise Linux Server release 5.1 Beta (Tikanga)
-
-    # distro=xe-ddk
-    # \@PRODUCT_BRAND\@ DDK release \@PRODUCT_VERSION\@-\@BUILD_NUMBER\@ (\@PRODUCT_NAME\@)
-    # Rio DDK release 0.5.6-2991c (xenenterprise)
-
-    # distro=xe-sdk
-    # \@PRODUCT_BRAND\@ SDK release \@PRODUCT_VERSION\@-\@BUILD_NUMBER\@ (\@PRODUCT_NAME\@)
-    # Rio SDK release 0.5.6-2991c (xenenterprise)
-
-    # distro=fedora
-    # Fedora Core release 3 (Heidelberg)
-
-    # distro=centos
-    # CentOS release 4.0 (Final)
-    # CentOS release 5 (Final)
-
-    # distro=oracle
-    # Enterprise Linux Enterprise Linux Server release 5 (Carthage)
-    
-    if [ ! -f "${redhat_release}" ] ; then
-	return 1
-    fi
-
-    eval $(sed -n \
-               -e 's/^\(.*\) DDK release \(.*\)-\(.*\) (.*)$/distro=xe-ddk;major=\2;minor=\3/gp;' \
-               -e 's/^\(.*\) SDK release \(.*\)-\(.*\) (.*)$/distro=xe-sdk;major=\2;minor=\3/gp;' \
-               -e 's/^Red Hat Enterprise Linux .* release \([0-9]*\) (.* Update \(.*\))$/distro=rhel;major=\1;minor=\2/gp;'\
-               -e 's/^Red Hat Enterprise Linux .* release \([0-9]*\) (.*)$/distro=rhel;major=\1/gp;' \
-               -e 's/^Red Hat Enterprise Linux .* release \([0-9]*\)\.\([0-9]*\) \([Bb]eta \)\?(.*)$/distro=rhel;major=\1;minor=\2;beta=\3;/gp;' \
-               -e 's/^Fedora.*release \([0-9]*\) (.*)$/distro=fedora;major=\1/gp;' \
-               -e 's/^CentOS release \([0-9]*\)\.\([0-9]*\) (.*)/distro=centos;major=\1;minor=\2/gp;' \
-               -e 's/^CentOS release \([0-9]*\) (.*)/distro=centos;major=\1/gp;' \
-               -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\)\.\([0-9]*\) (.*)$/distro=oracle;major=\1;minor=\2;/gp;' \
-               -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\) (.*)$/distro=oracle;major=\1/gp;' \
-                         "${redhat_release}")
-
-    if [ -z "${major}" -o -z "${distro}" ] ; then
-        return 1
-    fi
-
-    if [ -z "${minor}" ] ; then
-        minor=0
-    fi
-
-    # HACK to handle RHEL betas
-    if [ "${distro}" == "rhel" ] && [ ${minor} -gt 90 ] ; then
-    	major=$(expr ${major} + 1 )
-	minor=0
-	beta=Beta
-    fi
-
-    if [ -n "${beta}" ] ; then
-	minor="${minor}beta"
-    fi
-
-    write_to_output "${distro}" "${major}" "${minor}" "$(head -n 1 ${redhat_release})"
-
-}
-
-identify_sles()
-{
-    suse_release="$1"
-    local major
-    local minor
-    local _major
-
-    # SUSE LINUX Enterprise Server 9 (i586)
-    # VERSION = 9
-    #
-    # SUSE LINUX Enterprise Server 9 (i586)
-    # VERSION = 9
-    # PATCHLEVEL = 2
-    #
-    # SUSE LINUX Enterprise Server 9 (i586)
-    # VERSION = 9
-    # PATCHLEVEL = 3
-    #
-    # SUSE Linux Enterprise Server 10 (i586)
-    # VERSION = 10
-    #
-    # SUSE Linux Enterprise Server 10 (i586)
-    # VERSION = 10
-    # PATCHLEVEL = 1
-    #
-    # SUSE Linux Enterprise Server 11 (i586)
-    # VERSION = 11
-    # PATCHLEVEL = 0
-
-    if [ ! -f "${suse_release}" ] ; then
-        return 1
-    fi
-
-    eval $(sed -n \
-               -e 's/^SUSE L\(inux\|INUX\) Enterprise Server \([0-9]*\) (.*)/_major=\2;/gp;' \
-               -e 's/^VERSION = \([0-9]*\)$/major=\1;/gp;' \
-               -e 's/^PATCHLEVEL = \([0-9]*\)$/minor=\1;/gp;' \
-               "${suse_release}")
-
-    if [ -z "${major}" -o -z "${_major}" ] ; then
-        return 1
-    fi
-
-    if [ "${major}" != "${_major}" ] ; then
-        return 1
-    fi
-
-    if [ -z "${minor}" ] ; then
-        minor=0
-    fi
-
-    write_to_output "sles" "${major}" "${minor}" "$(head -n 1 ${suse_release})"
-
-}
-
-identify_lsb()
-{
-    lsb_release="$1"
-
-    if [ ! -x "${lsb_release}" ] ; then
-	saved_IFS=$IFS
-	IFS=:
-	for i in $PATH ; do
-	    if [ -x "${i}/${lsb_release}" ] ; then
-		lsb_release="${i}/${lsb_release}"
-		break
-	    fi
-	done
-	IFS=$saved_IFS
-    fi
-
-    if [ ! -x "${lsb_release}" ] ; then
-	return 1
-    fi
-    
-    distro=$(${lsb_release} --short --id | tr 'A-Z' 'a-z')
-    description=$(${lsb_release} --short --description | sed -e 's/^"\(.*\)"$/\1/g')
-    release=$(${lsb_release} --short --release)
-
-    if [ -z "${distro}" -o -z "${release}" ] ; then
-	return 1
-    fi
-
-    eval $(echo $release | awk -F. -- '{ print "major=" $1 ; print "minor=" $2 }')
-
-    if [ -z "${major}" -o -z "${distro}" ] ; then
-        return 1
-    fi
-
-    write_to_output "${distro}" "${major}" "${minor}" "${description}"
-}
-
-if [ $# -eq 1 ] ; then
-    exec 1>"$1"
-fi
-
-if [ -z "${TEST}" ] ; then
-    identify_redhat /etc/redhat-release && exit 0
-    identify_sles   /etc/SuSE-release   && exit 0
-    identify_lsb    lsb_release         && exit 0
-    identify_debian /etc/debian_version && exit 0
-
-    if [ $# -eq 1 ] ; then
-	rm -f "$1"
-    fi
-
-    exit 1
-fi
diff --git a/systemvm/patches/debian/xe/xe-update-guest-attrs b/systemvm/patches/debian/xe/xe-update-guest-attrs
deleted file mode 100644
index 6c605be..0000000
--- a/systemvm/patches/debian/xe/xe-update-guest-attrs
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Script to write information about the guest to XenStore.
-#
-# Information collected (if --memory NOT passed in):
-#   - Distribution name
-#   - Distribution version (major and minor)
-#   - Kernel version (uname)
-#   - IP address for each Ethernet interface
-#
-# Information collected (if --memory IS passed in):
-#   - memtotal
-#   - memfree
-#
-# Memory stats are separated out because they change all the time
-# and so we may not want to update them as frequently
-
-LANG="C"
-export LANG
-
-
-XE_LINUX_DISTRIBUTION_CACHE=/var/cache/xe-linux-distribution
-
-IPADDR_RE="\([[:digit:]]\{1,3\}\.\)\{3\}[[:digit:]]\{1,3\}"
-
-export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-XENSTORE=${XENSTORE:-xenstore}
-
-XENSTORE_UPDATED=0
-
-# parse command line opts
-
-MEMORY_MODE=0 # do not update memory stats 
-while [ $# -ge 1 ] ; do 
-    if [ "$1" = "--memory" ] ; then
-	MEMORY_MODE=1	# update only memory stats 
-    fi
-    shift
-done
-
-xenstore_write_cached() {
-    key="$1" newval="$2"
-    cache=/var/cache/xenstore/$key
-    if [ -f $cache ] ; then
-	# cache exists
-	oldval=$(cat "$cache")
-	if [ "$oldval" = "$newval" ] ; then
-	    # value unchanged
-	    return 0
-	fi
-    else
-	# cache does not exist
-	if [ -e $cache ] ; then 
-	    # something (directory?) in its way
-	    rm -rf $cache
-	fi
-    fi
-    
-    # try to write and update cache if successfull
-    if $XENSTORE-write "$key" "$newval" ; then
-	mkdir -p $(dirname "$cache")
-	echo -n "$newval" > "$cache"
-	XENSTORE_UPDATED=1
-	return 0
-    fi
-    return 1
-}
-
-# If we detect a domain change then delete our cache and force a refresh
-domid=$(xenstore-read "domid")
-cache=/var/cache/xenstore/unique-domain-id
-newval=$(xenstore-read "/local/domain/${domid}/unique-domain-id")
-if [ -e $cache ]; then
-    oldval=$(cat "$cache")
-    if [ "$oldval" != "$newval" ]; then
-	# domain changed
-	rm -rf /var/cache/xenstore
-    fi
-fi
-mkdir -p $(dirname "$cache")
-echo -n "$newval" > "$cache"
-
-xenstore_rm_cached() {
-    key="$1"
-    cache=/var/cache/xenstore/$key
-    if [ ! -e $cache ] ; then
-	return 1
-    fi
-    # try to write and update cache if successfull
-    if $XENSTORE-rm "$key" ; then
-	rm -rf "$cache"
-	XENSTORE_UPDATED=1
-	return 0
-    fi
-    return 1
-}
-
-xenstore_list_interfaces_cached() {
-    topdir=/var/cache/xenstore/attr
-    if [ -d $topdir ] ; then
-	cd $topdir 
-	for dir in * ; do 
-	    [ -f $dir/ip ] && echo $dir
-	done
-    fi
-}
-
-if [ $MEMORY_MODE -eq 1 ] ; then
-    # Update the memory information
-    eval $(cat /proc/meminfo | \
-	sed -n -e 's/MemTotal\: *\([0-9]*\)[^$]*/memtotal=\1/gp;' \
-        -e 's/MemFree\: *\([0-9]*\)[^$]*/memfree=\1/gp;')
-    
-    xenstore_write_cached "data/meminfo_total" "${memtotal}"
-    xenstore_write_cached "data/meminfo_free" "${memfree}"
-fi
-
-
-
-# e.g.
-# $ ip addr show
-# 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue 
-#     link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
-#     inet 127.0.0.1/8 scope host lo
-#     inet6 ::1/128 scope host 
-#        valid_lft forever preferred_lft forever
-# 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast qlen 1000
-#     link/ether 00:13:20:95:e8:74 brd ff:ff:ff:ff:ff:ff
-#     inet 172.31.0.57/20 brd 172.31.15.255 scope global eth0
-#     inet6 fe80::213:20ff:fe95:e874/64 scope link 
-#        valid_lft forever preferred_lft forever
-# 3: sit0: <NOARP> mtu 1480 qdisc noop 
-#     link/sit 0.0.0.0 brd 0.0.0.0
-
-#eval $(ip addr show | \
-#       sed -n -e 's/^[[:digit:]]*: \([a-z0-9]*\): .*/ifs="\$ifs \1"; current="\1"; /gp;' \
-#	      -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/eval inet_\${current}="\1"; /gp;')
-
-# e.g.
-# eth0      Link encap:Ethernet  HWaddr 00:13:20:95:E8:74  
-#           inet addr:172.31.0.57  Bcast:172.31.15.255  Mask:255.255.240.0
-#           inet6 addr: fe80::213:20ff:fe95:e874/64 Scope:Link
-#           UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
-#           RX packets:98001128 errors:0 dropped:0 overruns:0 frame:0
-#           TX packets:87728920 errors:0 dropped:0 overruns:0 carrier:0
-#           collisions:0 txqueuelen:1000 
-#           RX bytes:35864034092 (33.4 GiB)  TX bytes:27544025180 (25.6 GiB)
-#           Interrupt:177 
-# 
-# lo        Link encap:Local Loopback  
-#           inet addr:127.0.0.1  Mask:255.0.0.0
-#           inet6 addr: ::1/128 Scope:Host
-#           UP LOOPBACK RUNNING  MTU:16436  Metric:1
-#           RX packets:32928 errors:0 dropped:0 overruns:0 frame:0
-#           TX packets:32928 errors:0 dropped:0 overruns:0 carrier:0
-#           collisions:0 txqueuelen:0 
-#           RX bytes:3604609 (3.4 MiB)  TX bytes:3604609 (3.4 MiB)
-
-eval $(/sbin/ifconfig | \
-        sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \
-               -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \
-               -e 's/  *inet addr:\('$IPADDR_RE'\) .*/eval inet_\${current}="\1"; /gp;')
-
-# network
-for if in $ifs ; do
-
-	[ "${if}" = "lo" ] && continue
-	inet=$(eval echo \${inet_${if}})
-	[ -z "${inet}" ] && continue
-
-	xenstore_write_cached "attr/${if}/ip" "${inet}"
-done
-
-# remove any interfaces that have been unplugged or downed
-for at in $(xenstore_list_interfaces_cached) ; do
-    for if in $ifs ; do
-	[ "${if}" = "${at}" ] && continue 2
-    done
-    xenstore_rm_cached "attr/${at}"
-done
-
-# distro
-if [ -f ${XE_LINUX_DISTRIBUTION_CACHE} ] ; then
-    . ${XE_LINUX_DISTRIBUTION_CACHE}
-    for key in os_name os_majorver os_minorver os_uname os_distro ; do
-	new=$(eval echo \${${key}})
-	[ -n "${new}" ] || continue
-	xenstore_write_cached "data/${key}" "${new}"
-    done
-fi
-
-# whether I support ballooning or not
-xenstore_write_cached "control/feature-balloon" "1"
-
-# whether I support ballooning or not
-xenstore_write_cached "control/feature-balloon" "1"
-
-# build time addons
-xenstore_write_cached "attr/PVAddons/MajorVersion" "5"
-xenstore_write_cached "attr/PVAddons/MinorVersion" "6"
-xenstore_write_cached "attr/PVAddons/MicroVersion" "0" 
-xenstore_write_cached "attr/PVAddons/BuildVersion" "31188"
-xenstore_write_cached "attr/PVAddons/Installed" "1" 
-
-# update xenstore if necc
-if [ $XENSTORE_UPDATED -eq 1 ] ; then
-    xenstore_write_cached "data/updated" "$(date)"
-fi
-
diff --git a/systemvm/pom.xml b/systemvm/pom.xml
index 4d657b7..f617495 100644
--- a/systemvm/pom.xml
+++ b/systemvm/pom.xml
@@ -119,23 +119,12 @@
                   <fileset dir="${basedir}/patches/debian/vpn/">
                     <include name="**/*" />
                   </fileset>
-                  <fileset dir="${basedir}/patches/debian/xe/">
-                    <include name="**/*" />
-                    <exclude name="**/xe-*" />
-                    <exclude name="**/xen-*" />
-                  </fileset>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/build-patch/opt/cloud/bin/">
                   <fileset dir="${basedir}/../scripts/util/">
                     <include name="**/keystore-*" />
                   </fileset>
                 </copy>
-                <copy overwrite="true" todir="${basedir}/target/build-patch/usr/sbin/">
-                  <fileset dir="${basedir}/patches/debian/xe/">
-                    <include name="**/xe-*" />
-                    <include name="**/xen-*" />
-                  </fileset>
-                </copy>
                 <tar destfile="${basedir}/target/patch.tar">
                   <tarfileset dir="${basedir}/target/build-patch/"
                     filemode="755">
diff --git a/systemvm/vm-script/vmops b/systemvm/vm-script/vmops
deleted file mode 100644
index a9f70c8..0000000
--- a/systemvm/vm-script/vmops
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#
-# vmops		Script to start and stop the VMOps Agent.
-#
-# Author:       Chiradeep Vittal <ch...@vmops.com>
-# chkconfig: 2345 99 01
-# description: 	Start up the VMOps agent
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-# Source function library.
-if [ -f /etc/init.d/functions ]
-then
-  . /etc/init.d/functions
-fi
-
-_success() {
-  if [ -f /etc/init.d/functions ]
-  then
-    success
-  else
-    echo "Success"
-  fi
-}
-
-_failure() {
-  if [ -f /etc/init.d/functions ]
-  then
-    failure
-  else
-    echo "Failed"
-  fi
-}
-RETVAL=$?
-VMOPS_HOME="/usr/local/vmops"
-
-mkdir -p /var/log/vmops
-
-get_pids() {
-  local i
-  for i in $(ps -ef| grep java | grep -v grep | awk '{print $2}'); 
-  do 
-    echo $(pwdx $i) | grep "$VMOPS_HOME" | grep -i console | awk -F: '{print $1}'; 
-  done
-}
-
-start() {
-   local pid=$(get_pids)
-   echo -n "Starting VMOps Console Proxy: "
-   if [ -f $VMOPS_HOME/consoleproxy/run.sh ];
-   then
-     if [ "$pid" == "" ]
-     then
-       (cd $VMOPS_HOME/consoleproxy; nohup ./run.sh > /var/log/vmops/vmops.out 2>&1 & )
-       pid=$(get_pids)
-       echo $pid > /var/run/vmops.pid 
-     fi
-     _success
-   else
-     _failure
-   fi
-   echo
-}
-
-stop() {
-  local pid
-  echo -n  "Stopping VMOps agent: "
-  for pid in $(get_pids)
-  do
-    kill $pid
-  done
-  _success
-  echo
-}
-
-status() {
-  local pids=$(get_pids)
-  if [ "$pids" == "" ]
-  then
-    echo "VMOps agent is not running"
-    return 1
-  fi
-  echo "VMOps agent is running: process id: $pids"
-  return 0
-}
-
-
-case "$1" in
-   start) start
-	  ;;
-    stop) stop
- 	  ;;
-    status) status
- 	  ;;
- restart) stop
-          start
- 	  ;;
-       *) echo $"Usage: $0 {start|stop|status|restart}"
-	  exit 1
-	  ;;
-esac
-
-exit $RETVAL

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.