This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new f176837 packaging: Adding SUSE 15 support (#5110)
f176837 is described below
commit f17683779c7cb37ba5a52bf154e14680c6b60f93
Author: davidjumani <[email protected]>
AuthorDate: Thu Aug 19 13:28:54 2021 +0530
packaging: Adding SUSE 15 support (#5110)
This PR adds support for SUSE Leap 15.2+ as a KVM hypervisor and Management
/ Usage server on Cloudstack
Related docs link apache/cloudstack-documentation#224
Co-authored-by: Michael <[email protected]>
---
packaging/suse15/cloud-ipallocator.rc | 96 +++++
packaging/suse15/cloud.limits | 19 +
packaging/suse15/cloud.spec | 644 ++++++++++++++++++++++++++++++++
packaging/suse15/cloudstack-agent.te | 33 ++
packaging/suse15/cloudstack-sccs | 20 +
packaging/suse15/replace.properties | 59 +++
python/lib/cloud_utils.py | 657 ++++-----------------------------
python/lib/cloudutils/serviceConfig.py | 131 ++++++-
python/lib/cloudutils/syscfg.py | 19 +-
python/lib/cloudutils/utilities.py | 10 +
scripts/vm/hypervisor/versions.sh | 16 +-
scripts/vm/network/security_group.py | 2 +
tools/marvin/marvin/marvinLog.py | 2 +-
tools/marvin/marvin/marvinPlugin.py | 2 +-
14 files changed, 1108 insertions(+), 602 deletions(-)
diff --git a/packaging/suse15/cloud-ipallocator.rc
b/packaging/suse15/cloud-ipallocator.rc
new file mode 100755
index 0000000..d3eadec
--- /dev/null
+++ b/packaging/suse15/cloud-ipallocator.rc
@@ -0,0 +1,96 @@
+#!/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.
+
+# chkconfig: 35 99 10
+# description: Cloud Agent
+
+# 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 $(readlink -f $0))"
+PIDFILE=/var/run/"$SHORTNAME".pid
+LOCKFILE=/var/lock/subsys/"$SHORTNAME"
+LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log
+PROGNAME="External IPAllocator"
+
+unset OPTIONS
+[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
+DAEMONIZE=/usr/bin/cloud-daemonize
+PROG=/usr/bin/cloud-external-ipallocator.py
+OPTIONS=8083
+
+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/packaging/suse15/cloud.limits b/packaging/suse15/cloud.limits
new file mode 100644
index 0000000..7debeb2
--- /dev/null
+++ b/packaging/suse15/cloud.limits
@@ -0,0 +1,19 @@
+# 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.
+
+cloud hard nofile 4096
+cloud soft nofile 4096
diff --git a/packaging/suse15/cloud.spec b/packaging/suse15/cloud.spec
new file mode 100644
index 0000000..6ba8f9f
--- /dev/null
+++ b/packaging/suse15/cloud.spec
@@ -0,0 +1,644 @@
+# 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.
+
+%define __os_install_post %{nil}
+%global debug_package %{nil}
+
+# DISABLE the post-percentinstall java repacking and line number stripping
+# we need to find a way to just disable the java repacking and line number
stripping, but not the autodeps
+
+Name: cloudstack
+Summary: CloudStack IaaS Platform
+#http://fedoraproject.org/wiki/PackageNamingGuidelines#Pre-Release_packages
+%define _maventag %{_fullver}
+Release: %{_rel}%{dist}
+
+%define __python python3
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+
+Version: %{_ver}
+License: ASL 2.0
+Vendor: Apache CloudStack <[email protected]>
+Packager: Apache CloudStack <[email protected]>
+Group: System Environment/Libraries
+# FIXME do groups for every single one of the subpackages
+Source0: %{name}-%{_maventag}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
+
+BuildRequires: java-11-openjdk-devel
+#BuildRequires: ws-commons-util
+BuildRequires: jpackage-utils
+BuildRequires: gcc
+BuildRequires: glibc-devel
+BuildRequires: /usr/bin/mkisofs
+BuildRequires: maven => 3.0.0
+BuildRequires: python3-setuptools
+BuildRequires: wget
+BuildRequires: nodejs
+
+%description
+CloudStack is a highly-scalable elastic, open source,
+intelligent IaaS cloud implementation.
+
+%package management
+Summary: CloudStack management server UI
+Requires: java-11-openjdk
+Requires: python3
+Requires: bash
+Requires: gawk
+Requires: bzip2
+Requires: gzip
+Requires: unzip
+Requires: /sbin/mount.nfs
+Requires: openssh
+Requires: nfs-utils
+Requires: nfs-client
+Requires: iproute
+Requires: wget
+Requires: mysql
+Requires: sudo
+Requires: /sbin/service
+Requires: /sbin/chkconfig
+Requires: /usr/bin/ssh-keygen
+Requires: mkisofs
+Requires: ipmitool
+Requires: %{name}-common = %{_ver}
+Requires: qemu-tools
+Requires: python3-pip
+Requires: python3-setuptools
+Requires: libgcrypt20
+Group: System Environment/Libraries
+%description management
+The CloudStack management server is the central point of coordination,
+management, and intelligence in CloudStack.
+
+%package common
+Summary: Apache CloudStack common files and scripts
+Requires: python3
+Group: System Environment/Libraries
+%description common
+The Apache CloudStack files shared between agent and management server
+%global __requires_exclude ^(libuuid\\.so\\.1|/usr/bin/python)$
+
+%package agent
+Summary: CloudStack Agent for KVM hypervisors
+Requires: openssh
+Requires: java-11-openjdk
+Requires: %{name}-common = %{_ver}
+Requires: libvirt
+Requires: ebtables
+Requires: iptables
+Requires: selinux-tools
+Requires: ethtool
+Requires: net-tools
+Requires: net-tools-deprecated
+Requires: iproute
+Requires: ipset
+Requires: perl
+Requires: python3-libvirt-python
+Requires: qemu-kvm
+Requires: libgcrypt20
+Requires: qemu-tools
+Provides: cloud-agent
+Group: System Environment/Libraries
+%description agent
+The CloudStack agent for KVM hypervisors
+
+%package baremetal-agent
+Summary: CloudStack baremetal agent
+Requires: tftp-server
+Requires: xinetd
+Requires: syslinux
+Requires: chkconfig
+Requires: dhcp
+Requires: httpd
+Group: System Environment/Libraries
+%description baremetal-agent
+The CloudStack baremetal agent
+
+%package usage
+Summary: CloudStack Usage calculation server
+Requires: java-11-openjdk
+Group: System Environment/Libraries
+%description usage
+The CloudStack usage calculation service
+
+%package ui
+Summary: CloudStack UI
+Group: System Environment/Libraries
+%description ui
+The CloudStack UI
+
+%package cli
+Summary: Apache CloudStack CLI
+Provides: python-marvin
+Group: System Environment/Libraries
+%description cli
+Apache CloudStack command line interface
+
+%package marvin
+Summary: Apache CloudStack Marvin library
+Requires: python3-pip
+Requires: python2-pip
+Requires: gcc
+Requires: python3-devel
+Requires: python2-devel
+Requires: libffi-devel
+Requires: openssl-devel
+Group: System Environment/Libraries
+%description marvin
+Apache CloudStack Marvin library
+
+%package integration-tests
+Summary: Apache CloudStack Marvin integration tests
+Requires: %{name}-marvin = %{_ver}
+Group: System Environment/Libraries
+%description integration-tests
+Apache CloudStack Marvin integration tests
+
+%if "%{_ossnoss}" == "noredist"
+%package mysql-ha
+Summary: Apache CloudStack Balancing Strategy for MySQL
+Group: System Environmnet/Libraries
+%description mysql-ha
+Apache CloudStack Balancing Strategy for MySQL
+
+%endif
+
+%prep
+echo Doing CloudStack build
+
+%setup -q -n %{name}-%{_maventag}
+
+%build
+
+cp packaging/centos8/replace.properties build/replace.properties
+echo VERSION=%{_maventag} >> build/replace.properties
+echo PACKAGE=%{name} >> build/replace.properties
+touch build/gitrev.txt
+echo $(git rev-parse HEAD) > build/gitrev.txt
+
+if [ "%{_ossnoss}" == "NOREDIST" -o "%{_ossnoss}" == "noredist" ] ; then
+ echo "Adding noredist flag to the maven build"
+ FLAGS="$FLAGS -Dnoredist"
+fi
+
+if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then
+ echo "Adding simulator flag to the maven build"
+ FLAGS="$FLAGS -Dsimulator"
+fi
+
+mvn -Psystemvm,developer $FLAGS clean package
+cd ui && npm install && npm run build && cd ..
+
+%install
+[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
+# Common directories
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/ipallocator
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/mnt
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/management
+mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/default
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d
+
+# Common
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms
+mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/
+mkdir -p ${RPM_BUILD_ROOT}/usr/bin
+cp -r scripts/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
+install -D systemvm/dist/systemvm.iso
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.iso
+install python/lib/cloud_utils.py
${RPM_BUILD_ROOT}%{python_sitearch}/cloud_utils.py
+cp -r python/lib/cloudutils ${RPM_BUILD_ROOT}%{python_sitearch}/
+python3 -m py_compile ${RPM_BUILD_ROOT}%{python_sitearch}/cloud_utils.py
+python3 -m compileall ${RPM_BUILD_ROOT}%{python_sitearch}/cloudutils
+cp build/gitrev.txt ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
+cp packaging/centos8/cloudstack-sccs ${RPM_BUILD_ROOT}/usr/bin
+
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco
+cp -r plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/*
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco
+
+# Management
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/run
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel
+
+# Setup Jetty
+ln -sf /etc/%{name}/management
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/conf
+ln -sf /var/log/%{name}/management
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/logs
+
+install -D client/target/utilities/bin/cloud-migrate-databases
${RPM_BUILD_ROOT}%{_bindir}/%{name}-migrate-databases
+install -D client/target/utilities/bin/cloud-set-guest-password
${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-password
+install -D client/target/utilities/bin/cloud-set-guest-sshkey
${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-sshkey
+install -D client/target/utilities/bin/cloud-setup-databases
${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-databases
+install -D client/target/utilities/bin/cloud-setup-encryption
${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-encryption
+install -D client/target/utilities/bin/cloud-setup-management
${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-management
+install -D client/target/utilities/bin/cloud-setup-baremetal
${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-baremetal
+install -D client/target/utilities/bin/cloud-sysvmadm
${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm
+install -D client/target/utilities/bin/cloud-update-xenserver-licenses
${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
+
+cp -r client/target/utilities/scripts/db/*
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
+
+cp -r client/target/cloud-client-ui-%{_maventag}.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
+cp -r client/target/classes/META-INF/webapp
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp
+cp ui/dist/config.json ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/
+cp -r ui/dist/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp/
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp/config.json
+ln -sf /etc/%{name}/management/config.json
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp/config.json
+mv
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack-%{_maventag}.jar
+cp client/target/lib/*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
+
+# Don't package the scripts in the management webapp
+rm -rf
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
+rm -rf
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
+
+for name in db.properties server.properties log4j-cloud.xml
environment.properties java.security.ciphers
+do
+ cp client/target/conf/$name
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
+done
+
+ln -sf log4j-cloud.xml
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j.xml
+
+install python/bindir/cloud-external-ipallocator.py
${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
+install -D client/target/pythonlibs/jasypt-1.9.3.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.3.jar
+
+install -D packaging/centos8/cloud-ipallocator.rc
${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator
+install -D packaging/centos8/cloud.limits
${RPM_BUILD_ROOT}%{_sysconfdir}/security/limits.d/cloud
+install -D packaging/systemd/cloudstack-management.service
${RPM_BUILD_ROOT}%{_unitdir}/%{name}-management.service
+install -D packaging/systemd/cloudstack-management.default
${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-management
+install -D server/target/conf/cloudstack-sudoers
${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management
+touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}-management.pid
+#install -D server/target/conf/cloudstack-catalina.logrotate
${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina
+
+# UI
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
+cp ui/dist/config.json ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui/
+cp -r ui/dist/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/config.json
+ln -sf /etc/%{name}/ui/config.json
${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/config.json
+
+# Package mysql-connector-python
+wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel
https://files.pythonhosted.org/packages/ee/ff/48bde5c0f013094d729fe4b0316ba2a24774b3ff1c52d924a8a4cb04078a/six-1.15.0-py2.py3-none-any.whl
+wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel
https://files.pythonhosted.org/packages/e9/93/4860cebd5ad3ff2664ad3c966490ccb46e3b88458b2095145bca11727ca4/setuptools-47.3.1-py3-none-any.whl
+wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel
https://files.pythonhosted.org/packages/28/05/9867ef8eafd12265267bee138fa2c46ebf34a276ea4cbe184cba4c606e8b/protobuf-3.12.2-cp36-cp36m-manylinux1_x86_64.whl
+wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel
https://files.pythonhosted.org/packages/d1/53/4cf90d2fe81b9cdb55dc180951bcec44ea8685665f1bdb1412501dc362dd/mysql_connector_python-8.0.20-cp36-cp36m-manylinux1_x86_64.whl
+
+chmod 440 ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/mnt
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/management
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent
+
+# KVM Agent
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/plugins
+install -D packaging/systemd/cloudstack-agent.service
${RPM_BUILD_ROOT}%{_unitdir}/%{name}-agent.service
+install -D packaging/systemd/[email protected]
${RPM_BUILD_ROOT}%{_unitdir}/%{name}[email protected]
+install -D packaging/systemd/cloudstack-agent.default
${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-agent
+install -D agent/target/transformed/agent.properties
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/agent.properties
+install -D agent/target/transformed/environment.properties
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/environment.properties
+install -D agent/target/transformed/log4j-cloud.xml
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/log4j-cloud.xml
+install -D agent/target/transformed/cloud-setup-agent
${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-agent
+install -D agent/target/transformed/cloudstack-agent-upgrade
${RPM_BUILD_ROOT}%{_bindir}/%{name}-agent-upgrade
+install -D agent/target/transformed/cloud-guest-tool
${RPM_BUILD_ROOT}%{_bindir}/%{name}-guest-tool
+install -D agent/target/transformed/libvirtqemuhook
${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/libvirtqemuhook
+install -D agent/target/transformed/rolling-maintenance
${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/rolling-maintenance
+install -D agent/target/transformed/cloud-ssh
${RPM_BUILD_ROOT}%{_bindir}/%{name}-ssh
+install -D agent/target/transformed/cloudstack-agent-profile.sh
${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d/%{name}-agent-profile.sh
+install -D agent/target/transformed/cloudstack-agent.logrotate
${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-agent
+install -D
plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-%{_maventag}.jar
${RPM_BUILD_ROOT}%{_datadir}/%name-agent/lib/cloud-plugin-hypervisor-kvm-%{_maventag}.jar
+cp plugins/hypervisors/kvm/target/dependencies/*
${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib
+
+# Usage server
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib
+install -D usage/target/cloud-usage-%{_maventag}.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/cloud-usage-%{_maventag}.jar
+install -D usage/target/transformed/db.properties
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/db.properties
+install -D usage/target/transformed/log4j-cloud_usage.xml
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/log4j-cloud.xml
+cp usage/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/
+cp client/target/lib/mysql*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/
+install -D packaging/systemd/cloudstack-usage.service
${RPM_BUILD_ROOT}%{_unitdir}/%{name}-usage.service
+install -D packaging/systemd/cloudstack-usage.default
${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-usage
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/
+
+# CLI
+cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{python_sitearch}/
+install cloud-cli/cloudapis/cloud.py
${RPM_BUILD_ROOT}%{python_sitearch}/cloudapis.py
+
+# Marvin
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
+cp tools/marvin/dist/Marvin-*.tar.gz
${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
+
+# integration-tests
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
+cp -r test/integration/*
${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests/
+
+# MYSQL HA
+if [ "x%{_ossnoss}" == "xnoredist" ] ; then
+ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
+ cp -r
plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
+fi
+
+#License files from whisker
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-common-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-common-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-ui-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-ui-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE
+
+%clean
+[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
+
+%preun management
+/usr/bin/systemctl stop cloudstack-management || true
+/usr/bin/systemctl off cloudstack-management || true
+
+%pre management
+id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack
unprivileged user" \
+ -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud || true
+
+rm -rf %{_localstatedir}/cache/cloudstack
+
+# in case of upgrade to 4.9+ copy commands.properties if not exists in
/etc/cloudstack/management/
+if [ "$1" == "2" ] ; then
+ if [ -f
"%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/commands.properties"
] && [ ! -f "%{_sysconfdir}/%{name}/management/commands.properties" ] ; then
+ cp -p
%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/commands.properties
%{_sysconfdir}/%{name}/management/commands.properties
+ fi
+fi
+
+# Remove old tomcat symlinks and env config file
+if [ -L "%{_datadir}/%{name}-management/lib" ]
+then
+ rm -f %{_datadir}/%{name}-management/bin
+ rm -f %{_datadir}/%{name}-management/lib
+ rm -f %{_datadir}/%{name}-management/temp
+ rm -f %{_datadir}/%{name}-management/work
+ rm -f %{_sysconfdir}/default/%{name}-management
+fi
+
+%post management
+# Install mysql-connector-python
+pip3 install
%{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/setuptools-47.3.1-py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/protobuf-3.12.2-cp36-cp36m-manylinux1_x86_64.whl
%{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.20-cp36-cp36m-manylinux1_x86_64.whl
+
+/usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
+
+grep -s -q "db.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
+grep -s -q "db.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
+grep -s -q "db.simulator.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.simulator.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
+
+if [ ! -f
%{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
+ echo Please download vhd-util from
http://download.cloudstack.org/tools/vhd-util and put it in
+ echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
+fi
+
+if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
+ rm -f %{_sysconfdir}/sysconfig/%{name}-management
+fi
+
+chown -R cloud:cloud /var/log/cloudstack/management
+
+systemctl daemon-reload
+
+%preun agent
+/sbin/service cloudstack-agent stop || true
+if [ "$1" == "0" ] ; then
+ /sbin/chkconfig --del cloudstack-agent > /dev/null 2>&1 || true
+fi
+
+%pre agent
+
+# save old configs if they exist (for upgrade). Otherwise we may lose them
+# when the old packages are erased. There are a lot of properties files here.
+if [ -d "%{_sysconfdir}/cloud" ] ; then
+ mv %{_sysconfdir}/cloud %{_sysconfdir}/cloud.rpmsave
+fi
+
+%post agent
+if [ "$1" == "2" ] ; then
+ echo "Running %{_bindir}/%{name}-agent-upgrade to update bridge name for
upgrade from CloudStack 4.0.x (and before) to CloudStack 4.1 (and later)"
+ %{_bindir}/%{name}-agent-upgrade
+fi
+if [ ! -d %{_sysconfdir}/libvirt/hooks ] ; then
+ mkdir %{_sysconfdir}/libvirt/hooks
+fi
+cp -a ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/libvirtqemuhook
%{_sysconfdir}/libvirt/hooks/qemu
+mkdir -m 0755 -p /usr/share/cloudstack-agent/tmp
+/sbin/service libvirtd restart
+/sbin/systemctl enable cloudstack-agent > /dev/null 2>&1 || true
+/sbin/systemctl enable cloudstack-rolling-maintenance@p > /dev/null 2>&1 ||
true
+
+# if saved configs from upgrade exist, copy them over
+if [ -f "%{_sysconfdir}/cloud.rpmsave/agent/agent.properties" ]; then
+ mv %{_sysconfdir}/%{name}/agent/agent.properties
%{_sysconfdir}/%{name}/agent/agent.properties.rpmnew
+ cp -p %{_sysconfdir}/cloud.rpmsave/agent/agent.properties
%{_sysconfdir}/%{name}/agent
+ # make sure we only do this on the first install of this RPM, don't want
to overwrite on a reinstall
+ mv %{_sysconfdir}/cloud.rpmsave/agent/agent.properties
%{_sysconfdir}/cloud.rpmsave/agent/agent.properties.rpmsave
+fi
+
+systemctl daemon-reload
+
+%pre usage
+id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack
unprivileged user" \
+ -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
+
+%preun usage
+/sbin/service cloudstack-usage stop || true
+if [ "$1" == "0" ] ; then
+ /sbin/chkconfig --del cloudstack-usage > /dev/null 2>&1 || true
+fi
+
+%post usage
+if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then
+ echo "Replacing usage server's db.properties with a link to the management
server's db.properties"
+ rm -f %{_sysconfdir}/%{name}/usage/db.properties
+ ln -s %{_sysconfdir}/%{name}/management/db.properties
%{_sysconfdir}/%{name}/usage/db.properties
+ /usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true
+fi
+
+if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
+ echo "Replacing usage server's key with a link to the management server's
key"
+ rm -f %{_sysconfdir}/%{name}/usage/key
+ ln -s %{_sysconfdir}/%{name}/management/key
%{_sysconfdir}/%{name}/usage/key
+fi
+
+if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
+ ln -s %{_sysconfdir}/%{name}/management/key
%{_sysconfdir}/%{name}/usage/key
+fi
+
+%post marvin
+pip install --upgrade
https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl
+pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+
+#No default permission as the permission setup is complex
+%files management
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}-management
+%dir %attr(0770,root,cloud) %{_localstatedir}/%{name}/mnt
+%dir %attr(0770,cloud,cloud) %{_localstatedir}/%{name}/management
+%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management
+%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
+%config(noreplace) %{_sysconfdir}/default/%{name}-management
+%config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management
+%config(noreplace) %{_sysconfdir}/security/limits.d/cloud
+%config(noreplace) %attr(0640,root,cloud)
%{_sysconfdir}/%{name}/management/db.properties
+%config(noreplace) %attr(0640,root,cloud)
%{_sysconfdir}/%{name}/management/server.properties
+%config(noreplace) %attr(0640,root,cloud)
%{_sysconfdir}/%{name}/management/config.json
+%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
+%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
+%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
+%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
+%attr(0644,root,root) %{_unitdir}/%{name}-management.service
+%attr(0755,cloud,cloud) %{_localstatedir}/run/%{name}-management.pid
+%attr(0755,root,root) %{_bindir}/%{name}-setup-management
+%attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
+%{_datadir}/%{name}-management/conf
+%{_datadir}/%{name}-management/lib/*.jar
+%{_datadir}/%{name}-management/logs
+%attr(0755,root,root) %{_bindir}/%{name}-setup-databases
+%attr(0755,root,root) %{_bindir}/%{name}-migrate-databases
+%attr(0755,root,root) %{_bindir}/%{name}-set-guest-password
+%attr(0755,root,root) %{_bindir}/%{name}-set-guest-sshkey
+%attr(0755,root,root) %{_bindir}/%{name}-sysvmadm
+%attr(0755,root,root) %{_bindir}/%{name}-setup-encryption
+%{_datadir}/%{name}-management/setup/*.sql
+%{_datadir}/%{name}-management/setup/*.sh
+%{_datadir}/%{name}-management/setup/server-setup.xml
+%{_datadir}/%{name}-management/webapp/*
+%attr(0755,root,root) %{_bindir}/%{name}-external-ipallocator.py
+%attr(0755,root,root) %{_initrddir}/%{name}-ipallocator
+%dir %attr(0770,root,root) %{_localstatedir}/log/%{name}/ipallocator
+%{_defaultdocdir}/%{name}-management-%{version}/LICENSE
+%{_defaultdocdir}/%{name}-management-%{version}/NOTICE
+#%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-catalina
+%{_datadir}/%{name}-management/setup/wheel/*.whl
+
+%files agent
+%attr(0755,root,root) %{_bindir}/%{name}-setup-agent
+%attr(0755,root,root) %{_bindir}/%{name}-agent-upgrade
+%attr(0755,root,root) %{_bindir}/%{name}-guest-tool
+%attr(0755,root,root) %{_bindir}/%{name}-ssh
+%attr(0644,root,root) %{_unitdir}/%{name}-agent.service
+%attr(0644,root,root) %{_unitdir}/%{name}[email protected]
+%config(noreplace) %{_sysconfdir}/default/%{name}-agent
+%attr(0644,root,root) %{_sysconfdir}/profile.d/%{name}-agent-profile.sh
+%config(noreplace) %attr(0644,root,root)
%{_sysconfdir}/logrotate.d/%{name}-agent
+%attr(0755,root,root) %{_datadir}/%{name}-common/scripts/network/cisco
+%config(noreplace) %{_sysconfdir}/%{name}/agent
+%dir %{_localstatedir}/log/%{name}/agent
+%attr(0644,root,root) %{_datadir}/%{name}-agent/lib/*.jar
+%attr(0755,root,root) %{_datadir}/%{name}-agent/lib/libvirtqemuhook
+%attr(0755,root,root) %{_datadir}/%{name}-agent/lib/rolling-maintenance
+%dir %{_datadir}/%{name}-agent/plugins
+%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE
+%{_defaultdocdir}/%{name}-agent-%{version}/NOTICE
+
+%files common
+%dir %attr(0755,root,root) %{python_sitearch}/cloudutils
+%dir %attr(0755,root,root) %{_datadir}/%{name}-common/vms
+%attr(0755,root,root) %{_datadir}/%{name}-common/scripts
+%attr(0755,root,root) /usr/bin/cloudstack-sccs
+%attr(0644, root, root) %{_datadir}/%{name}-common/vms/systemvm.iso
+%attr(0644,root,root) %{python_sitearch}/cloud_utils.py
+%attr(0644,root,root) %{python_sitearch}/__pycache__/*
+%attr(0644,root,root) %{python_sitearch}/cloudutils/*
+%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.3.jar
+%{_defaultdocdir}/%{name}-common-%{version}/LICENSE
+%{_defaultdocdir}/%{name}-common-%{version}/NOTICE
+
+%files ui
+%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/ui/config.json
+%attr(0644,root,root) %{_datadir}/%{name}-ui/*
+%{_defaultdocdir}/%{name}-ui-%{version}/LICENSE
+%{_defaultdocdir}/%{name}-ui-%{version}/NOTICE
+
+%files usage
+%attr(0644,root,root) %{_unitdir}/%{name}-usage.service
+%config(noreplace) %{_sysconfdir}/default/%{name}-usage
+%attr(0644,root,root) %{_datadir}/%{name}-usage/*.jar
+%attr(0644,root,root) %{_datadir}/%{name}-usage/lib/*.jar
+%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/usage
+%attr(0644,root,root) %{_sysconfdir}/%{name}/usage/db.properties
+%attr(0644,root,root) %{_sysconfdir}/%{name}/usage/log4j-cloud.xml
+%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
+%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
+
+%files cli
+%attr(0644,root,root) %{python_sitearch}/cloudapis.py
+%attr(0644,root,root) %{python_sitearch}/cloudtool/__init__.py
+%attr(0644,root,root) %{python_sitearch}/cloudtool/utils.py
+%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
+%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
+
+%files marvin
+%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
+%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
+%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
+
+%files integration-tests
+%attr(0755,root,root) %{_datadir}/%{name}-integration-tests/*
+%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE
+%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE
+
+%if "%{_ossnoss}" == "noredist"
+%files mysql-ha
+%defattr(0644,cloud,cloud,0755)
+%attr(0644,root,root) %{_datadir}/%{name}-management/lib/*mysqlha*jar
+%endif
+
+%files baremetal-agent
+%attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal
+
+%changelog
+* Tue Jun 29 2021 David Jumani <[email protected]> 4.16.0
+- Adding SUSE 15 support
+
+* Thu Apr 30 2015 Rohit Yadav <[email protected]> 4.6.0
+- Remove awsapi package
+
+* Wed Nov 19 2014 Hugo Trippaers <[email protected]> 4.6.0
+- Create a specific spec for CentOS 7
+
+* Fri Jul 4 2014 Hugo Trippaers <[email protected]> 4.5.0
+- Add a package for the mysql ha module
+
+* Fri Oct 5 2012 Hugo Trippaers <[email protected]> 4.1.0
+- new style spec file
diff --git a/packaging/suse15/cloudstack-agent.te
b/packaging/suse15/cloudstack-agent.te
new file mode 100644
index 0000000..4259e17
--- /dev/null
+++ b/packaging/suse15/cloudstack-agent.te
@@ -0,0 +1,33 @@
+# 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.
+
+module cloudstack-agent 1.0;
+
+require {
+ type nfs_t;
+ type system_conf_t;
+ type mount_t;
+ type qemu_t;
+ class file unlink;
+ class filesystem getattr;
+}
+
+#============= mount_t ==============
+allow mount_t system_conf_t:file unlink;
+
+#============= qemu_t ==============
+allow qemu_t nfs_t:filesystem getattr;
diff --git a/packaging/suse15/cloudstack-sccs b/packaging/suse15/cloudstack-sccs
new file mode 100644
index 0000000..e05d372
--- /dev/null
+++ b/packaging/suse15/cloudstack-sccs
@@ -0,0 +1,20 @@
+#!/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.
+
+cat /usr/share/cloudstack-common/scripts/gitrev.txt
diff --git a/packaging/suse15/replace.properties
b/packaging/suse15/replace.properties
new file mode 100644
index 0000000..8c3560d
--- /dev/null
+++ b/packaging/suse15/replace.properties
@@ -0,0 +1,59 @@
+# 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.
+
+DBUSER=cloud
+DBPW=cloud
+DBROOTPW=
+MSLOG=vmops.log
+APISERVERLOG=api.log
+DBHOST=localhost
+DBDRIVER=jdbc:mysql
+COMPONENTS-SPEC=components-premium.xml
+REMOTEHOST=localhost
+AGENTCLASSPATH=
+AGENTLOG=/var/log/cloudstack/agent/agent.log
+AGENTLOGDIR=/var/log/cloudstack/agent/
+AGENTSYSCONFDIR=/etc/cloudstack/agent
+APISERVERLOG=/var/log/cloudstack/management/apilog.log
+BINDIR=/usr/bin
+COMMONLIBDIR=/usr/share/cloudstack-common
+CONFIGUREVARS=
+DEPSCLASSPATH=
+DOCDIR=
+IPALOCATORLOG=/var/log/cloudstack/management/ipallocator.log
+JAVADIR=/usr/share/java
+LIBEXECDIR=/usr/libexec
+LOCKDIR=/var/lock
+MSCLASSPATH=
+MSCONF=/etc/cloudstack/management
+MSENVIRON=/usr/share/cloudstack-management
+MSLOG=/var/log/cloudstack/management/management-server.log
+MSLOGDIR=/var/log/cloudstack/management/
+MSMNTDIR=/var/cloudstack/mnt
+MSUSER=cloud
+PIDDIR=/var/run
+PLUGINJAVADIR=/usr/share/cloudstack-management/plugin
+PREMIUMJAVADIR=/usr/share/cloudstack-management/premium
+PYTHONDIR=/usr/lib/python3.6/site-packages/
+SERVERSYSCONFDIR=/etc/sysconfig
+SETUPDATADIR=/usr/share/cloudstack-management/setup
+SYSCONFDIR=/etc/sysconfig
+SYSTEMCLASSPATH=
+SYSTEMJARS=
+USAGECLASSPATH=
+USAGELOG=/var/log/cloudstack/usage/usage.log
+USAGESYSCONFDIR=/etc/sysconfig
diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py
index ecef6f4..6f65751 100644
--- a/python/lib/cloud_utils.py
+++ b/python/lib/cloud_utils.py
@@ -6,9 +6,9 @@
# 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
@@ -18,7 +18,7 @@
-
+
# -*- coding: utf-8 -*-
"""CloudStack Python utility library"""
@@ -56,6 +56,7 @@ Fedora = 1
CentOS = 2
Ubuntu = 3
RHEL6 = 4
+SUSE = 5
IPV4 = 4
IPV6 = 6
@@ -73,12 +74,15 @@ elif os.path.exists("/etc/redhat-release"):
else:
distro = CentOS
elif os.path.exists("/etc/legal") and "Ubuntu" in open("/etc/legal").read(-1):
distro = Ubuntu
+elif os.path.exists("/etc/os-release") and "SUSE" in
open("/etc/os-release").read(-1): distro = SUSE
else: distro = Unknown
logFileName=None
+
# ================== LIBRARY UTILITY CODE=============
def setLogFile(logFile):
global logFileName
logFileName=logFile
+
def read_properties(propfile):
if not hasattr(propfile,"read"): propfile = open(propfile)
properties = propfile.read().splitlines()
@@ -106,7 +110,7 @@ def exit(errno=E_GENERIC,message=None,*args):
def resolve(host,port):
return [ (x[4][0],len(x[4])+2) for x in
socket.getaddrinfo(host,port,socket.AF_UNSPEC,socket.SOCK_STREAM, 0,
socket.AI_PASSIVE) ]
-
+
def resolves_to_ipv6(host,port):
return resolve(host,port)[0][1] == IPV6
@@ -119,7 +123,7 @@ else:
self.returncode = returncode ; self.cmd = cmd
def __str__(self): return "Command '%s' returned non-zero exit
status %d" % (self.cmd, self.returncode)
subprocess.CalledProcessError = CalledProcessError
-
+
def check_call(*popenargs, **kwargs):
retcode = subprocess.call(*popenargs, **kwargs)
cmd = kwargs.get("args")
@@ -183,7 +187,7 @@ class Command:
self.stdout = stdout
self.stderr = stderr
return CommandOutput(*m)
-
+
def __get_recursive_name(self,sep=None):
m = self
l = []
@@ -195,7 +199,7 @@ class Command:
else: return l
def __str__(self):
return '<Command %r>'%self.__get_recursive_name(sep=" ")
-
+
def __repr__(self): return self.__str__()
kvmok = Command("kvm-ok")
@@ -274,7 +278,7 @@ def replace_line(f,startswith,stanza,always_add=False):
def replace_or_add_line(f,startswith,stanza):
return replace_line(f,startswith,stanza,always_add=True)
-
+
# ==================================== CHECK FUNCTIONS
==========================
# If they return without exception, it's okay. If they raise a CheckFailed
exception, that means a condition
@@ -291,7 +295,7 @@ def check_hostname():
#check function
def check_kvm():
- if distro in (Fedora,CentOS,RHEL6):
+ if distro in (Fedora,CentOS,RHEL6,SUSE):
if os.path.exists("/dev/kvm"): return True
raise CheckFailed("KVM is not correctly installed on this
system, or support for it is not enabled in the BIOS")
else:
@@ -311,7 +315,7 @@ def check_cgroups():
#check function
def check_selinux():
- if distro not in [Fedora,CentOS,RHEL6]: return # no selinux outside of
those
+ if distro not in [Fedora,CentOS,RHEL6,SUSE]: return # no selinux
outside of those
enforcing = False
config_enforcing = False
try:
@@ -352,533 +356,6 @@ def preflight_checks(do_check_kvm=True):
return preflight_checks
-# ========================== CONFIGURATION TASKS
================================
-
-# A Task is a function that runs within the context of its run() function that
runs the function execute(), which does several things, reporting back to the
caller as it goes with the use of yield
-# the done() method ought to return true if the task has run in the past
-# the execute() method must implement the configuration act itself
-# run() wraps the output of execute() within a Starting taskname and a
Completed taskname message
-# tasks have a name
-
-class TaskFailed(Exception): pass
- #def __init__(self,code,msg):
- #Exception.__init__(self,msg)
- #self.code = code
-
-class ConfigTask:
- name = "generic config task"
- autoMode=False
- def __init__(self): pass
- def done(self):
- """Returns true if the config task has already been done in the
past, false if it hasn't"""
- return False
- def execute(self):
- """Executes the configuration task. Must not be run if test()
returned true.
- Must yield strings that describe the steps in the task.
- Raises TaskFailed if the task failed at some step.
- """
- def run (self):
- stderr("Starting %s"%self.name)
- it = self.execute()
- if not it:
- pass # not a yielding iterable
- else:
- for msg in it: stderr(msg)
- stderr("Completed %s"%self.name)
- def setAutoMode(self, autoMode):
- self.autoMode = autoMode
- def isAutoMode(self):
- return self.autoMode
-
-
-# ============== these are some configuration tasks ==================
-
-class SetupNetworking(ConfigTask):
- name = "network setup"
- def __init__(self,brname, pubNic, prvNic):
- ConfigTask.__init__(self)
- self.brname = brname
- self.pubNic = pubNic
- self.prvNic = prvNic
- self.runtime_state_changed = False
- self.was_nm_service_running = None
- self.was_net_service_running = None
- if distro in (Fedora, CentOS, RHEL6):
- self.nmservice = 'NetworkManager'
- self.netservice = 'network'
- else:
- self.nmservice = 'network-manager'
- self.netservice = 'networking'
-
-
- def done(self):
- try:
- alreadysetup = False
- if distro in (Fedora,CentOS, RHEL6):
- if self.pubNic != None:
- alreadysetup = alreadysetup or
augtool._print("/files/etc/sysconfig/network-scripts/ifcfg-%s"%self.pubNic).stdout.strip()
- if self.prvNic != None:
- alreadysetup = alreadysetup or
augtool._print("/files/etc/sysconfig/network-scripts/ifcfg-%s"%self.prvNic).stdout.strip()
- if not alreadysetup:
- alreadysetup =
augtool._print("/files/etc/sysconfig/network-scripts/ifcfg-%s"%self.brname).stdout.strip()
-
- else:
- if self.pubNic != None:
- alreadysetup = alreadysetup or
augtool._print("/files/etc/network/interfaces/iface",self.pubNic).stdout.strip()
- if self.prvNic != None:
- alreadysetup = alreadysetup or
augtool._print("/files/etc/network/interfaces/iface",self.prvNic).stdout.strip()
- if not alreadysetup:
- alreadysetup =
augtool.match("/files/etc/network/interfaces/iface",self.brname).stdout.strip()
- return alreadysetup
- except OSError as e:
- if e.errno == 2: raise TaskFailed("augtool has not been
properly installed on this system")
- raise
-
- def restore_state(self):
- if not self.runtime_state_changed: return
-
- try:
- o = ifconfig(self.brname)
- bridge_exists = True
- except CalledProcessError as e:
- print(e.stdout + e.stderr)
- bridge_exists = False
-
- if bridge_exists:
- ifconfig(self.brname,"0.0.0.0")
- if hasattr(self,"old_net_device"):
- ifdown(self.old_net_device)
- ifup(self.old_net_device)
- try: ifdown(self.brname)
- except CalledProcessError: pass
- try: ifconfig(self.brname,"down")
- except CalledProcessError: pass
- try: ip("link del",self.brname)
- except CalledProcessError: pass
- try: ifdown("--force",self.brname)
- except CalledProcessError: pass
-
-
- if self.was_net_service_running is None:
- # we do nothing
- pass
- elif self.was_net_service_running == False:
- stop_service(self.netservice,force=True)
- time.sleep(1)
- else:
- # we altered service configuration
- stop_service(self.netservice,force=True)
- time.sleep(1)
- try: start_service(self.netservice,force=True)
- except CalledProcessError as e:
- if e.returncode == 1: pass
- else: raise
- time.sleep(1)
-
- if self.was_nm_service_running is None:
- # we do nothing
- pass
- elif self.was_nm_service_running == False:
- stop_service(self.nmservice,force=True)
- time.sleep(1)
- else:
- # we altered service configuration
- stop_service(self.nmservice,force=True)
- time.sleep(1)
- start_service(self.nmservice,force=True)
- time.sleep(1)
-
- self.runtime_state_changed = False
-
- def execute(self):
- yield "Determining default route"
- routes = ip.route().stdout.splitlines()
- defaultroute = [ x for x in routes if x.startswith("default") ]
- if not defaultroute: raise TaskFailed("Your network
configuration does not have a default route")
-
- dev = defaultroute[0].split()[4]
- yield "Default route assigned to device %s"%dev
-
- self.old_net_device = dev
-
- if distro in (Fedora, CentOS, RHEL6):
- inconfigfile =
"/".join(augtool.match("/files/etc/sysconfig/network-scripts/*/DEVICE",dev).stdout.strip().split("/")[:-1])
- if not inconfigfile: raise TaskFailed("Device %s has
not been set up in /etc/sysconfig/network-scripts"%dev)
- pathtoconfigfile = inconfigfile[6:]
-
- if distro in (Fedora, CentOS, RHEL6):
- automatic =
augtool.match("%s/ONBOOT"%inconfigfile,"yes").stdout.strip()
- else:
- automatic =
augtool.match("/files/etc/network/interfaces/auto/*/",dev).stdout.strip()
- if not automatic:
- if distro is Fedora: raise TaskFailed("Device %s has
not been set up in %s as automatic on boot"%dev,pathtoconfigfile)
- else: raise TaskFailed("Device %s has not been set up
in /etc/network/interfaces as automatic on boot"%dev)
-
- if distro not in (Fedora , CentOS, RHEL6):
- inconfigfile =
augtool.match("/files/etc/network/interfaces/iface",dev).stdout.strip()
- if not inconfigfile: raise TaskFailed("Device %s has
not been set up in /etc/network/interfaces"%dev)
-
- if distro in (Fedora, CentOS, RHEL6):
- isstatic = augtool.match(inconfigfile +
"/BOOTPROTO","none").stdout.strip()
- if not isstatic: isstatic = augtool.match(inconfigfile
+ "/BOOTPROTO","static").stdout.strip()
- else:
- isstatic = augtool.match(inconfigfile +
"/method","static").stdout.strip()
- if not isstatic:
- if distro in (Fedora, CentOS, RHEL6): raise
TaskFailed("Device %s has not been set up as a static device in
%s"%(dev,pathtoconfigfile))
- else: raise TaskFailed("Device %s has not been set up
as a static device in /etc/network/interfaces"%dev)
-
- if is_service_running(self.nmservice):
- self.was_nm_service_running = True
- yield "Stopping NetworkManager to avoid automatic
network reconfiguration"
- disable_service(self.nmservice)
- else:
- self.was_nm_service_running = False
-
- if is_service_running(self.netservice):
- self.was_net_service_running = True
- else:
- self.was_net_service_running = False
-
- yield "Creating Cloud bridging device and making device %s
member of this bridge"%dev
-
- if distro in (Fedora, CentOS, RHEL6):
- ifcfgtext = open(pathtoconfigfile).read()
- newf =
"/etc/sysconfig/network-scripts/ifcfg-%s"%self.brname
- #def restore():
- #try: os.unlink(newf)
- #except OSError,e:
- #if errno == 2: pass
- #raise
- #try:
open(pathtoconfigfile,"w").write(ifcfgtext)
- #except OSError,e: raise
-
- f = open(newf,"w") ; f.write(ifcfgtext) ; f.flush() ;
f.close()
- innewconfigfile = "/files" + newf
-
- script = """set %s/DEVICE %s
-set %s/NAME %s
-set %s/BRIDGE_PORTS %s
-set %s/TYPE Bridge
-rm %s/HWADDR
-rm %s/UUID
-rm %s/HWADDR
-rm %s/IPADDR
-rm %s/DEFROUTE
-rm %s/NETMASK
-rm %s/GATEWAY
-rm %s/BROADCAST
-rm %s/NETWORK
-set %s/BRIDGE %s
-save"""%(innewconfigfile,self.brname,innewconfigfile,self.brname,innewconfigfile,dev,
-
innewconfigfile,innewconfigfile,innewconfigfile,innewconfigfile,
-
inconfigfile,inconfigfile,inconfigfile,inconfigfile,inconfigfile,inconfigfile,
- inconfigfile,self.brname)
-
- yield "Executing the following reconfiguration
script:\n%s"%script
-
- try:
- returned = augtool < script
- if "Saved 2 file" not in returned.stdout:
- print(returned.stdout + returned.stderr)
- #restore()
- raise TaskFailed("Network
reconfiguration failed.")
- else:
- yield "Network reconfiguration complete"
- except CalledProcessError as e:
- #restore()
- print(e.stdout + e.stderr)
- raise TaskFailed("Network reconfiguration
failed")
- else: # Not fedora
- backup = open("/etc/network/interfaces").read(-1)
- #restore = lambda:
open("/etc/network/interfaces","w").write(backup)
-
- script = """set %s %s
-set %s %s
-set %s/bridge_ports %s
-save"""%(automatic,self.brname,inconfigfile,self.brname,inconfigfile,dev)
-
- yield "Executing the following reconfiguration
script:\n%s"%script
-
- try:
- returned = augtool < script
- if "Saved 1 file" not in returned.stdout:
- #restore()
- raise TaskFailed("Network
reconfiguration failed.")
- else:
- yield "Network reconfiguration complete"
- except CalledProcessError as e:
- #restore()
- print(e.stdout + e.stderr)
- raise TaskFailed("Network reconfiguration
failed")
-
- yield "We are going to restart network services now, to make
the network changes take effect. Hit ENTER when you are ready."
- if self.isAutoMode(): pass
- else:
- input()
-
- # if we reach here, then if something goes wrong we should
attempt to revert the runinng state
- # if not, then no point
- self.runtime_state_changed = True
-
- yield "Enabling and restarting non-NetworkManager networking"
- if distro is Ubuntu: ifup(self.brname,stdout=None,stderr=None)
- stop_service(self.netservice)
- try: enable_service(self.netservice,forcestart=True)
- except CalledProcessError as e:
- if e.returncode == 1: pass
- else: raise
-
- yield "Verifying that the bridge is up"
- try:
- o = ifconfig(self.brname)
- except CalledProcessError as e:
- print(e.stdout + e.stderr)
- raise TaskFailed("The bridge could not be set up
properly")
-
- yield "Networking restart done"
-
-
-class SetupCgConfig(ConfigTask):
- name = "control groups configuration"
-
- def done(self):
-
- try:
- return "group virt" in
open("/etc/cgconfig.conf","r").read(-1)
- except IOError as e:
- if e.errno == 2: raise TaskFailed("cgconfig has not
been properly installed on this system")
- raise
-
- def execute(self):
- cgconfig = open("/etc/cgconfig.conf","r").read(-1)
- cgconfig = cgconfig + """
-group virt {
- cpu {
- cpu.shares = 9216;
- }
-}
-"""
- open("/etc/cgconfig.conf","w").write(cgconfig)
-
- stop_service("cgconfig")
- enable_service("cgconfig",forcestart=True)
-
-
-class SetupCgRules(ConfigTask):
- name = "control group rules setup"
- cfgline = "root:/usr/sbin/libvirtd cpu virt/"
-
- def done(self):
- try:
- return self.cfgline in
open("/etc/cgrules.conf","r").read(-1)
- except IOError as e:
- if e.errno == 2: raise TaskFailed("cgrulesd has not
been properly installed on this system")
- raise
-
- def execute(self):
- cgrules = open("/etc/cgrules.conf","r").read(-1)
- cgrules = cgrules + "\n" + self.cfgline + "\n"
- open("/etc/cgrules.conf","w").write(cgrules)
-
- stop_service("cgred")
- enable_service("cgred")
-
-
-class SetupSecurityDriver(ConfigTask):
- name = "security driver setup"
- cfgline = "security_driver = \"none\""
- filename = "/etc/libvirt/qemu.conf"
-
- def done(self):
- try:
- return self.cfgline in open(self.filename,"r").read(-1)
- except IOError as e:
- if e.errno == 2: raise TaskFailed("qemu has not been
properly installed on this system")
- raise
-
- def execute(self):
- libvirtqemu = open(self.filename,"r").read(-1)
- libvirtqemu = libvirtqemu + "\n" + self.cfgline + "\n"
- open("/etc/libvirt/qemu.conf","w").write(libvirtqemu)
-
-
-class SetupLibvirt(ConfigTask):
- name = "libvirt setup"
- cfgline = "export CGROUP_DAEMON='cpu:/virt'"
- def done(self):
- try:
- if distro in (Fedora,CentOS, RHEL6): libvirtfile =
"/etc/sysconfig/libvirtd"
- elif distro is Ubuntu: libvirtfile =
"/etc/default/libvirt-bin"
- else: raise AssertionError("We should not reach this")
- return self.cfgline in open(libvirtfile,"r").read(-1)
- except IOError as e:
- if e.errno == 2: raise TaskFailed("libvirt has not been
properly installed on this system")
- raise
-
- def execute(self):
- if distro in (Fedora,CentOS, RHEL6): libvirtfile =
"/etc/sysconfig/libvirtd"
- elif distro is Ubuntu: libvirtfile =
"/etc/default/libvirt-bin"
- else: raise AssertionError("We should not reach this")
- libvirtbin = open(libvirtfile,"r").read(-1)
- libvirtbin = libvirtbin + "\n" + self.cfgline + "\n"
- open(libvirtfile,"w").write(libvirtbin)
-
- if distro in (CentOS, Fedora, RHEL6): svc = "libvirtd"
- else: svc = "libvirt-bin"
- stop_service(svc)
- enable_service(svc)
-
-class SetupLiveMigration(ConfigTask):
- name = "live migration setup"
- stanzas = (
- "listen_tcp=1",
- 'tcp_port="16509"',
- 'auth_tcp="none"',
- "listen_tls=0",
- )
-
- def done(self):
- try:
- lines = [ s.strip() for s in
open("/etc/libvirt/libvirtd.conf").readlines() ]
- if all( [ stanza in lines for stanza in self.stanzas ]
): return True
- except IOError as e:
- if e.errno == 2: raise TaskFailed("libvirt has not been
properly installed on this system")
- raise
-
- def execute(self):
-
- for stanza in self.stanzas:
- startswith = stanza.split("=")[0] + '='
-
replace_or_add_line("/etc/libvirt/libvirtd.conf",startswith,stanza)
-
- if distro in (Fedora, RHEL6):
-
replace_or_add_line("/etc/sysconfig/libvirtd","LIBVIRTD_ARGS=","LIBVIRTD_ARGS=-l")
-
- elif distro is Ubuntu:
- if os.path.exists("/etc/init/libvirt-bin.conf"):
- replace_line("/etc/init/libvirt-bin.conf",
"exec /usr/sbin/libvirtd","exec /usr/sbin/libvirtd -d -l")
- else:
-
replace_or_add_line("/etc/default/libvirt-bin","libvirtd_opts=","libvirtd_opts='-l'")
-
- else:
- raise AssertionError("Unsupported distribution")
-
- if distro in (CentOS, Fedora, RHEL6): svc = "libvirtd"
- else: svc =
"libvirt-bin"
- stop_service(svc)
- enable_service(svc)
-
-
-class SetupRequiredServices(ConfigTask):
- name = "required services setup"
-
- def done(self):
- if distro in (Fedora, RHEL6): nfsrelated = "rpcbind nfslock"
- elif distro is CentOS: nfsrelated = "portmap nfslock"
- else: return True
- return all( [ is_service_running(svc) for svc in
nfsrelated.split() ] )
-
- def execute(self):
-
- if distro in (Fedora, RHEL6): nfsrelated = "rpcbind nfslock"
- elif distro is CentOS: nfsrelated = "portmap nfslock"
- else: raise AssertionError("Unsupported distribution")
-
- for svc in nfsrelated.split(): enable_service(svc)
-
-
-class SetupFirewall(ConfigTask):
- name = "firewall setup"
-
- def done(self):
-
- if distro in (Fedora, CentOS,RHEL6):
- if not os.path.exists("/etc/sysconfig/iptables"):
return True
- if ":on" not in chkconfig("--list","iptables").stdout:
return True
- else:
- if "Status: active" not in ufw.status().stdout: return
True
- if not os.path.exists("/etc/ufw/before.rules"): return
True
- rule = "-p tcp -m tcp --dport 16509 -j ACCEPT"
- if rule in iptablessave().stdout: return True
- return False
-
- def execute(self):
- ports = "22 1798 16509 16514".split()
- if distro in (Fedora , CentOS, RHEL6):
- for p in ports:
iptables("-I","INPUT","1","-p","tcp","--dport",p,'-j','ACCEPT')
- o = service.iptables.save() ; print(o.stdout + o.stderr)
- else:
- for p in ports: ufw.allow(p)
-
-
-class SetupFirewall2(ConfigTask):
- # this closes bug 4371
- name = "additional firewall setup"
- def __init__(self,brname):
- ConfigTask.__init__(self)
- self.brname = brname
-
- def done(self):
-
- if distro in (Fedora, CentOS, RHEL6):
- if not os.path.exists("/etc/sysconfig/iptables"):
return True
- if ":on" not in chkconfig("--list","iptables").stdout:
return True
- return False
- else:
- if "Status: active" not in ufw.status().stdout: return
True
- if not os.path.exists("/etc/ufw/before.rules"): return
True
- return False
-
- def execute(self):
-
- yield "Permitting traffic in the bridge interface, migration
port and for VNC ports"
-
- if distro in (Fedora , CentOS, RHEL6):
-
- for rule in (
- "-I INPUT 1 -p tcp --dport 5900:6100 -j ACCEPT",
- "-I INPUT 1 -p tcp --dport 49152:49216 -j
ACCEPT",
- ):
- args = rule.split()
- o = iptables(*args)
- service.iptables.save(stdout=None,stderr=None)
-
- else:
-
-
ufw.allow.proto.tcp("from","any","to","any","port","5900:6100")
-
ufw.allow.proto.tcp("from","any","to","any","port","49152:49216")
-
- stop_service("ufw")
- start_service("ufw")
-
-
-# Tasks according to distribution -- at some point we will split them in
separate modules
-
-def config_tasks(brname, pubNic, prvNic):
- if distro is CentOS:
- config_tasks = (
- SetupNetworking(brname, pubNic, prvNic),
- SetupLibvirt(),
- SetupRequiredServices(),
- SetupFirewall(),
- SetupFirewall2(brname),
- )
- elif distro in (Ubuntu,Fedora, RHEL6):
- config_tasks = (
- SetupNetworking(brname, pubNic, prvNic),
- SetupCgConfig(),
- SetupCgRules(),
- SetupSecurityDriver(),
- SetupLibvirt(),
- SetupLiveMigration(),
- SetupRequiredServices(),
- SetupFirewall(),
- SetupFirewall2(brname),
- )
- else:
- raise AssertionError("Unknown distribution")
- return config_tasks
-
def backup_etc(targetdir):
if not targetdir.endswith("/"): targetdir += "/"
@@ -894,31 +371,31 @@ def remove_backup(targetdir):
def list_zonespods(host):
text =
urllib.request.urlopen('http://%s:8096/client/api?command=listPods'%host).read(-1)
- dom = xml.dom.minidom.parseString(text)
+ dom = xml.dom.minidom.parseString(text)
x = [ (zonename,podname)
- for pod in dom.childNodes[0].childNodes
- for podname in [ x.childNodes[0].wholeText for x in
pod.childNodes if x.tagName == "name" ]
+ for pod in dom.childNodes[0].childNodes
+ for podname in [ x.childNodes[0].wholeText for x in
pod.childNodes if x.tagName == "name" ]
for zonename in [ x.childNodes[0].wholeText for x in
pod.childNodes if x.tagName == "zonename" ]
]
return x
-
+
def prompt_for_hostpods(zonespods):
"""Ask user to select one from those zonespods
Returns (zone,pod) or None if the user made the default selection."""
while True:
stderr("Type the number of the zone and pod combination this
host belongs to (hit ENTER to skip this step)")
- print(" N) ZONE, POD")
+ print(" N) ZONE, POD")
print("================")
for n,(z,p) in enumerate(zonespods):
print("%3d) %s, %s"%(n,z,p))
print("================")
print("> ", end=' ')
zoneandpod = input().strip()
-
+
if not zoneandpod:
# we go with default, do not touch anything, just break
return None
-
+
try:
# if parsing fails as an int, just vomit and retry
zoneandpod = int(zoneandpod)
@@ -926,10 +403,10 @@ def prompt_for_hostpods(zonespods):
except ValueError as e:
stderr(str(e))
continue # re-ask
-
+
# oh yeah, the int represents an valid zone and pod index in
the array
return zonespods[zoneandpod]
-
+
# this configures the agent
def device_exist(devName):
@@ -937,12 +414,14 @@ def device_exist(devName):
alreadysetup = False
if distro in (Fedora,CentOS, RHEL6):
alreadysetup =
augtool._print("/files/etc/sysconfig/network-scripts/ifcfg-%s"%devName).stdout.strip()
- else:
+ elif distro == SUSE:
+ alreadysetup =
augtool._print("/files/etc/sysconfig/network/ifcfg-%s"%devName).stdout.strip()
+ elif distro == Ubuntu:
alreadysetup =
augtool.match("/files/etc/network/interfaces/iface",devName).stdout.strip()
return alreadysetup
except OSError as e:
- return False
-
+ return False
+
def setup_agent_config(configfile, host, zone, pod, cluster, guid, pubNic,
prvNic):
stderr("Examining Agent configuration")
fn = configfile
@@ -950,14 +429,14 @@ def setup_agent_config(configfile, host, zone, pod,
cluster, guid, pubNic, prvNi
lines = [ s.strip() for s in text.splitlines() ]
confopts = dict([ m.split("=",1) for m in lines if "=" in m and not
m.startswith("#") ])
confposes = dict([ (m.split("=",1)[0],n) for n,m in enumerate(lines) if
"=" in m and not m.startswith("#") ])
-
+
if guid != None:
confopts['guid'] = guid
else:
if not "guid" in confopts:
stderr("Generating GUID for this Agent")
confopts['guid'] = uuidgen().stdout.strip()
-
+
if host == None:
try: host = confopts["host"]
except KeyError: host = "localhost"
@@ -967,19 +446,19 @@ def setup_agent_config(configfile, host, zone, pod,
cluster, guid, pubNic, prvNi
if newhost: host = newhost
confopts["host"] = host
-
+
if pubNic != None and device_exist(pubNic):
- confopts["public.network.device"] = pubNic
+ confopts["public.network.device"] = pubNic
if prvNic == None or not device_exist(prvNic):
- confopts["private.network.device"] = pubNic
-
+ confopts["private.network.device"] = pubNic
+
if prvNic != None and device_exist(prvNic):
- confopts["private.network.device"] = prvNic
+ confopts["private.network.device"] = prvNic
if pubNic == None or not device_exist(pubNic):
- confopts["public.network.device"] = prvNic
+ confopts["public.network.device"] = prvNic
stderr("Querying %s for zones and pods",host)
-
+
try:
if zone == None or pod == None:
x = list_zonespods(confopts['host'])
@@ -1000,7 +479,7 @@ def setup_agent_config(configfile, host, zone, pod,
cluster, guid, pubNic, prvNi
line = "=".join([opt,val])
if opt not in confposes: lines.append(line)
else: lines[confposes[opt]] = line
-
+
text = "\n".join(lines)
open(fn,"w").write(text)
@@ -1026,7 +505,7 @@ def setup_consoleproxy_config(configfile, host, zone, pod):
confopts["host"] = host
stderr("Querying %s for zones and pods",host)
-
+
try:
if zone == None or pod == None:
x = list_zonespods(confopts['host'])
@@ -1046,7 +525,7 @@ def setup_consoleproxy_config(configfile, host, zone, pod):
line = "=".join([opt,val])
if opt not in confposes: lines.append(line)
else: lines[confposes[opt]] = line
-
+
text = "\n".join(lines)
open(fn,"w").write(text)
@@ -1063,22 +542,22 @@ INITIAL_LEVEL = '-'
class Migrator:
"""Migrator class.
-
+
The migrator gets a list of Python objects, and discovers
MigrationSteps in it. It then sorts the steps into a chain, based on the
attributes from_level and to_level in each one of the steps.
-
+
When the migrator's run(context) is called, the chain of steps is
applied sequentially on the context supplied to run(), in the order of the
chain of steps found at discovery time. See the documentation for the
MigrationStep class for information on how that happens.
"""
-
+
def __init__(self,evolver_source):
self.discover_evolvers(evolver_source)
self.sort_evolvers()
-
+
def discover_evolvers(self,source):
self.evolvers = []
for val in source:
if hasattr(val,"from_level") and
hasattr(val,"to_level") and val.to_level:
self.evolvers.append(val)
-
+
def sort_evolvers(self):
new = []
while self.evolvers:
@@ -1094,30 +573,30 @@ class Migrator:
raise IndexError("no evolver could be
found to evolve from level %s"%new[-1].to_level)
new.append(self.evolvers.pop(idx))
self.evolvers = new
-
+
def get_evolver_chain(self):
return [ (s.from_level, s.to_level, s) for s in self.evolvers ]
-
+
def get_evolver_by_starting_level(self,level):
try: return [ s for s in self.evolvers if s.from_level ==
level][0]
except IndexError: raise NoMigrator("No evolver knows how to
evolve the database from schema level %r"%level)
-
+
def get_evolver_by_ending_level(self,level):
try: return [ s for s in self.evolvers if s.to_level ==
level][0]
except IndexError: raise NoMigrator("No evolver knows how to
evolve the database to schema level %r"%level)
-
+
def run(self, context, dryrun = False, starting_level = None,
ending_level = None):
"""Runs each one of the steps in sequence, passing the
migration context to each. At the end of the process, context.commit() is
called to save the changes, or context.rollback() is called if dryrun = True.
-
+
If starting_level is not specified, then the
context.get_schema_level() is used to find out at what level the context is at.
Then starting_level is set to that.
-
+
If ending_level is not specified, then the evolvers will run
till the end of the chain."""
-
+
assert dryrun is False # NOT IMPLEMENTED, prolly gonna
implement by asking the context itself to remember its state
-
+
starting_level = starting_level or context.get_schema_level()
or self.evolvers[0].from_level
ending_level = ending_level or self.evolvers[-1].to_level
-
+
evolution_path = self.evolvers
idx =
evolution_path.index(self.get_evolver_by_starting_level(starting_level))
evolution_path = evolution_path[idx:]
@@ -1126,9 +605,9 @@ class Migrator:
raise NoEvolutionPath("No evolution path from schema
level %r to schema level %r" % \
(starting_level,ending_level))
evolution_path = evolution_path[:idx+1]
-
+
logging.info("Starting migration on %s"%context)
-
+
for ec in evolution_path:
assert ec.from_level == context.get_schema_level()
evolver = ec(context=context)
@@ -1144,36 +623,36 @@ class Migrator:
context.set_schema_level(evolver.to_level)
#context.commit()
logging.info("%s is now at level
%s",context,context.get_schema_level())
-
+
#if dryrun: # implement me with backup and restore
#logging.info("Rolling back changes on %s",context)
#context.rollback()
#else:
#logging.info("Committing changes on %s",context)
#context.commit()
-
+
logging.info("Migration finished")
-
+
class MigrationStep:
"""Base MigrationStep class, aka evolver.
-
+
You develop your own steps, and then pass a list of those steps to the
Migrator instance that will run them in order.
-
+
When the migrator runs, it will take the list of steps you gave,
and, for each step:
-
+
a) instantiate it, passing the context you gave to the migrator
into the step's __init__().
b) run() the method in the migration step.
-
+
As you can see, the default MigrationStep constructor makes the passed
context available as self.context in the methods of your step.
-
+
Each step has two member vars that determine in which order they
are run, and if they need to run:
-
+
- from_level = the schema level that the database should be at,
before running the evolver
The value None has special meaning here, it
@@ -1182,14 +661,14 @@ class MigrationStep:
- to_level = the schema level number that the database will be at
after the evolver has run
"""
-
+
# Implement these attributes in your steps
from_level = None
to_level = None
-
+
def __init__(self,context):
self.context = context
-
+
def run(self):
raise NotImplementedError
diff --git a/python/lib/cloudutils/serviceConfig.py
b/python/lib/cloudutils/serviceConfig.py
index 9d253a1..55b7cc2 100755
--- a/python/lib/cloudutils/serviceConfig.py
+++ b/python/lib/cloudutils/serviceConfig.py
@@ -339,6 +339,94 @@ class networkConfigRedhat(serviceCfgBase,
networkConfigBase):
logging.debug(formatExceptionInfo())
return False
+class networkConfigSUSE(serviceCfgBase, networkConfigBase):
+ def __init__(self, syscfg):
+ super(networkConfigSUSE, self).__init__(syscfg)
+ networkConfigBase.__init__(self, syscfg)
+
+ def writeToCfgFile(self, brName, dev):
+ self.devCfgFile = "/etc/sysconfig/network/ifcfg-%s" % dev.name
+ self.brCfgFile = "/etc/sysconfig/network/ifcfg-%s" % brName
+
+ isDevExist = os.path.exists(self.devCfgFile)
+ isBrExist = os.path.exists(self.brCfgFile)
+ if isDevExist and isBrExist:
+ logging.debug("%s:%s already configured"%(brName, dev.name))
+ return True
+ elif isDevExist and not isBrExist:
+ #reconfig bridge
+ self.addBridge(brName, dev)
+ elif not isDevExist and isBrExist:
+ #reconfig dev
+ raise CloudInternalException("Missing device configuration, Need
to add your network configuration into /etc/sysconfig/network-scripts at first")
+ else:
+ raise CloudInternalException("Missing bridge/device network
configuration, need to add your network configuration into
/etc/sysconfig/network-scripts at first")
+
+
+ def addBridge(self, brName, dev):
+ bash("ifdown %s" % dev.name)
+
+ if not os.path.exists(self.brCfgFile):
+ shutil.copy(self.devCfgFile, self.brCfgFile)
+
+ cfo = configFileOps(self.devCfgFile, self)
+ cfo.addEntry("STARTMODE", "auto")
+ if self.syscfg.env.bridgeType == "openvswitch":
+ if cfo.getEntry("IPADDR"):
+ cfo.rmEntry("IPADDR", cfo.getEntry("IPADDR"))
+ else:
+ raise CloudInternalException("Unknown network.bridge.type %s" %
self.syscfg.env.bridgeType)
+ cfo.save()
+
+ cfo = configFileOps(self.brCfgFile, self)
+ cfo.addEntry("STARTMODE", "auto")
+ if self.syscfg.env.bridgeType == "openvswitch":
+ if cfo.getEntry("LLADDR"):
+ cfo.rmEntry("LLADDR", cfo.getEntry("LLADDR"))
+ cfo.addEntry("BRIDGE_STP", "yes")
+ cfo.addEntry("OVS_BRIDGE", "yes")
+ elif self.syscfg.env.bridgeType == "native":
+ cfo.addEntry("BRIDGE", "yes")
+ else:
+ raise CloudInternalException("Unknown network.bridge.type %s" %
self.syscfg.env.bridgeType)
+ # Bridge is linked to the dev in SUSE not the other way round
+ cfo.addEntry("BRIDGE_PORTS", dev.name)
+ cfo.save()
+
+ def config(self):
+ try:
+ if super(networkConfigSUSE, self).isPreConfiged():
+ return True
+
+ super(networkConfigSUSE, self).cfgNetwork()
+
+ self.netMgrRunning =
self.syscfg.svo.isServiceRunning("NetworkManager")
+ if self.netMgrRunning:
+ self.syscfg.svo.stopService("NetworkManager")
+ self.syscfg.svo.disableService("NetworkManager")
+
+ if not bash("service network restart").isSuccess():
+ if not bash("systemctl restart
NetworkManager.service").isSuccess():
+ raise CloudInternalException("Can't restart network")
+
+ self.syscfg.env.nics.append(self.brName)
+ self.syscfg.env.nics.append(self.brName)
+ self.syscfg.env.nics.append(self.brName)
+ return True
+ except:
+ raise
+
+ def restore(self):
+ try:
+ if self.netMgrRunning:
+ self.syscfg.svo.enableService("NetworkManager")
+ self.syscfg.svo.startService("NetworkManager")
+ bash("service network restart")
+ return True
+ except:
+ logging.debug(formatExceptionInfo())
+ return False
+
class cgroupConfig(serviceCfgBase):
def __init__(self, syscfg):
super(cgroupConfig, self).__init__(syscfg)
@@ -472,6 +560,9 @@ class securityPolicyConfigRedhat(serviceCfgBase):
logging.debug(formatExceptionInfo())
return False
+class securityPolicyConfigSUSE(securityPolicyConfigRedhat):
+ pass
+
def configureLibvirtConfig(tls_enabled = True, cfg = None):
cfo = configFileOps("/etc/libvirt/libvirtd.conf", cfg)
if tls_enabled:
@@ -518,10 +609,43 @@ class libvirtConfigRedhat(serviceCfgBase):
cfo.save()
self.syscfg.svo.stopService("libvirtd")
- if not self.syscfg.svo.startService("libvirtd"):
- return False
+ return self.syscfg.svo.startService("libvirtd")
+ except:
+ raise
- return True
+ def restore(self):
+ pass
+
+class libvirtConfigSUSE(serviceCfgBase):
+ def __init__(self, syscfg):
+ super(libvirtConfigSUSE, self).__init__(syscfg)
+ self.serviceName = "Libvirt"
+
+ def config(self):
+ try:
+ configureLibvirtConfig(self.syscfg.env.secure, self)
+
+ if os.path.exists("/usr/lib/systemd/system/libvirtd.socket"):
+ bash("/bin/systemctl mask libvirtd.socket");
+ bash("/bin/systemctl mask libvirtd-ro.socket");
+ bash("/bin/systemctl mask libvirtd-admin.socket");
+ bash("/bin/systemctl mask libvirtd-tls.socket");
+ bash("/bin/systemctl mask libvirtd-tcp.socket");
+
+ cfo = configFileOps("/etc/sysconfig/libvirtd", self)
+ cfo.addEntry("LIBVIRTD_ARGS", "-l")
+ cfo.save()
+
+ filename = "/etc/libvirt/qemu.conf"
+ cfo = configFileOps(filename, self)
+ cfo.addEntry("security_driver", "\"none\"")
+ cfo.addEntry("user", "\"root\"")
+ cfo.addEntry("group", "\"root\"")
+ cfo.addEntry("vnc_listen", "\"0.0.0.0\"")
+ cfo.save()
+
+ self.syscfg.svo.stopService("libvirtd")
+ return self.syscfg.svo.startService("libvirtd")
except:
raise
@@ -657,7 +781,6 @@ class firewallConfigAgent(firewallConfigBase):
else:
self.rules = ["-D FORWARD -j REJECT --reject-with
icmp-host-prohibited"]
-
class cloudAgentConfig(serviceCfgBase):
def __init__(self, syscfg):
super(cloudAgentConfig, self).__init__(syscfg)
diff --git a/python/lib/cloudutils/syscfg.py b/python/lib/cloudutils/syscfg.py
index fdc077d..2c96e10 100755
--- a/python/lib/cloudutils/syscfg.py
+++ b/python/lib/cloudutils/syscfg.py
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-from .utilities import Distribution,
serviceOpsRedhat,serviceOpsUbuntu,serviceOpsRedhat7Later
+from .utilities import Distribution,
serviceOpsRedhat,serviceOpsUbuntu,serviceOpsRedhat7Later,serviceOpsSUSE
from .serviceConfig import *
class sysConfigFactory:
@staticmethod
@@ -45,6 +45,8 @@ class sysConfigAgentFactory:
return sysConfigRedhat7(glbEnv)
elif distribution == "RHEL8":
return sysConfigRedhat8(glbEnv)
+ elif distribution == "SUSE":
+ return sysConfigSUSE(glbEnv)
else:
print("Can't find the distribution version")
return sysConfig()
@@ -154,6 +156,11 @@ class sysConfigAgentRedhat8Base(sysConfigAgent):
self.svo = serviceOpsRedhat7Later()
super(sysConfigAgentRedhat8Base, self).__init__(env)
+class sysConfigAgentSUSE(sysConfigAgent):
+ def __init__(self, env):
+ self.svo = serviceOpsSUSE()
+ super(sysConfigAgentSUSE, self).__init__(env)
+
class sysConfigAgentUbuntu(sysConfigAgent):
def __init__(self, glbEnv):
super(sysConfigAgentUbuntu, self).__init__(glbEnv)
@@ -211,6 +218,16 @@ class sysConfigRedhat8(sysConfigAgentRedhat8Base):
nfsConfig(self),
cloudAgentConfig(self)]
+class sysConfigSUSE(sysConfigAgentSUSE):
+ def __init__(self, glbEnv):
+ super(sysConfigSUSE, self).__init__(glbEnv)
+ self.services = [securityPolicyConfigSUSE(self),
+ networkConfigSUSE(self),
+ libvirtConfigSUSE(self),
+ firewallConfigAgent(self),
+ nfsConfig(self),
+ cloudAgentConfig(self)]
+
class sysConfigServer(sysConfig):
def check(self):
if os.geteuid() != 0:
diff --git a/python/lib/cloudutils/utilities.py
b/python/lib/cloudutils/utilities.py
index 3d186d8..a016746 100755
--- a/python/lib/cloudutils/utilities.py
+++ b/python/lib/cloudutils/utilities.py
@@ -138,6 +138,13 @@ class Distribution:
self.distro = "Ubuntu"
else:
raise UnknownSystemException(distributor)
+ elif os.path.exists("/etc/os-release"):
+ version = open("/etc/os-release").readline()
+ distributor = version.split("=")[1].replace('"', '').strip()
+ if "SUSE" in distributor or "SLES" in distributor:
+ self.distro = "SUSE"
+ else:
+ raise UnknownSystemException(distributor)
else:
raise UnknownSystemException
@@ -252,3 +259,6 @@ class serviceOpsRedhat7Later(serviceOps):
return True
else:
return False
+
+class serviceOpsSUSE(serviceOpsRedhat7Later):
+ pass
diff --git a/scripts/vm/hypervisor/versions.sh
b/scripts/vm/hypervisor/versions.sh
index 5d8ff3c..c2f8e34 100755
--- a/scripts/vm/hypervisor/versions.sh
+++ b/scripts/vm/hypervisor/versions.sh
@@ -6,9 +6,9 @@
# 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
@@ -17,7 +17,7 @@
# under the License.
-
+
# $Id: versions.sh 9132 2010-06-04 20:17:43Z manuel $ $HeadURL:
svn://svn.lab.vmops.com/repos/vmdev/java/scripts/vm/hypervisor/versions.sh $
# Output Linux distribution.
@@ -37,8 +37,12 @@ elif [ -f /etc/lsb-release ] ; then
DIST=`cat /etc/lsb-release | grep DISTRIB_ID | tr "\n" ' '| sed s/.*=//`
REV=`cat /etc/lsb-release | grep DISTRIB_RELEASE | tr "\n" ' '| sed
s/.*=//`
CODENAME=`cat /etc/lsb-release | grep DISTRIB_CODENAME | tr "\n" ' '|
sed s/.*=//`
+elif [ -f /etc/os-release ] ; then
+ DIST=`grep -e "^NAME=" /etc/os-release | awk -F\" '{print $2}'`
+ REV=`grep -e "^VERSION_ID=" /etc/os-release | awk -F\" '{print $2}'`
+ CODENAME=`grep -e "^PRETTY_NAME=" /etc/os-release | awk -F\" '{print
$2}'`
fi
-
-echo Host.OS=${DIST}
-echo Host.OS.Version=${REV}
+
+echo Host.OS=${DIST}
+echo Host.OS.Version=${REV}
echo Host.OS.Kernel.Version=${KERNEL}
diff --git a/scripts/vm/network/security_group.py
b/scripts/vm/network/security_group.py
index 404edd4..739bb42 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -185,6 +185,8 @@ def destroy_network_rules_for_nic(vm_name, vm_ip, vm_mac,
vif, sec_ips):
logging.debug("Ignoring failure to delete ebtable rules for vm: " +
vm_name)
def get_bridge_physdev(brname):
+ # eth1.50@eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 master
breth1-50 state forwarding priority 32 cost 4 |
+ # eth1.50@eth1: | eth1.50@eth1 | eth1.50
physdev = execute("bridge -o link show | awk '/master %s / && !/^[0-9]+:
vnet/ {print $2}' | head -1 | cut -d ':' -f1 | cut -d '@' -f1" % brname)
return physdev.strip()
diff --git a/tools/marvin/marvin/marvinLog.py b/tools/marvin/marvin/marvinLog.py
index c720186..ec373b7 100644
--- a/tools/marvin/marvin/marvinLog.py
+++ b/tools/marvin/marvin/marvinLog.py
@@ -167,7 +167,7 @@ class MarvinLog:
else:
self.__logFolderDir = os.path.join(temp_dir,
str(test_module_name))
- print("\n==== Log Folder Path: %s. All logs will be available here
====" % str(self.__logFolderDir))
+ print("\n==== Log Folder Path: %s All logs will be available here
====" % str(self.__logFolderDir))
os.makedirs(self.__logFolderDir)
'''
diff --git a/tools/marvin/marvin/marvinPlugin.py
b/tools/marvin/marvin/marvinPlugin.py
index ec75b61..d6564cf 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -306,7 +306,7 @@ class MarvinPlugin(Plugin):
dst = tmp + "/" + mod_name + "_" + random_gen()
cmd = "mv " + src + " " + dst
os.system(cmd)
- print("===final results are now copied to: %s===" % str(dst))
+ print("=== Final results are now copied to: %s ===" % str(dst))
except Exception as e:
print("=== Exception occurred under finalize :%s ===" % \
str(GetDetailExceptionInfo(e)))
