This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push:
new c8dcc64 CLOUDSTACK-10341: VR minor fixes to systemvmtemplate (#2468)
c8dcc64 is described below
commit c8dcc64b6534f3e035ebc8597c38591e40009ea5
Author: René Moser <m...@renemoser.net>
AuthorDate: Fri Mar 23 07:22:29 2018 +0100
CLOUDSTACK-10341: VR minor fixes to systemvmtemplate (#2468)
- Fixes rsyslog: fix config error in rsylslog.conf
Feb 26 08:09:54 r-413-VM liblogging-stdlog[19754]: action '*' treated as
':omusrmsg:*' - please use ':omusrmsg:*' syntax instead, '*' will not be
supported in the future [v8.24.0 try http://www.rsyslog.com/e/2184 ]
Feb 26 08:09:54 r-413-VM liblogging-stdlog[19754]: error during parsing
file /etc/rsyslog.conf, on or before line 95: warnings occured in file
'/etc/rsyslog.conf' around line 95 [v8.24.0 try http://www.rsyslog.com/e/2207 ]
- Run apache2 only after cloud-postinit
- Increase /run size for VR with 256M RAM
root@r-395-VM:~# systemctl daemon-reload
Failed to reload daemon: Refusing to reload, not enough space available on
/run/systemd. Currently, 15.8M are free, but a safety buffer of 16.0M is
enforced.
tmpfs 23M 6.5M 16M 29% /run
---
systemvm/debian/etc/rsyslog.conf | 2 +-
systemvm/debian/etc/systemd/system/cloud-postinit.service | 2 +-
tools/appliance/systemvmtemplate/scripts/finalize.sh | 7 +++++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/systemvm/debian/etc/rsyslog.conf b/systemvm/debian/etc/rsyslog.conf
index 8dc7c75..c7de03d 100644
--- a/systemvm/debian/etc/rsyslog.conf
+++ b/systemvm/debian/etc/rsyslog.conf
@@ -92,7 +92,7 @@ news.notice -/var/log/news/news.notice
#
# Emergencies are sent to everybody logged in.
#
-*.emerg *
+*.emerg :omusrmsg:*
#
# I like to have messages displayed on the console, but only on a virtual
diff --git a/systemvm/debian/etc/systemd/system/cloud-postinit.service
b/systemvm/debian/etc/systemd/system/cloud-postinit.service
index c23516e..19ddfcc 100644
--- a/systemvm/debian/etc/systemd/system/cloud-postinit.service
+++ b/systemvm/debian/etc/systemd/system/cloud-postinit.service
@@ -1,7 +1,7 @@
[Unit]
Description=CloudStack post-patching init script
After=cloud-early-config.service network.target local-fs.target
-Before=ssh.service
+Before=ssh.service apache2.service
Requires=network.service
[Install]
diff --git a/tools/appliance/systemvmtemplate/scripts/finalize.sh
b/tools/appliance/systemvmtemplate/scripts/finalize.sh
index 260bddf..e5d15ec 100644
--- a/tools/appliance/systemvmtemplate/scripts/finalize.sh
+++ b/tools/appliance/systemvmtemplate/scripts/finalize.sh
@@ -24,6 +24,12 @@ function configure_misc() {
echo "cloud:`openssl rand -base64 32`" | chpasswd
}
+function configure_rundisk_size() {
+ # Debian's default is 10% of total RAM. This is too low when total is 256M.
+ # See https://manpages.debian.org/stretch/initscripts/tmpfs.5.en.html
+ echo "tmpfs /run tmpfs nodev,nosuid,size=20%,mode=755 0 0" >> /etc/fstab
+}
+
function configure_sudoers() {
cat >/etc/sudoers <<END
Defaults env_reset
@@ -63,6 +69,7 @@ function zero_disk() {
function finalize() {
configure_misc
+ configure_rundisk_size
configure_sudoers
cleanup_final
sync
--
To stop receiving notification emails like this one, please contact
ro...@apache.org.
