Skip to content

Commit 9aa7d4e

Browse files
yadvryadvr
committed
CLOUDSTACK-10013: SystemVM.iso refactoring and cleanups
- Removes old/dead files - Refactors file path/location, backward compatible to filepaths in systemvm.isoa - Fixes failures around apache2
1 parent 0102e85 commit 9aa7d4e

257 files changed

Lines changed: 862 additions & 4300 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎agent-simulator/tomcatconf/commands-simulator.properties.in‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎client/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,6 @@
798798
<target>
799799
<copy todir="${basedir}/target/common/vms">
800800
<fileset dir="${basedir}/../systemvm/dist">
801-
<include name="systemvm.zip"/>
802801
<include name="systemvm.iso"/>
803802
</fileset>
804803
</copy>

‎developer/developer-prefill.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
112112

113113
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
114114
VALUES ('Advanced', 'DEFAULT', 'management-server',
115-
'ping.timeout', '1.5');
115+
'ping.timeout', '2.0');
116116

117117
-- Enable dynamic RBAC by default for fresh deployments
118118
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)

‎pom.xml‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -920,35 +920,12 @@
920920
<exclude>ui/lib/reset.css</exclude>
921921
<exclude>ui/lib/require.js</exclude>
922922
<exclude>utils/testsmallfileinactive</exclude>
923-
<exclude>systemvm/conf/agent.properties</exclude>
924-
<exclude>systemvm/conf/environment.properties</exclude>
925-
<exclude>systemvm/js/jquery.js</exclude>
926-
<exclude>systemvm/js/jquery.flot.navigate.js</exclude>
927-
<exclude>systemvm/patches/debian/systemvm.vmx</exclude>
928-
<exclude>systemvm/patches/debian/config/root/.ssh/authorized_keys</exclude>
929-
<exclude>systemvm/patches/debian/config/etc/apache2/httpd.conf</exclude>
930-
<exclude>systemvm/patches/debian/config/etc/apache2/vhost.template</exclude>
931-
<exclude>systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl</exclude>
932-
<exclude>systemvm/patches/debian/config/etc/vpcdnsmasq.conf</exclude>
933-
<exclude>systemvm/patches/debian/config/etc/ssh/sshd_config</exclude>
934-
<exclude>systemvm/patches/debian/config/etc/rsyslog.conf</exclude>
935-
<exclude>systemvm/patches/debian/config/etc/logrotate.conf</exclude>
936-
<exclude>systemvm/patches/debian/config/etc/logrotate.d/*</exclude>
937-
<exclude>systemvm/patches/debian/config/etc/sysctl.conf</exclude>
938-
<exclude>systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
939-
<exclude>systemvm/patches/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
940-
<exclude>systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ</exclude>
941-
<exclude>systemvm/patches/debian/vpn/etc/ipsec.conf</exclude>
942-
<exclude>systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd</exclude>
943-
<exclude>systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>
944-
<exclude>systemvm/patches/debian/vpn/etc/ipsec.secrets</exclude>
945-
<exclude>systemvm/patches/debian/config/etc/haproxy/haproxy.cfg</exclude>
946-
<exclude>systemvm/patches/debian/config/etc/cloud-nic.rules</exclude>
947-
<exclude>systemvm/patches/debian/config/etc/modprobe.d/aesni_intel</exclude>
948-
<exclude>systemvm/patches/debian/config/etc/rc.local</exclude>
949-
<exclude>systemvm/patches/debian/config/var/www/html/userdata/.htaccess</exclude>
950-
<exclude>systemvm/patches/debian/config/var/www/html/latest/.htaccess</exclude>
951-
<exclude>systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
923+
<exclude>systemvm/agent/conf/agent.properties</exclude>
924+
<exclude>systemvm/agent/conf/environment.properties</exclude>
925+
<exclude>systemvm/agent/js/jquery.js</exclude>
926+
<exclude>systemvm/agent/js/jquery.flot.navigate.js</exclude>
927+
<exclude>systemvm/patches/debian/**</exclude>
928+
<exclude>systemvm/patches/vpn/**</exclude>
952929
<exclude>tools/transifex/.tx/config</exclude>
953930
<exclude>tools/logo/apache_cloudstack.png</exclude>
954931
<exclude>tools/marvin/marvin/sandbox/advanced/sandbox.cfg</exclude>

‎setup/dev/advanced.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
},
232232
{
233233
"name": "ping.timeout",
234-
"value": "1.5"
234+
"value": "2.0"
235235
}
236236
],
237237
"mgtSvr": [

systemvm/certs/localhost.crt renamed to systemvm/agent/certs/localhost.crt

File renamed without changes.

systemvm/certs/localhost.key renamed to systemvm/agent/certs/localhost.key

File renamed without changes.

systemvm/certs/realhostip.crt renamed to systemvm/agent/certs/realhostip.crt

File renamed without changes.

systemvm/certs/realhostip.csr renamed to systemvm/agent/certs/realhostip.csr

File renamed without changes.

systemvm/certs/realhostip.key renamed to systemvm/agent/certs/realhostip.key

File renamed without changes.

0 commit comments

Comments
 (0)