You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pa...@apache.org on 2019/01/09 15:34:37 UTC
[cloudstack] branch remove_dump_snapshot created (now 078a4c2)
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a change to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
at 078a4c2 remove dumb snapshot
This branch includes the following new commits:
new acd7d89 even more granular - this is going to need some major squaching
new b6cf59a fix cut and paste error
new 461a3eb PARITAL WORK _ DO NO BUILD FROM THIS
new 9b22947 STILL BETA
new d414b51 move services to systemd dir
new c02af01 call post init as a script not service
new 7a8d6bf get nesting right
new a27c389 clear screen before boot screen
new 078a4c2 remove dumb snapshot
The 9 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.
[cloudstack] 05/09: move services to systemd dir
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit d414b51130614cc8a60b4377ae014a4fea15f36f
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Sun Dec 23 07:29:09 2018 +0000
move services to systemd dir
---
systemvm/debian/etc/systemd/system/cloud.service | 12 ++++++++++++
systemvm/debian/lib/systemd/system/baremetal-vr.service | 12 ++++++++++++
2 files changed, 24 insertions(+)
diff --git a/systemvm/debian/etc/systemd/system/cloud.service b/systemvm/debian/etc/systemd/system/cloud.service
new file mode 100644
index 0000000..e3824bf
--- /dev/null
+++ b/systemvm/debian/etc/systemd/system/cloud.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=CloudStack Agent service
+After=cloud-early-config.service network.target cloud-postinit.service local-fs.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+WorkingDirectory=/usr/local/cloud/systemvm
+ExecStart=/usr/local/cloud/systemvm/_run.sh
+Restart=on-failure
diff --git a/systemvm/debian/lib/systemd/system/baremetal-vr.service b/systemvm/debian/lib/systemd/system/baremetal-vr.service
new file mode 100644
index 0000000..f880f0c
--- /dev/null
+++ b/systemvm/debian/lib/systemd/system/baremetal-vr.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=CloudStack Baremetal VR service
+After=network.target local-fs.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+WorkingDirectory=/opt/cloud/bin
+ExecStart=/usr/bin/python /opt/cloud/bin/baremetal-vr.py
+Restart=on-failure
[cloudstack] 08/09: clear screen before boot screen
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a27c3899e69471081c850e571530e9738c38042d
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Sun Dec 23 11:10:55 2018 +0000
clear screen before boot screen
---
tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
index fde769b..e5e2636 100644
--- a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
+++ b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
@@ -63,6 +63,7 @@ function do_signature() {
function configure_issue() {
cat > /etc/issue <<EOF
+ESC [ 2J
__?.o/ Apache CloudStack SystemVM $CLOUDSTACK_RELEASE
( )# https://cloudstack.apache.org
(___(_) Debian GNU/Linux 9 \n \l
[cloudstack] 02/09: fix cut and paste error
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit b6cf59aaff68a0c11203e7b55b2c50119ae01f83
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Wed Dec 19 09:09:43 2018 +0000
fix cut and paste error
---
.../debian/lib/systemd/system/hyperv-daemons.hv-vss-daemon.service | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/systemvm/debian/lib/systemd/system/hyperv-daemons.hv-vss-daemon.service b/systemvm/debian/lib/systemd/system/hyperv-daemons.hv-vss-daemon.service
index 1ba50af..d4fd675 100644
--- a/systemvm/debian/lib/systemd/system/hyperv-daemons.hv-vss-daemon.service
+++ b/systemvm/debian/lib/systemd/system/hyperv-daemons.hv-vss-daemon.service
@@ -1,9 +1,8 @@
-root@s-1-VM:/lib/systemd/system# cat hyperv-daemons.hv-vss-daemon.service
-[Unit]
+[Unit]
Description=Hyper-V volume shadow copy service (VSS) daemon
[Service]
ExecStart=/usr/sbin/hv_vss_daemon -n
[Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
[cloudstack] 03/09: PARITAL WORK _ DO NO BUILD FROM THIS
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 461a3eb87dffaf1beec270934c9ee9feaf5e4532
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Sat Dec 22 15:40:41 2018 +0000
PARITAL WORK _ DO NO BUILD FROM THIS
---
.../debian/etc/systemd/system/baremetal-vr.service | 12 -------
systemvm/debian/etc/systemd/system/cloud.service | 12 -------
.../debian/opt/cloud/bin/setup/cloud-early-config | 39 ++++++++++++++++++++++
systemvm/debian/opt/cloud/bin/setup/common.sh | 2 +-
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 3 +-
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 33 ++----------------
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 2 +-
7 files changed, 44 insertions(+), 59 deletions(-)
diff --git a/systemvm/debian/etc/systemd/system/baremetal-vr.service b/systemvm/debian/etc/systemd/system/baremetal-vr.service
deleted file mode 100644
index f880f0c..0000000
--- a/systemvm/debian/etc/systemd/system/baremetal-vr.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=CloudStack Baremetal VR service
-After=network.target local-fs.target
-
-[Install]
-WantedBy=multi-user.target
-
-[Service]
-Type=simple
-WorkingDirectory=/opt/cloud/bin
-ExecStart=/usr/bin/python /opt/cloud/bin/baremetal-vr.py
-Restart=on-failure
diff --git a/systemvm/debian/etc/systemd/system/cloud.service b/systemvm/debian/etc/systemd/system/cloud.service
deleted file mode 100644
index e3824bf..0000000
--- a/systemvm/debian/etc/systemd/system/cloud.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=CloudStack Agent service
-After=cloud-early-config.service network.target cloud-postinit.service local-fs.target
-
-[Install]
-WantedBy=multi-user.target
-
-[Service]
-Type=simple
-WorkingDirectory=/usr/local/cloud/systemvm
-ExecStart=/usr/local/cloud/systemvm/_run.sh
-Restart=on-failure
diff --git a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
index 976b2ca..f1162b5 100755
--- a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
+++ b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
@@ -205,6 +205,41 @@ patch() {
return 0
}
+
+enable_guest_services() {
+
+HYPERVISOR=$(</etc/cloudstack-agent_detected_hypervisor)
+ case $HYPERVISOR in
+ xen-pv|xen-domU)
+ systemctl stop ntpd
+ systemctl disable ntpd
+ systemctl start xe-daemon
+ ;;
+ xen-hvm)
+ systemctl stop ntpd
+ systemctl disable ntpd
+ systemctl start xe-daemon
+ ;;
+ kvm)
+ systemctl start qemu-guest-agent
+ VPORT=$(find /dev/virtio-ports -type l -name '*.vport' 2>/dev/null|head -1)
+ ;;
+ vmware)
+ # system time sync'd with host via vmware tools
+ systemctl stop ntpd
+ systemctl disable ntpd
+ systemctl start open-vm-tools
+ ;;
+ virtualpc|hyperv)
+ # Hyper-V is recognized as virtualpc hypervisor type. Boot args are passed using KVP Daemon
+ systemctl start hyperv-daemons.hv-fcopy-daemon.service hyperv-daemons.hv-kvp-daemon.service hyperv-daemons.hv-vss-daemon.service
+ ;;
+ virtualbox)
+ # Virtualbox is used to test the virtual router
+ ;;
+ esac
+}
+
start() {
log_it "Executing cloud-early-config"
@@ -225,6 +260,10 @@ start() {
patch
sync
sysctl -p
+
+ log_it "Starting Virtual Guest Services for $HYPERVISOR"
+
+ enable_guest_services
log_it "Configuring systemvm type=$TYPE"
diff --git a/systemvm/debian/opt/cloud/bin/setup/common.sh b/systemvm/debian/opt/cloud/bin/setup/common.sh
index e24642f..110800a 100755
--- a/systemvm/debian/opt/cloud/bin/setup/common.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/common.sh
@@ -584,7 +584,7 @@ setup_ntp() {
routing_svcs() {
echo "haproxy apache2" > /var/cache/cloud/enabled_svcs
- echo "cloud nfs-common portmap" > /var/cache/cloud/disabled_svcs
+ echo "nfs-common portmap" > /var/cache/cloud/disabled_svcs
if [ "$RROUTER" -eq "1" ]
then
echo "keepalived conntrackd" >> /var/cache/cloud/enabled_svcs
diff --git a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
index 225dc6f..c20fed2 100755
--- a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+\#!/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
@@ -19,7 +19,6 @@
. /opt/cloud/bin/setup/common.sh
consoleproxy_svcs() {
- echo "cloud" > /var/cache/cloud/enabled_svcs
echo "haproxy dnsmasq apache2 nfs-common portmap" > /var/cache/cloud/disabled_svcs
mkdir -p /var/log/cloud
}
diff --git a/systemvm/debian/opt/cloud/bin/setup/postinit.sh b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
index d067df2..fdb2111 100755
--- a/systemvm/debian/opt/cloud/bin/setup/postinit.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
@@ -30,37 +30,6 @@ else
fi
sysctl -p
-# HYPERVISOR exported by cloud-early-config
-HYPERVISOR=$(</etc/cloudstack-agent_detected_hypervisor)
-case $HYPERVISOR in
- xen-pv|xen-domU)
- systemctl stop ntpd
- systemctl start xe-daemon
- ;;
- xen-hvm)
- systemctl stop ntpd
- systemctl start xe-daemon
- ;;
- kvm)
- systemctl start qemu-guest-agent
- VPORT=$(find /dev/virtio-ports -type l -name '*.vport' 2>/dev/null|head -1)
- ;;
- vmware)
- # system time sync'd with host via vmware tools
- systemctl stop ntpd
- systemctl start open-vm-tools
- ;;
- virtualpc|hyperv)
- # Hyper-V is recognized as virtualpc hypervisor type. Boot args are passed using KVP Daemon
- systemctl start hyperv-daemons.hv-fcopy-daemon.service hyperv-daemons.hv-kvp-daemon.service hyperv-daemons.hv-vss-daemon.service
- ;;
- virtualbox)
- # Virtualbox is used to test the virtual router
- ;;
- esac
-
-
-
# Restart journald for setting changes to apply
systemctl restart systemd-journald
@@ -103,3 +72,5 @@ fi
systemctl enable --now --no-block ssh
date > /var/cache/cloud/boot_up_done
+
+systemctl start cloud
diff --git a/systemvm/debian/opt/cloud/bin/setup/secstorage.sh b/systemvm/debian/opt/cloud/bin/setup/secstorage.sh
index 8b6d4ee..8d5440a 100755
--- a/systemvm/debian/opt/cloud/bin/setup/secstorage.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/secstorage.sh
@@ -19,7 +19,7 @@
. /opt/cloud/bin/setup/common.sh
secstorage_svcs() {
- echo "apache2 cloud nfs-common portmap" > /var/cache/cloud/enabled_svcs
+ echo "apache2 nfs-common portmap" > /var/cache/cloud/enabled_svcs
echo "conntrackd keepalived haproxy dnsmasq" > /var/cache/cloud/disabled_svcs
mkdir -p /var/log/cloud
}
[cloudstack] 04/09: STILL BETA
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 9b22947f8c721200affdb4c889b75b9325e2a33e
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Sat Dec 22 21:29:02 2018 +0000
STILL BETA
---
.../etc/systemd/system/cloud-early-config.service | 5 +--
.../etc/systemd/system/cloud-postinit.service | 13 -------
.../debian/opt/cloud/bin/setup/cloud-early-config | 17 ++++++++-
systemvm/debian/opt/cloud/bin/setup/common.sh | 6 +--
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 14 ++-----
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 43 ++++++++++++----------
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 4 +-
.../scripts/configure_systemvm_services.sh | 4 ++
8 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/systemvm/debian/etc/systemd/system/cloud-early-config.service b/systemvm/debian/etc/systemd/system/cloud-early-config.service
index 50f0f2b..a7e2f59 100644
--- a/systemvm/debian/etc/systemd/system/cloud-early-config.service
+++ b/systemvm/debian/etc/systemd/system/cloud-early-config.service
@@ -2,10 +2,9 @@
Description=CloudStack post-boot patching service using cmdline
DefaultDependencies=no
-Before=network-pre.target
-Wants=network-pre.target
+Before=sshd.service
-Requires=local-fs.target
+Requires=local-fs.target network-pre.target
After=local-fs.target
[Install]
diff --git a/systemvm/debian/etc/systemd/system/cloud-postinit.service b/systemvm/debian/etc/systemd/system/cloud-postinit.service
deleted file mode 100644
index 1671757..0000000
--- a/systemvm/debian/etc/systemd/system/cloud-postinit.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=CloudStack post-patching init script
-After=cloud-early-config.service network.target local-fs.target
-Before=ssh.service
-
-[Install]
-WantedBy=multi-user.target
-
-[Service]
-Type=oneshot
-ExecStart=/opt/cloud/bin/setup/postinit.sh
-RemainAfterExit=no
-TimeoutStartSec=10min
diff --git a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
index f1162b5..c54ed36 100755
--- a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
+++ b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
@@ -23,7 +23,8 @@ CMDLINE=/var/cache/cloud/cmdline
# Clear boot up flag, it would be created by rc.local after boot up done
mkdir -p /var/cache/cloud
-rm -f /var/cache/cloud/boot_up_done
+rm -f /var/cache/cloud/enabled_svcs
+rm -f /var/cache/cloud/disabled_svcs
[ -x /sbin/ifup ] || exit 0
@@ -240,6 +241,15 @@ HYPERVISOR=$(</etc/cloudstack-agent_detected_hypervisor)
esac
}
+add_cache_backpressure() {
+ # set cache back pressure based on amount of physical memory 100 is default
+ physmem=$(free|awk '/^Mem:/{print $2}')
+ if [ $((physmem)) -lt 409600 ]; then
+ sed -i "/^vm.vfs_cache_pressure/ c\vm.vfs_cache_pressure = 200" /etc/sysctl.conf
+ else
+ sed -i "/^vm.vfs_cache_pressure/ c\vm.vfs_cache_pressure = 100" /etc/sysctl.conf
+ fi
+}
start() {
log_it "Executing cloud-early-config"
@@ -259,6 +269,7 @@ start() {
get_systemvm_type
patch
sync
+ add_cache_backpressure
sysctl -p
log_it "Starting Virtual Guest Services for $HYPERVISOR"
@@ -272,6 +283,10 @@ start() {
else
/opt/cloud/bin/setup/default.sh
fi
+
+ log_it "Running postinit to start services"
+
+ /opt/cloud/bin/setup/postinit.sh
log_it "Finished setting up systemvm"
diff --git a/systemvm/debian/opt/cloud/bin/setup/common.sh b/systemvm/debian/opt/cloud/bin/setup/common.sh
index 110800a..6784d15 100755
--- a/systemvm/debian/opt/cloud/bin/setup/common.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/common.sh
@@ -583,14 +583,14 @@ setup_ntp() {
}
routing_svcs() {
- echo "haproxy apache2" > /var/cache/cloud/enabled_svcs
+ echo "cloud haproxy apache2" > /var/cache/cloud/enabled_svcs
echo "nfs-common portmap" > /var/cache/cloud/disabled_svcs
if [ "$RROUTER" -eq "1" ]
then
- echo "keepalived conntrackd" >> /var/cache/cloud/enabled_svcs
+ echo "cloud keepalived conntrackd" >> /var/cache/cloud/enabled_svcs
echo "dnsmasq" >> /var/cache/cloud/disabled_svcs
else
- echo "dnsmasq" >> /var/cache/cloud/enabled_svcs
+ echo "cloud dnsmasq" >> /var/cache/cloud/enabled_svcs
echo "keepalived conntrackd " >> /var/cache/cloud/disabled_svcs
fi
}
diff --git a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
index c20fed2..7260fcb 100755
--- a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
@@ -18,11 +18,6 @@
. /opt/cloud/bin/setup/common.sh
-consoleproxy_svcs() {
- echo "haproxy dnsmasq apache2 nfs-common portmap" > /var/cache/cloud/disabled_svcs
- mkdir -p /var/log/cloud
-}
-
setup_console_proxy() {
log_it "Setting up console proxy system vm"
setup_common eth0 eth1 eth2
@@ -44,16 +39,13 @@ setup_console_proxy() {
setup_sshd $ETH0_IP "eth0"
fi
+ mkdir -p /var/log/cloud
disable_rpfilter
enable_fwding 0
enable_irqbalance 0
rm -f /etc/logrotate.d/cloud
+ echo "cloud" > /var/cache/cloud/enabled_svcs
+
}
-consoleproxy_svcs
-if [ $? -gt 0 ]
-then
- log_it "Failed to execute consoleproxy_svcs"
- exit 1
-fi
setup_console_proxy
diff --git a/systemvm/debian/opt/cloud/bin/setup/postinit.sh b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
index fdb2111..668199b 100755
--- a/systemvm/debian/opt/cloud/bin/setup/postinit.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
@@ -21,15 +21,6 @@
# Eject cdrom if any
eject || true
-# set cache back pressure based on amount of physical memory 100 is default
-physmem=$(free|awk '/^Mem:/{print $2}')
-if [ $((physmem)) -lt 409600 ]; then
- sed -i "/^vm.vfs_cache_pressure/ c\vm.vfs_cache_pressure = 200" /etc/sysctl.conf
-else
- sed -i "/^vm.vfs_cache_pressure/ c\vm.vfs_cache_pressure = 100" /etc/sysctl.conf
-fi
-sysctl -p
-
# Restart journald for setting changes to apply
systemctl restart systemd-journald
@@ -45,15 +36,19 @@ fi
[ ! -f /var/cache/cloud/enabled_svcs ] && touch /var/cache/cloud/enabled_svcs
for svc in $(cat /var/cache/cloud/enabled_svcs)
-do
- systemctl enable --now --no-block $svc
-done
+if [[ "$svc" != "cloud" ]]
+then
+ do
+ systemctl start --no-block $svc
+ done
+fi
-[ ! -f /var/cache/cloud/disabled_svcs ] && touch /var/cache/cloud/disabled_svcs
-for svc in $(cat /var/cache/cloud/disabled_svcs)
-do
- systemctl disable --now --no-block $svc
-done
+#not required - all services disabled by default
+#[ ! -f /var/cache/cloud/disabled_svcs ] && touch /var/cache/cloud/disabled_svcs
+#for svc in $(cat /var/cache/cloud/disabled_svcs)
+#do
+# systemctl disable --now --no-block $svc
+#done
# Restore the persistent iptables nat, rules and filters for IPv4 and IPv6 if they exist
ipv4="/etc/iptables/rules.v4"
@@ -68,9 +63,17 @@ then
ip6tables-restore < $ipv6
fi
-# Enable SSH
-systemctl enable --now --no-block ssh
+# Start SSH
+systemctl start ssh
date > /var/cache/cloud/boot_up_done
-systemctl start cloud
+# explicitly start cloud service
+
+for svc in $(cat /var/cache/cloud/enabled_svcs)
+if [[ "$svc" == "cloud" ]]
+then
+ do
+ systemctl start --no-block $svc
+ done
+fi
diff --git a/systemvm/debian/opt/cloud/bin/setup/secstorage.sh b/systemvm/debian/opt/cloud/bin/setup/secstorage.sh
index 8d5440a..b363661 100755
--- a/systemvm/debian/opt/cloud/bin/setup/secstorage.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/secstorage.sh
@@ -19,14 +19,14 @@
. /opt/cloud/bin/setup/common.sh
secstorage_svcs() {
- echo "apache2 nfs-common portmap" > /var/cache/cloud/enabled_svcs
+ echo "cloud apache2 nfs-common portmap" > /var/cache/cloud/enabled_svcs
echo "conntrackd keepalived haproxy dnsmasq" > /var/cache/cloud/disabled_svcs
mkdir -p /var/log/cloud
}
setup_secstorage() {
log_it "Setting up secondary storage system vm"
- sysctl vm.min_free_kbytes=8192
+ #sysctl vm.min_free_kbytes=8192
setup_common eth0 eth1 eth2
setup_storage_network
diff --git a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
index cd4812e..8432bb1 100644
--- a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
+++ b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
@@ -109,6 +109,10 @@ function configure_services() {
systemctl disable x11-common
systemctl disable xl2tpd
systemctl disable vgauth
+ systemctl disable sshd
+ systemctl disable nfs-common
+ systemctl disable portmap
+
# Disable guest services which will selectively be started based on hypervisor
systemctl disable open-vm-tools
[cloudstack] 07/09: get nesting right
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 7a8d6bf8a71bc9c746e21b6ef5f8a98317220819
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Sun Dec 23 09:28:13 2018 +0000
get nesting right
---
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/systemvm/debian/opt/cloud/bin/setup/postinit.sh b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
index 668199b..4eb2177 100755
--- a/systemvm/debian/opt/cloud/bin/setup/postinit.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
@@ -36,12 +36,13 @@ fi
[ ! -f /var/cache/cloud/enabled_svcs ] && touch /var/cache/cloud/enabled_svcs
for svc in $(cat /var/cache/cloud/enabled_svcs)
-if [[ "$svc" != "cloud" ]]
-then
do
- systemctl start --no-block $svc
- done
-fi
+ if [[ "$svc" != "cloud" ]]
+ then
+ systemctl start --no-block $svc
+ fi
+done
+
#not required - all services disabled by default
#[ ! -f /var/cache/cloud/disabled_svcs ] && touch /var/cache/cloud/disabled_svcs
@@ -71,9 +72,9 @@ date > /var/cache/cloud/boot_up_done
# explicitly start cloud service
for svc in $(cat /var/cache/cloud/enabled_svcs)
-if [[ "$svc" == "cloud" ]]
-then
- do
+do
+ if [[ "$svc" == "cloud" ]]
+ then
systemctl start --no-block $svc
- done
-fi
+ fi
+done
[cloudstack] 01/09: even more granular - this is going to need some
major squaching
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit acd7d8913a627696c7af350640f596dc996f4228
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Tue Dec 18 09:44:09 2018 +0000
even more granular - this is going to need some major squaching
---
.../appliance/systemvmtemplate/scripts/configure_systemvm_services.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
index fd1b525..cd4812e 100644
--- a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
+++ b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
@@ -113,7 +113,9 @@ function configure_services() {
# Disable guest services which will selectively be started based on hypervisor
systemctl disable open-vm-tools
systemctl disable xe-daemon
- systemctl disable hyperv-daemons.hv-fcopy-daemon.service hyperv-daemons.hv-kvp-daemon.service hyperv-daemons.hv-vss-daemon.service
+ systemctl disable hyperv-daemons.hv-fcopy-daemon.service
+ systemctl disable hyperv-daemons.hv-kvp-daemon.service
+ systemctl disable hyperv-daemons.hv-vss-daemon.service
systemctl disable qemu-guest-agent
configure_apache2
[cloudstack] 09/09: remove dumb snapshot
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 078a4c2deea801d6958696b23b54f8e0fc266075
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Wed Jan 9 15:34:16 2019 +0000
remove dumb snapshot
---
.../hypervisor/vmware/manager/VmwareStorageManagerImpl.java | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index b6f207a..3a264fd 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -598,16 +598,6 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
s_logger.error(msg);
throw new Exception(msg);
}
-
- if (vmMo.createSnapshot("cloud.template.base", "Base snapshot", false, false)) {
- vmMo.setCustomFieldValue(CustomFieldConstants.CLOUD_UUID, templateUuid);
- vmMo.markAsTemplate();
- } else {
- vmMo.destroy();
- String msg = "Unable to create base snapshot for template, templateName: " + templateName + ", templateUuid: " + templateUuid;
- s_logger.error(msg);
- throw new Exception(msg);
- }
}
private Ternary<String, Long, Long> createTemplateFromVolume(VirtualMachineMO vmMo, long accountId, long templateId, String templateUniqueName, String secStorageUrl,
[cloudstack] 06/09: call post init as a script not service
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch remove_dump_snapshot
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit c02af011b82c99f7645a84490b9da6732b477910
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Sun Dec 23 08:03:07 2018 +0000
call post init as a script not service
---
tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
index 8432bb1..fde769b 100644
--- a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
+++ b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
@@ -52,7 +52,6 @@ function install_cloud_scripts() {
systemctl daemon-reload
systemctl enable cloud-early-config
- systemctl enable cloud-postinit
}
function do_signature() {