You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2021/06/15 04:20:47 UTC
[GitHub] [cloudstack] davidjumani opened a new pull request #5110: Opensuse support
davidjumani opened a new pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110
### Description
This PR adds support for openSUSE Leap 15.2+ as a KVM hypervisor and Management / Usage server on Cloudstack
### Types of changes
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
#### Feature/Enhancement Scale
- [x] Major
- [ ] Minor
### Screenshots (if appropriate):
### How Has This Been Tested?
TODO
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900802225
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900933600
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb edited a comment on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb edited a comment on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894231756
>
>
> @vladimirpetrov - where are the results for this:
>
> _Smoke test results (Suse mgmt + suse KVM):
> 88 look ok, 0 have errors
>
> ```
> C7 MS + Suse KVM Agent - OK
> Suse MS + Suse KVM Agent - OK
> Suse MS + C7 KVM Agent - OK
> Suse MS + VMware 6.7u3 / 7.0 - OK / OK
> Suse MS + XCPNG 8.2 / LTS - OK_
> ```
>
> i.e. why are not visible here, publicly? (ping me offline if needed) - thx
tests were run "in house" for specific reasons - but are LGTM:
```
Build #1305 - FR140-opensuse-smoketest (Jul 8, 2021 2:58:54 PM)
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 88 look OK, 0 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869547289
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-871915607
<b>Trillian test result (tid-1178)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 44704 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1178-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 86 look OK, 2 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Failure` | 347.54 | test_routers_network_ops.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 470.48 | test_vpc_redundant.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r663464728
##########
File path: python/lib/cloudutils/utilities.py
##########
@@ -134,17 +134,23 @@ def __init__(self):
self.distro = "Ubuntu"
else:
raise UnknownSystemException(distributor)
- else:
+ elif os.path.exists("/etc/os-release"):
+ version = open("/etc/os-release").readline()
+ if version.find("openSUSE") != -1:
+ self.distro = "openSUSE"
+ else:
+ raise UnknownSystemException(distributor)
Review comment:
```suggestion
else:
distributor=`grep -e "^NAME=" /etc/os-release | awk -F\" '{print $2}'` or None
raise UnknownSystemException(distributor)
```
maybe better suggestion is to get `distributor` from `/etc/os-release`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r663464728
##########
File path: python/lib/cloudutils/utilities.py
##########
@@ -134,17 +134,23 @@ def __init__(self):
self.distro = "Ubuntu"
else:
raise UnknownSystemException(distributor)
- else:
+ elif os.path.exists("/etc/os-release"):
+ version = open("/etc/os-release").readline()
+ if version.find("openSUSE") != -1:
+ self.distro = "openSUSE"
+ else:
+ raise UnknownSystemException(distributor)
Review comment:
```suggestion
else:
distributor=`grep -e "^NAME=" /etc/os-release | awk -F\" '{print $2}'` or None
raise UnknownSystemException(distributor)
```
or get `distributor` from `/etc/os-release`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876916181
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 504
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900835843
@davidjumani a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r663463461
##########
File path: python/lib/cloudutils/utilities.py
##########
@@ -134,17 +134,23 @@ def __init__(self):
self.distro = "Ubuntu"
else:
raise UnknownSystemException(distributor)
- else:
+ elif os.path.exists("/etc/os-release"):
+ version = open("/etc/os-release").readline()
+ if version.find("openSUSE") != -1:
+ self.distro = "openSUSE"
+ else:
+ raise UnknownSystemException(distributor)
Review comment:
@davidjumani you still need to remove this, since `distributor` is not defined and those would raise an additional `NameError` exception, but not the expected `UnknownSystemException`
```
>>> raise UnknownSystemException(distributor)
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
NameError: name 'distributor' is not defined
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660432121
##########
File path: scripts/vm/network/security_group.py
##########
@@ -185,7 +185,9 @@ 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):
- physdev = execute("bridge -o link show | awk '/master %s / && !/^[0-9]+: vnet/ {print $2}' | head -1 | cut -d ':' -f1" % 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)
Review comment:
just note - we need to regression test CentOS7, CentOS8 and Ubuntu with SG to check/test this (manual test should be okay as well)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869655650
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-864761819
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869583146
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 393
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867387082
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900801868
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-898946129
<b>Trillian test result (tid-1637)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 35879 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1637-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 87 look OK, 2 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_migrate_VM_and_root_volume | `Error` | 70.47 | test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks | `Error` | 48.24 | test_vm_life_cycle.py
test_hostha_enable_ha_when_host_in_maintenance | `Error` | 304.85 | test_hostha_kvm.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-866523745
@davidjumani a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-872942609
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-897394801
@rhtyd a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-873541679
@davidjumani please have a look at https://github.com/apache/cloudstack/pull/5110#discussion_r663463852 ... except this small comment - great work :+1:
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861397624
> Maybe a more generell discussion, but we call it already only SUSE support, since upcoming openSUSE Leap 15.3 and SLES 15.3 will be official 100% compatible to each other (_but from our observations already 15.2 is compatible in scope of needed dependencies for CloudStack_) and those "SUSE support" will include openSUSE Leap and SLES. Or should we still differ between "openSUSE Leap" and "SUSE Linux Enterprise Server" support in CloudStack?
Good point, I'll rename it to suse
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660429637
##########
File path: packaging/suse/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
Review comment:
@davidjumani is this file used somehow/where?
##########
File path: packaging/suse/cloud.spec
##########
@@ -0,0 +1,641 @@
+# 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 <de...@cloudstack.apache.org>
+Packager: Apache CloudStack <de...@cloudstack.apache.org>
+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/cloudstack-rolling-maintenance@.service ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-rolling-maintenance@.service
+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}-rolling-maintenance@.service
+%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
+* Thu Apr 30 2015 Rohit Yadav <bh...@apache.org> 4.6.0
Review comment:
@davidjumani add your new log here
##########
File path: packaging/suse/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;
Review comment:
@davidjumani what's the purpose of this file?
##########
File path: packaging/suse/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
Review comment:
Check if we bundle/have this at all?
##########
File path: python/lib/cloud_utils.py
##########
@@ -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):
Review comment:
Is this not used at all, or some refactorings were made in other parts/changes?
##########
File path: scripts/vm/network/security_group.py
##########
@@ -185,7 +185,9 @@ 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):
- physdev = execute("bridge -o link show | awk '/master %s / && !/^[0-9]+: vnet/ {print $2}' | head -1 | cut -d ':' -f1" % 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)
Review comment:
just note - we need to regression test CentOS7, CentOS8 and Ubuntu with SG to check/test this (manual test should be okay as well)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868955127
<b>Trillian test result (tid-1102)</b>
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 72731 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1102-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_network.py
Intermittent failure detected: /marvin/tests/smoke/test_password_server.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 82 look OK, 6 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_isolate_network_password_server | `Failure` | 13.58 | test_password_server.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Failure` | 671.85 | test_internal_lb.py
test_01_invalid_upgrade_kubernetes_cluster | `Failure` | 3617.36 | test_kubernetes_clusters.py
test_02_deploy_and_upgrade_kubernetes_cluster | `Failure` | 3611.00 | test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster | `Failure` | 0.05 | test_kubernetes_clusters.py
test_04_basic_lifecycle_kubernetes_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster | `Failure` | 0.06 | test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 138.95 | test_kubernetes_clusters.py
test_router_dhcphosts | `Failure` | 227.79 | test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPHosts>:teardown | `Error` | 242.19 | test_router_dhcphosts.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 420.62 | test_routers_network_ops.py
test_03_RVR_Network_check_router_state | `Error` | 101.33 | test_routers_network_ops.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 656.13 | test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 561.58 | test_vpc_redundant.py
test_05_rvpc_multi_tiers | `Failure` | 580.12 | test_vpc_redundant.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861417586
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-898866462
@rhtyd a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-898946846
@rhtyd a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861396419
Thanks @mib1185 I'll add the changes and run a round of tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869655158
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-872966071
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 458
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660445643
##########
File path: packaging/suse/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;
Review comment:
Was used in c8 packaging :D
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-864761819
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869673525
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 396
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861416318
Packaging result: :heavy_multiplication_x: centos7 :heavy_multiplication_x: centos8 :heavy_check_mark: debian. SL-JID 238
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861397479
> SLES
Good point, I'll rename it to suse
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894231756
>
>
> @vladimirpetrov - where are the results for this:
>
> _Smoke test results (Suse mgmt + suse KVM):
> 88 look ok, 0 have errors
>
> ```
> C7 MS + Suse KVM Agent - OK
> Suse MS + Suse KVM Agent - OK
> Suse MS + C7 KVM Agent - OK
> Suse MS + VMware 6.7u3 / 7.0 - OK / OK
> Suse MS + XCPNG 8.2 / LTS - OK_
> ```
>
> i.e. why are not visible here, publicly? (ping me offline if needed) - thx
tests were run "in house" for specific reasons - but are LGTM:
_Build #1305 - FR140-opensuse-smoketest (Jul 8, 2021 2:58:54 PM)
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 88 look OK, 0 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---_
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900810668
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_multiplication_x: suse15. SL-JID 900
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-897394385
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-895642928
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-895640787
<b>Trillian test result (tid-1539)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 59103 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1539-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 83 look OK, 6 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_07_deploy_kubernetes_ha_cluster | `Failure` | 3631.12 | test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 0.06 | test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 40.88 | test_kubernetes_clusters.py
test_04_rvpc_privategw_static_routes | `Failure` | 522.65 | test_privategw_acl.py
test_01_isolate_network_FW_PF_default_routes_egress_true | `Failure` | 121.38 | test_routers_network_ops.py
test_01_migrate_VM_and_root_volume | `Error` | 81.84 | test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks | `Error` | 56.51 | test_vm_life_cycle.py
test_10_attachAndDetach_iso | `Error` | 12.35 | test_vm_life_cycle.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 559.50 | test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 509.19 | test_vpc_redundant.py
test_hostha_enable_ha_when_host_in_maintenance | `Error` | 301.77 | test_hostha_kvm.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876119566
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-870438685
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869636841
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869637199
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861396612
Maybe a more generell discussion, but we call it already only SUSE support, since upcoming openSUSE Leap 15.3 and SLES 15.3 will be official 100% compatible to each other (_but from our observations already 15.2 is compatible in scope of needed dependencies for CloudStack_) and those "SUSE support" will include openSUSE Leap and SLES. Or should we still differ between "openSUSE Leap" and "SUSE Linux Enterprise Server" support in CloudStack?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869655158
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-871531641
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-866558841
<b>Trillian Build Failed (tid-1047)<b/>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867075795
<b>Trillian test result (tid-1049)</b>
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 45429 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1049-vmware-65u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_outofbandmanagement.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 85 look OK, 3 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Failure` | 917.43 | test_internal_lb.py
ContextSuite context=TestOutOfBandManagement>:setup | `Error` | 0.00 | test_outofbandmanagement.py
test_01_migrate_VM_and_root_volume | `Error` | 124.98 | test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks | `Error` | 113.63 | test_vm_life_cycle.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on a change in pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r651628126
##########
File path: packaging/centos8/cloud.spec
##########
@@ -96,21 +97,22 @@ The Apache CloudStack files shared between agent and management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
-Requires: openssh-clients
+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
Review comment:
This package is needed for `python/lib/cloudutils/networkConfig.py` , since there are quite old tools `ifconfig` and `route` used, which were already replaced by modern `ip` command since many years, those IMHO honestly would recommend to adjust `networkConfig.py` to use `ip` command and not to install a deprecated called package 🙂
(_see 623ddd82d7bb87709f04fc42ed52c0d082846256_)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900824779
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 901
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900933320
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894098977
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-897443739
>
>
> LGTM based on manual and automatic tests.
automatic tests are failing miserably, so we cant LGMT-it until they pass with same "score" as the master branch (I understand this is local lab issue - but other won't understand/know this, by browsing the PR test results)
No LGTM until tests show no errors (or just the known ones)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867401017
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 348
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894139751
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900801868
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r663463852
##########
File path: python/lib/cloudutils/utilities.py
##########
@@ -134,17 +134,23 @@ def __init__(self):
self.distro = "Ubuntu"
else:
raise UnknownSystemException(distributor)
- else:
+ elif os.path.exists("/etc/os-release"):
+ version = open("/etc/os-release").readline()
+ if version.find("openSUSE") != -1:
+ self.distro = "openSUSE"
+ else:
+ raise UnknownSystemException(distributor)
Review comment:
@davidjumani you still need to remove this, since `distributor` is not defined and those would raise an additional `NameError` exception, but not the expected `UnknownSystemException`
```
>>> raise UnknownSystemException(distributor)
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
NameError: name 'distributor' is not defined
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660431007
##########
File path: python/lib/cloud_utils.py
##########
@@ -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):
Review comment:
Is this not used at all, or some refactorings were made in other parts/changes?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868399015
@davidjumani a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900813505
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876535881
<b>Trillian test result (tid-1217)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 34671 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1217-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 87 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_hostha_enable_ha_when_host_disabled | `Error` | 3.58 | test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenance | `Error` | 302.71 | test_hostha_kvm.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-893316244
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876118283
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868345168
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 368
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869547850
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876137037
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 494
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861401476
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867386994
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani removed a comment on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
davidjumani removed a comment on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861397479
> SLES
Good point, I'll rename it to suse
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861401769
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900835349
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867030423
<b>Trillian test result (tid-1048)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 41561 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1048-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_primary_storage.py
Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 85 look OK, 3 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_add_primary_storage_disabled_host | `Error` | 0.54 | test_primary_storage.py
test_01_primary_storage_nfs | `Error` | 0.10 | test_primary_storage.py
ContextSuite context=TestStorageTags>:setup | `Error` | 0.16 | test_primary_storage.py
test_02_list_snapshots_with_removed_data_store | `Error` | 1.14 | test_snapshots.py
test_01_secure_vm_migration | `Error` | 147.95 | test_vm_life_cycle.py
test_02_unsecure_vm_migration | `Error` | 268.91 | test_vm_life_cycle.py
test_03_secured_to_nonsecured_vm_migration | `Error` | 140.58 | test_vm_life_cycle.py
test_08_migrate_vm | `Error` | 44.67 | test_vm_life_cycle.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb edited a comment on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb edited a comment on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894243646
I would be happy to see the last run that @davidjumani initiated, show no failures/acceptable failures, and then LGTM this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660430419
##########
File path: packaging/suse/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
Review comment:
Check if we bundle/have this at all?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-895643048
@andrijapanicsb a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867310610
@davidjumani a Trillian-Jenkins test job (centos7 mgmt + xenserver-71) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868357213
@davidjumani a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-862112432
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869423434
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 388
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd merged pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd merged pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900964862
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-862112024
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900802225
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876907655
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876138065
@davidjumani a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894098741
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894098614
@andrijapanicsb Env related, can be ignored but will kick them again
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660435876
##########
File path: python/lib/cloud_utils.py
##########
@@ -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):
Review comment:
Removed unused code
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867378448
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867380573
<b>Trillian Build Failed (tid-1080)<b/>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on a change in pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r651628126
##########
File path: packaging/centos8/cloud.spec
##########
@@ -96,21 +97,22 @@ The Apache CloudStack files shared between agent and management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
-Requires: openssh-clients
+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
Review comment:
This package is needed for `python/lib/cloudutils/networkConfig.py` , since there are quite old tools `ifconfig` and `route` used, which were already replaced by modern `ip` command since many years, those IMHO honestly would recommend to adjust `networkConfig.py` to use `ip` command and not to install a deprecated called package 🙂
Will create a PR with needed changes of `networkConfig.py` on your fork/branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900813760
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-873011215
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-892803973
@andrijapanicsb a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876116829
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 492
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-892803711
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-866523559
@blueorangutan test matrix
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on a change in pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r651672329
##########
File path: packaging/centos8/cloud.spec
##########
@@ -96,21 +97,22 @@ The Apache CloudStack files shared between agent and management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
-Requires: openssh-clients
+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
Review comment:
@mib1185 Agreed but that would change a lot of things which would require testing the changes on other hypervisors as well, which can be done in another PR
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-873313108
<b>Trillian test result (tid-1195)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 36500 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1195-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 87 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_hostha_enable_ha_when_host_disabled | `Error` | 5.79 | test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenance | `Error` | 304.75 | test_hostha_kvm.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-870207761
@davidjumani a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869653946
Packaging result: :heavy_multiplication_x: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 395
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] vladimirpetrov commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
vladimirpetrov commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-893297852
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869653946
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-873011494
@davidjumani a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-901694716
Env related issues, good to merge
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-899002608
<b>Trillian test result (tid-1639)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 38931 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1639-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 87 look OK, 2 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 72.02 | test_kubernetes_clusters.py
test_01_migrate_VM_and_root_volume | `Error` | 71.76 | test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks | `Error` | 49.22 | test_vm_life_cycle.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869402694
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660435645
##########
File path: scripts/vm/network/security_group.py
##########
@@ -185,7 +185,9 @@ 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):
- physdev = execute("bridge -o link show | awk '/master %s / && !/^[0-9]+: vnet/ {print $2}' | head -1 | cut -d ':' -f1" % 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)
Review comment:
Tested, on c7, ubuntu, no issues
##########
File path: python/lib/cloud_utils.py
##########
@@ -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):
Review comment:
Removed unused code
##########
File path: packaging/suse/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
Review comment:
Was used in c8 packaging :D
##########
File path: packaging/suse/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;
Review comment:
Was used in c8 packaging :D
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-892803973
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-871509218
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on a change in pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r651472114
##########
File path: packaging/centos8/cloud.spec
##########
@@ -64,23 +64,24 @@ Requires: bzip2
Requires: gzip
Requires: unzip
Requires: /sbin/mount.nfs
-Requires: openssh-clients
+Requires: openssh
Review comment:
Using Centos8 as a placeholder until the PR is ready
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900965034
@davidjumani a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660444021
##########
File path: packaging/suse/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
Review comment:
Was used in c8 packaging :D
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-870435216
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian :heavy_check_mark: suse. SL-JID 414
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876104574
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-893315360
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 760
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-898946740
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861440511
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 239
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894138261
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 782
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894140131
@davidjumani a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-864762419
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-870207477
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894243646
I would be happy to see the last run that @davidjumani initiated, show now/acceptable failures, and then LGTM this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867794854
<b>Trillian test result (tid-1073)</b>
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 45341 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1073-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_domain_vpc_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_outofbandmanagement.py
Intermittent failure detected: /marvin/tests/smoke/test_password_server.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_deployment_planner.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 85 look OK, 3 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 107.79 | test_kubernetes_clusters.py
ContextSuite context=TestOutOfBandManagement>:setup | `Error` | 0.00 | test_outofbandmanagement.py
test_03_ssvm_internals | `Failure` | 0.33 | test_ssvm.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869402511
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-871532045
@davidjumani a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-895017021
@andrijapanicsb a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876117972
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-862130861
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 245
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867378798
@davidjumani a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868356950
@blueorangutan test matrix
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] vladimirpetrov commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
vladimirpetrov commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-892852264
Feature LGTM, here is what have been tested:
Smoke test results (Suse mgmt + suse KVM):
88 look ok, 0 have errors
Manual tests performed:
console proxy on system and regular VMs - OK
deploy a VM from a default template, uploaded template and ISO image - OK
VM operations: reboot, stop/start on another host, reinstall, create/revert snapshot, move to another host, attach/detach ISO, recover, expunge - OK
volume operations: resize, migrate, destroy/recover, attach disk, create/revert snapshot, create template from snapshot - OK
storages: add/remove primary and secondary storage, mark secondary storage read-only and back - OK
system VMs operations: start/stop, reboot, migrate, get diag. data, run diagnostics, destroy - OK
outbound traffic: add/remove egress rules to VM network to allow outbound traffic - OK
inbound traffic: add/remove firewall and port-forwarding rules to allow inbound connections - OK
usage server: make sure the usage service is gathering usage data - OK
roles: deploy a VM, create a network as regular user - OK
VM network operations: add/remove network to VM, add/remove secondary IP address, change IP address, set default NIC root - OK
hosts: add/remove, enable/disable a host, enable/disable maintenance mode - OK
Basic zone with shared storage - Zone deployment + basic VM / template / network / storage lifecycle - OK
Basic zone with local storage - Zone deployment + basic VM / template / network / storage lifecycle - OK
Advanced zone without SG and with shared storage - 100% Smoke Tests - OK
Advanced zone without SG and with local storage - Smoke Tests - OK
Other combinations: VLAN, VXLAN, config drive - OK
Storage: Local, NFS - OK
Test Matrix : (Trillian combinations)
- C7 MS + Suse KVM Agent - OK
- Suse MS + Suse KVM Agent - OK
- Suse MS + C7 KVM Agent - OK
- Suse MS + VMware 6.7u3 / 7.0 - OK / OK
- Suse MS + XCPNG 8.2 / LTS - OK
Support for packaging and testing with BO (should be quick if jenkins jobs exist) - OK
Upstream docs with updates to installation and QIG sections - OK
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-893512631
@vladimirpetrov - where are the results for this:
_Smoke test results (Suse mgmt + suse KVM):
88 look ok, 0 have errors
C7 MS + Suse KVM Agent - OK
Suse MS + Suse KVM Agent - OK
Suse MS + C7 KVM Agent - OK
Suse MS + VMware 6.7u3 / 7.0 - OK / OK
Suse MS + XCPNG 8.2 / LTS - OK_
i.e. why are not visible here, publicly? (ping me offline if needed) - thx
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876104874
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-871530391
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian :heavy_check_mark: suse. SL-JID 434
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900960780
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 905
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868321640
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-870439117
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868957351
<b>Trillian test result (tid-1104)</b>
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 74158 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1104-vmware-65u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 82 look OK, 6 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_03_vpc_privategw_restart_vpc_cleanup | `Error` | 498.45 | test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup | `Error` | 498.48 | test_privategw_acl.py
test_01_invalid_upgrade_kubernetes_cluster | `Failure` | 3608.66 | test_kubernetes_clusters.py
test_02_deploy_and_upgrade_kubernetes_cluster | `Failure` | 3610.47 | test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster | `Failure` | 0.06 | test_kubernetes_clusters.py
test_04_basic_lifecycle_kubernetes_cluster | `Failure` | 0.05 | test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster | `Failure` | 0.05 | test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster | `Failure` | 0.05 | test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 0.05 | test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 43.75 | test_kubernetes_clusters.py
test_01_isolate_network_FW_PF_default_routes_egress_true | `Failure` | 236.93 | test_routers_network_ops.py
test_02_isolate_network_FW_PF_default_routes_egress_false | `Error` | 146.77 | test_routers_network_ops.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 457.69 | test_routers_network_ops.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Failure` | 421.59 | test_routers_network_ops.py
test_01_migrate_VM_and_root_volume | `Error` | 121.08 | test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks | `Error` | 88.77 | test_vm_life_cycle.py
test_change_service_offering_for_vm_with_snapshots | `Error` | 238.20 | test_vm_snapshots.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 616.66 | test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Error` | 616.68 | test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 683.74 | test_vpc_redundant.py
test_05_rvpc_multi_tiers | `Failure` | 567.19 | test_vpc_redundant.py
test_05_rvpc_multi_tiers | `Error` | 567.21 | test_vpc_redundant.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868888524
<b>Trillian test result (tid-1105)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 47409 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1105-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Smoke tests completed. 87 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_invalid_upgrade_kubernetes_cluster | `Failure` | 3611.62 | test_kubernetes_clusters.py
test_02_deploy_and_upgrade_kubernetes_cluster | `Failure` | 3612.76 | test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster | `Failure` | 0.05 | test_kubernetes_clusters.py
test_04_basic_lifecycle_kubernetes_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 84.50 | test_kubernetes_clusters.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-864774660
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 309
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-893316547
@andrijapanicsb a Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r663464728
##########
File path: python/lib/cloudutils/utilities.py
##########
@@ -134,17 +134,23 @@ def __init__(self):
self.distro = "Ubuntu"
else:
raise UnknownSystemException(distributor)
- else:
+ elif os.path.exists("/etc/os-release"):
+ version = open("/etc/os-release").readline()
+ if version.find("openSUSE") != -1:
+ self.distro = "openSUSE"
+ else:
+ raise UnknownSystemException(distributor)
Review comment:
```suggestion
else:
distributor=`grep -e "^NAME=" /etc/os-release | awk -F\" '{print $2}'`
raise UnknownSystemException(distributor)
```
maybe better suggestion is to get `distributor` from `/etc/os-release`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868867285
<b>Trillian test result (tid-1103)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 45225 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1103-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Smoke tests completed. 87 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_invalid_upgrade_kubernetes_cluster | `Failure` | 3613.63 | test_kubernetes_clusters.py
test_02_deploy_and_upgrade_kubernetes_cluster | `Failure` | 3608.39 | test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster | `Failure` | 0.06 | test_kubernetes_clusters.py
test_04_basic_lifecycle_kubernetes_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster | `Failure` | 0.06 | test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 93.44 | test_kubernetes_clusters.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660435645
##########
File path: scripts/vm/network/security_group.py
##########
@@ -185,7 +185,9 @@ 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):
- physdev = execute("bridge -o link show | awk '/master %s / && !/^[0-9]+: vnet/ {print $2}' | head -1 | cut -d ':' -f1" % 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)
Review comment:
Tested, on c7, ubuntu, no issues
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868321232
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-893298656
@vladimirpetrov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-894079358
@davidjumani may I kindly ask you to check the failures please. cc @vladimirpetrov
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on a change in pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r651619054
##########
File path: packaging/centos8/cloud.spec
##########
@@ -96,21 +97,22 @@ The Apache CloudStack files shared between agent and management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
-Requires: openssh-clients
+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
-Requires: qemu-img
+Requires: python3-libvirt-python
Requires: qemu-kvm
-Requires: libgcrypt > 1.8.3
+Requires: qemu-tools
Review comment:
```suggestion
Requires: libgcrypt20
Requires: qemu-tools
```
`libgcrypt` is replaced by `libgcrypt20`
##########
File path: packaging/centos8/cloud.spec
##########
@@ -96,21 +97,22 @@ The Apache CloudStack files shared between agent and management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
-Requires: openssh-clients
+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
Review comment:
This package is needed for `python/lib/cloudutils/networkConfig.py` , since there are quite old tools `ifconfig` and `route` used, which were already replaced by modern `ip` command since many years, those IMHO honestly would recommend to adjust `networkConfig.py` to use `ip` command and not to install a deprecated called package 🙂
##########
File path: packaging/centos8/cloud.spec
##########
@@ -64,23 +64,24 @@ Requires: bzip2
Requires: gzip
Requires: unzip
Requires: /sbin/mount.nfs
-Requires: openssh-clients
+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: genisoimage
+# Requires: genisoimage -> renamed to mkisofs
Requires: ipmitool
Requires: %{name}-common = %{_ver}
-Requires: iptables-services
-Requires: qemu-img
+# Requires: iptables-services
+Requires: qemu-tools
Requires: python3-pip
Requires: python3-setuptools
-Requires: libgcrypt > 1.8.3
+# Requires: libgcrypt > 1.8.3
Review comment:
```suggestion
Requires: libgcrypt20
```
`libgcrypt` is replaced by `libgcrypt20`
##########
File path: packaging/centos8/cloud.spec
##########
@@ -64,23 +64,24 @@ Requires: bzip2
Requires: gzip
Requires: unzip
Requires: /sbin/mount.nfs
-Requires: openssh-clients
+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: genisoimage
+# Requires: genisoimage -> renamed to mkisofs
Review comment:
```suggestion
# Requires: genisoimage -> renamed to mkisofs
Requires: mkisofs
```
Maybe needs still to be installed 🤔
##########
File path: scripts/vm/hypervisor/versions.sh
##########
@@ -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=`cat /etc/os-release | grep NAME | head -n 1 | tr "\n" ' ' | tr -d '"' | sed s/.*=//`
+ REV=`cat /etc/os-release | grep VERSION_ID | tr "\n" ' ' | tr -d '"' | sed s/.*=//`
+ CODENAME=`cat /etc/os-release | grep PRETTY_NAME | tr "\n" ' ' | tr -d '"' | sed s/.*=//`
Review comment:
```suggestion
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}'`
```
IMHO this looks more clean to me
##########
File path: python/lib/cloudutils/utilities.py
##########
@@ -134,17 +134,23 @@ def __init__(self):
self.distro = "Ubuntu"
else:
raise UnknownSystemException(distributor)
- else:
+ elif os.path.exists("/etc/os-release"):
+ version = open("/etc/os-release").readline()
+ if version.find("openSUSE") != -1:
+ self.distro = "openSUSE"
+ else:
+ raise UnknownSystemException(distributor)
Review comment:
```suggestion
```
since `distributor` is not set and those `raise` from two lines below will be enough
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-900071715
@davidjumani would kind confirming that the 3 failed tests are due to e.g. DNS resolution issue on the lab where the tests are running, i.e. NOT related to this PR - so that we can merge it?
I can't Approve the request (myself) until we have clear understanding on the root cause of tests failures
Thanks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660429935
##########
File path: packaging/suse/cloud.spec
##########
@@ -0,0 +1,641 @@
+# 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 <de...@cloudstack.apache.org>
+Packager: Apache CloudStack <de...@cloudstack.apache.org>
+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/cloudstack-rolling-maintenance@.service ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-rolling-maintenance@.service
+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}-rolling-maintenance@.service
+%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
+* Thu Apr 30 2015 Rohit Yadav <bh...@apache.org> 4.6.0
Review comment:
@davidjumani add your new log here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876137730
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-895016802
last tests failed.
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-867310261
@blueorangutan test centos7 xenserver-71
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r651777082
##########
File path: packaging/centos8/cloud.spec
##########
@@ -96,21 +97,22 @@ The Apache CloudStack files shared between agent and management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
-Requires: openssh-clients
+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
Review comment:
yeah ok, this is a valid argument 🙂
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-869352285
@mib1185 Can you review / test / verify ? Thanks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660430261
##########
File path: packaging/suse/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;
Review comment:
@davidjumani what's the purpose of this file?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861242652
> Hi @davidjumani
> we are also working on SUSE 15 support (_for now focused on common and agent_).
> Maybe we can combine our efforts (_see our progress here [NDBSGMS#2](https://github.com/NDBSGMS/cloudstack/pull/2)_)
> Additional we will also add SUSE15 support to [cloudstack-rpm-builder](https://github.com/khos2ow/cloudstack-rpm-builder) (_see [NDBSGMS/cloudstack-rpm-builder#1](https://github.com/NDBSGMS/cloudstack-rpm-builder/pull/1)_)
Hi @mib1185 that sounds like a good idea, So far opensuse is working as an agent, I've tested it against basic / adv zones and smoke tests are passing. Right now I'm testing it with ovs and dpdk. It will be great if you can review / update stuff that needs changes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-871510091
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-868398853
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
davidjumani commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876119185
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-893868581
<b>Trillian test result (tid-1486)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 45775 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1486-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 87 look OK, 2 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_migrate_VM_and_root_volume | `Error` | 71.32 | test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks | `Error` | 48.15 | test_vm_life_cycle.py
test_hostha_enable_ha_when_host_disabled | `Error` | 0.65 | test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenance | `Error` | 304.10 | test_hostha_kvm.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-864762419
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-872943121
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-870483508
Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian :heavy_check_mark: suse. SL-JID 416
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-901279987
<b>Trillian test result (tid-1687)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 38335 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1687-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Smoke tests completed. 88 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 69.91 | test_kubernetes_clusters.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] vladimirpetrov commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
vladimirpetrov commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-892852264
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-870739684
<b>Trillian test result (tid-1140)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 42506 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1140-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Smoke tests completed. 87 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_07_deploy_kubernetes_ha_cluster | `Failure` | 3608.06 | test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 0.07 | test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster | `Failure` | 0.05 | test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 102.64 | test_kubernetes_clusters.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 edited a comment on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
mib1185 edited a comment on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861234772
Hi @davidjumani
we are also working on SUSE 15 support (_for now focused on common and agent_).
Maybe we can combine our efforts (_see our progress here NDBSGMS/cloudstack#2_)
Additional we will also add SUSE15 support to [cloudstack-rpm-builder](https://github.com/khos2ow/cloudstack-rpm-builder) (_see NDBSGMS/cloudstack-rpm-builder#1_)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#discussion_r660429637
##########
File path: packaging/suse/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
Review comment:
@davidjumani is this file used somehow/where?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-892803711
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-901440350
<b>Trillian test result (tid-1692)</b>
Environment: kvm-suse15 (x2), Advanced Networking with Mgmt server s15
Total time taken: 41385 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5110-t1692-kvm-suse15.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 88 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_hostha_enable_ha_when_host_disabled | `Error` | 2.61 | test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenance | `Error` | 304.84 | test_hostha_kvm.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-898866372
@blueorangutan test suse15 kvm-suse15
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-897407273
<b>Trillian Build Failed (tid-1617)<b/>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] andrijapanicsb edited a comment on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
andrijapanicsb edited a comment on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-897443739
>
>
> LGTM based on manual and automatic tests.
automatic tests are failing miserably, so we cant LGMT-it until they pass with same "score" as the master branch (I understand this is local lab issue - but others won't understand/know this, by browsing the PR test results)
No LGTM until tests show no errors (or just the known ones)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] mib1185 commented on pull request #5110: Opensuse support
Posted by GitBox <gi...@apache.org>.
mib1185 commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-861234772
Hi @davidjumani
we are also working on SUSE 15 support (_for now focused on common and agent_).
Maybe we can combine our efforts (_see our progress here NDBSGMS/cloudstack#2_)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #5110: Adding SUSE 15 support
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5110:
URL: https://github.com/apache/cloudstack/pull/5110#issuecomment-876907719
@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org