mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
85aee8d18d
- Refactors and simplifies systemvm codebase file structures keeping the same resultant systemvm.iso packaging - Password server systemd script and new postinit script that runs before sshd starts - Fixes to keepalived and conntrackd config to make rVRs work again - New /etc/issue featuring ascii based cloudmonkey logo/message and systemvmtemplate version - SystemVM python codebase linted and tested. Added pylint/pep to Travis. - iptables re-application fixes for non-VR systemvms. - SystemVM template build fixes. - Default secondary storage vm service offering boosted to have 2vCPUs and RAM equal to console proxy. - Fixes to several marvin based smoke tests, especially rVR related tests. rVR tests to consider 3*advert_int+skew timeout before status is checked. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
44 lines
1.6 KiB
Python
Executable File
44 lines
1.6 KiB
Python
Executable File
# 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 logging
|
|
from cs.CsDatabag import CsDataBag
|
|
from CsFile import CsFile
|
|
|
|
MON_CONFIG = "/etc/monitor.conf"
|
|
|
|
|
|
class CsMonitor(CsDataBag):
|
|
""" Manage dhcp entries """
|
|
|
|
def process(self):
|
|
if "config" not in self.dbag:
|
|
return
|
|
procs = [x.strip() for x in self.dbag['config'].split(',')]
|
|
file = CsFile(MON_CONFIG)
|
|
for proc in procs:
|
|
bits = [x for x in proc.split(':')]
|
|
if len(bits) < 5:
|
|
continue
|
|
for i in range(0, 4):
|
|
file.add(bits[i], -1)
|
|
file.commit()
|
|
cron = CsFile("/etc/cron.d/process")
|
|
cron.add("SHELL=/bin/bash", 0)
|
|
cron.add("PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin", 1)
|
|
cron.add("*/3 * * * * root /usr/bin/python /root/monitorServices.py", -1)
|
|
cron.commit()
|