Skip to content

Commit a289bb0

Browse files
Update suse15 packaging spec, use qemu-ovmf-x86_64 package instead of edk2-ovmf for agent (#13133)
* Update qemu-ovmf-x86_64 package in agent for suse instead of edk2-ovmf for agent * Maintain separate properties file for suse15 (UEFI properties are different for suse15) * Maintain separate packaging spec for suse15
1 parent 470e959 commit a289bb0

9 files changed

Lines changed: 821 additions & 2 deletions

File tree

packaging/el8/cloud.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Requires: ipset
117117
Requires: perl
118118
Requires: rsync
119119
Requires: cifs-utils
120-
Requires: edk2-ovmf
120+
Requires: (edk2-ovmf or qemu-ovmf-x86_64)
121121
Requires: swtpm
122122
Requires: (python3-libvirt or python3-libvirt-python)
123123
Requires: (qemu-img or qemu-tools)

packaging/suse15

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../el8/cloud-ipallocator.rc

packaging/suse15/cloud.limits

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../el8/cloud.limits

packaging/suse15/cloud.spec

Lines changed: 750 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../el8/cloudstack-agent.te

packaging/suse15/cloudstack-sccs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../el8/cloudstack-sccs

packaging/suse15/filelimit.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../el8/filelimit.conf
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
DBUSER=cloud
19+
DBPW=cloud
20+
DBROOTPW=
21+
MSLOG=vmops.log
22+
APISERVERLOG=api.log
23+
DBHOST=localhost
24+
DBDRIVER=jdbc:mysql
25+
COMPONENTS-SPEC=components-premium.xml
26+
REMOTEHOST=localhost
27+
AGENTCLASSPATH=
28+
AGENTLOG=/var/log/cloudstack/agent/agent.log
29+
AGENTLOGDIR=/var/log/cloudstack/agent/
30+
AGENTSYSCONFDIR=/etc/cloudstack/agent
31+
APISERVERLOG=/var/log/cloudstack/management/apilog.log
32+
BINDIR=/usr/bin
33+
COMMONLIBDIR=/usr/share/cloudstack-common
34+
CONFIGUREVARS=
35+
DEPSCLASSPATH=
36+
DOCDIR=
37+
IPALOCATORLOG=/var/log/cloudstack/management/ipallocator.log
38+
JAVADIR=/usr/share/java
39+
LIBEXECDIR=/usr/libexec
40+
LOCKDIR=/var/lock
41+
MSCLASSPATH=
42+
MSCONF=/etc/cloudstack/management
43+
MSENVIRON=/usr/share/cloudstack-management
44+
MSLOG=/var/log/cloudstack/management/management-server.log
45+
MSLOGDIR=/var/log/cloudstack/management/
46+
MSMNTDIR=/var/cloudstack/mnt
47+
MSUSER=cloud
48+
PIDDIR=/var/run
49+
PLUGINJAVADIR=/usr/share/cloudstack-management/plugin
50+
PREMIUMJAVADIR=/usr/share/cloudstack-management/premium
51+
PYTHONDIR=/usr/share/cloudstack-common/python-site/
52+
SERVERSYSCONFDIR=/etc/sysconfig
53+
SETUPDATADIR=/usr/share/cloudstack-management/setup
54+
SYSCONFDIR=/etc/sysconfig
55+
SYSTEMCLASSPATH=
56+
SYSTEMJARS=
57+
USAGECLASSPATH=
58+
USAGELOG=/var/log/cloudstack/usage/usage.log
59+
USAGESYSCONFDIR=/etc/sysconfig
60+
EXTENSIONSDEPLOYMENTMODE=production
61+
GUESTNVRAMTEMPLATELEGACY=/usr/share/qemu/ovmf-x86_64-vars.bin
62+
GUESTLOADERLEGACY=/usr/share/qemu/ovmf-x86_64-code.bin
63+
GUESTNVRAMTEMPLATESECURE=/usr/share/qemu/ovmf-x86_64-ms-vars.bin
64+
GUESTLOADERSECURE=/usr/share/qemu/ovmf-x86_64-ms-code.bin
65+
GUESTNVRAMPATH=/var/lib/libvirt/qemu/nvram/

0 commit comments

Comments
 (0)