* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/files/
@ 2016-11-29 0:54 Matt Thode
0 siblings, 0 replies; 7+ messages in thread
From: Matt Thode @ 2016-11-29 0:54 UTC (permalink / raw
To: gentoo-commits
commit: 6f6750a4a9db5baeb5b324166a56ad63b18a1e1f
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 00:52:58 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 00:53:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f6750a4
sys-cluster/nova: make init posix again, and a comment to a conf file
Package-Manager: portage-2.3.0
sys-cluster/nova/files/nova-compute.conf | 2 ++
sys-cluster/nova/files/nova.initd | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/nova/files/nova-compute.conf b/sys-cluster/nova/files/nova-compute.conf
index b006794..59c7aea 100644
--- a/sys-cluster/nova/files/nova-compute.conf
+++ b/sys-cluster/nova/files/nova-compute.conf
@@ -1,2 +1,4 @@
[DEFAULT]
+# mkisofs_cmd is needed as the default provider for the binary was remvoed as
+# a package from Gentoo.
mkisofs_cmd = /usr/bin/mkisofs
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd
index a1ba549..310a65b 100644
--- a/sys-cluster/nova/files/nova.initd
+++ b/sys-cluster/nova/files/nova.initd
@@ -9,7 +9,7 @@ command_background=yes
pidfile=/var/run/nova/${SVCNAME}.pid
required_files=/etc/nova/nova.conf
start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova} --config-file /etc/nova/nova.conf"
-if [[ "$SVCNAME" == nova-compute ]]; then
+if [ "$SVCNAME" == nova-compute ]; then
required_files="${required_files} /etc/nova/nova-compute.conf"
start_stop_daemon_args="${start_stop_daemon_args} --config-file /etc/nova/nova-compute.conf"
fi
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/files/
@ 2016-11-30 5:51 Matt Thode
0 siblings, 0 replies; 7+ messages in thread
From: Matt Thode @ 2016-11-30 5:51 UTC (permalink / raw
To: gentoo-commits
commit: b7200b07d00c27cff4de1e4422cbdab76f176bf7
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 05:51:37 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 05:51:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7200b07
sys-cluster/nova: fixing nova.initd
Package-Manager: portage-2.3.0
sys-cluster/nova/files/nova.initd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd
index 310a65b..a75a33c 100644
--- a/sys-cluster/nova/files/nova.initd
+++ b/sys-cluster/nova/files/nova.initd
@@ -8,7 +8,7 @@ command=/usr/bin/${SVCNAME}
command_background=yes
pidfile=/var/run/nova/${SVCNAME}.pid
required_files=/etc/nova/nova.conf
-start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova} --config-file /etc/nova/nova.conf"
+start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova} -- --config-file /etc/nova/nova.conf"
if [ "$SVCNAME" == nova-compute ]; then
required_files="${required_files} /etc/nova/nova-compute.conf"
start_stop_daemon_args="${start_stop_daemon_args} --config-file /etc/nova/nova-compute.conf"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/files/
@ 2016-11-30 6:32 Matt Thode
0 siblings, 0 replies; 7+ messages in thread
From: Matt Thode @ 2016-11-30 6:32 UTC (permalink / raw
To: gentoo-commits
commit: 9e99199229c29dc1ffaa1539cd6e80b12e5ecb68
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 06:30:03 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 06:30:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e991992
sys-cluster/nova: fixing init for realz
Package-Manager: portage-2.3.0
sys-cluster/nova/files/nova.initd | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd
index a75a33c..2edbed9 100644
--- a/sys-cluster/nova/files/nova.initd
+++ b/sys-cluster/nova/files/nova.initd
@@ -4,14 +4,13 @@
description="Starts ${SVCNAME} service for OpenStack"
-command=/usr/bin/${SVCNAME}
-command_background=yes
+command="/usr/bin/${SVCNAME} -- --config-file /etc/nova/nova.conf"
pidfile=/var/run/nova/${SVCNAME}.pid
required_files=/etc/nova/nova.conf
-start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova} -- --config-file /etc/nova/nova.conf"
+start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova}"
if [ "$SVCNAME" == nova-compute ]; then
required_files="${required_files} /etc/nova/nova-compute.conf"
- start_stop_daemon_args="${start_stop_daemon_args} --config-file /etc/nova/nova-compute.conf"
+ command="${command} --config-file /etc/nova/nova-compute.conf"
fi
@@ -23,3 +22,9 @@ start_pre() {
checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/run/nova}
checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova}
}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon -S -b -p ${pidfile} -q -u ${NOVA_USER:-nova} -x ${command}
+ eend $?
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/files/
@ 2016-11-30 6:43 Matt Thode
0 siblings, 0 replies; 7+ messages in thread
From: Matt Thode @ 2016-11-30 6:43 UTC (permalink / raw
To: gentoo-commits
commit: 58884e60d3ceffa8825821334a497b0bc6afd87a
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 06:43:04 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 06:43:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58884e60
sys-cluster/nova: make the pid file
Package-Manager: portage-2.3.0
sys-cluster/nova/files/nova.initd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd
index 2edbed9..7d679ed 100644
--- a/sys-cluster/nova/files/nova.initd
+++ b/sys-cluster/nova/files/nova.initd
@@ -25,6 +25,6 @@ start_pre() {
start() {
ebegin "Starting ${SVCNAME}"
- start-stop-daemon -S -b -p ${pidfile} -q -u ${NOVA_USER:-nova} -x ${command}
+ start-stop-daemon -S -b -m -p ${pidfile} -q -u ${NOVA_USER:-nova} -x ${command}
eend $?
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/files/
@ 2017-09-18 4:55 Matt Thode
0 siblings, 0 replies; 7+ messages in thread
From: Matt Thode @ 2017-09-18 4:55 UTC (permalink / raw
To: gentoo-commits
commit: e744634aaff291e3ed175678f235a6cbe97459b5
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 04:54:41 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 04:55:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e744634a
sys-cluster/nova: updating nova init again
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-cluster/nova/files/nova.initd-2 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sys-cluster/nova/files/nova.initd-2 b/sys-cluster/nova/files/nova.initd-2
index 8f53ec2e952..cb82c947ddf 100644
--- a/sys-cluster/nova/files/nova.initd-2
+++ b/sys-cluster/nova/files/nova.initd-2
@@ -6,7 +6,7 @@ description="Starts ${SVCNAME} service for OpenStack"
command="/usr/bin/${SVCNAME}"
command_args="--config-file /etc/nova/nova.conf"
-pidfile=/run/nova/${SVCNAME}.pid
+pidfile=/run/${SVCNAME}.pid
command_background=true
required_files=/etc/nova/nova.conf
if [ "$SVCNAME" == nova-compute ]; then
@@ -21,6 +21,5 @@ depend() {
}
start_pre() {
- checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/run/nova}
checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova}
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/files/
@ 2020-05-02 18:38 Matthew Thode
0 siblings, 0 replies; 7+ messages in thread
From: Matthew Thode @ 2020-05-02 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 72006cc0e7cfcb3fb0d9f0df1e825beb97948b32
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat May 2 18:38:03 2020 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat May 2 18:38:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72006cc0
sys-cluster/nova: fix init
Closes: https://bugs.gentoo.org/720334
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
sys-cluster/nova/files/nova.initd | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd
index ba722949182..563c3a546b5 100644
--- a/sys-cluster/nova/files/nova.initd
+++ b/sys-cluster/nova/files/nova.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
description="Starts ${SVCNAME} service for OpenStack"
@@ -9,7 +9,7 @@ command_args="--config-file /etc/nova/nova.conf"
pidfile=/run/${SVCNAME}.pid
command_background=true
required_files=/etc/nova/nova.conf
-if [ "$SVCNAME" == nova-compute ]; then
+if [ "$SVCNAME" = nova-compute ]; then
required_files="${required_files} /etc/nova/nova-compute.conf"
command_args="${command_args} --config-file /etc/nova/nova-compute.conf"
fi
@@ -21,5 +21,5 @@ depend() {
}
start_pre() {
- checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova}
+ checkpath --directory --owner "${NOVA_USER:-nova}":"${NOVA_GROUP:-nova}" --mode 0775 "${NOVA_RUN:-/var/lock/nova}"
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/files/
@ 2020-11-20 13:26 Aaron Bauman
0 siblings, 0 replies; 7+ messages in thread
From: Aaron Bauman @ 2020-11-20 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 453d6512bf17a5698f3540c2563b00a52a312bc8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Nov 18 18:40:01 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 13:25:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453d6512
sys-cluster/nova: remove unused patch
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18318
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
sys-cluster/nova/files/CVE-2020-17376.patch | 141 ----------------------------
1 file changed, 141 deletions(-)
diff --git a/sys-cluster/nova/files/CVE-2020-17376.patch b/sys-cluster/nova/files/CVE-2020-17376.patch
deleted file mode 100644
index 8cb2d4423f7..00000000000
--- a/sys-cluster/nova/files/CVE-2020-17376.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From bbf9d1de06e9991acd968fceee899a8df3776d60 Mon Sep 17 00:00:00 2001
-From: Lee Yarwood <lyarwood@redhat.com>
-Date: Wed, 5 Aug 2020 23:00:06 +0100
-Subject: [PATCH] libvirt: Provide VIR_MIGRATE_PARAM_PERSIST_XML during live
- migration
-
-The VIR_MIGRATE_PARAM_PERSIST_XML parameter was introduced in libvirt
-v1.3.4 and is used to provide the new persistent configuration for the
-destination during a live migration:
-
-https://libvirt.org/html/libvirt-libvirt-domain.html#VIR_MIGRATE_PARAM_PERSIST_XML
-
-Without this parameter the persistent configuration on the destination
-will be the same as the original persistent configuration on the source
-when the VIR_MIGRATE_PERSIST_DEST flag is provided.
-
-As Nova does not currently provide the VIR_MIGRATE_PARAM_PERSIST_XML
-param but does provide the VIR_MIGRATE_PERSIST_DEST flag this means that
-a soft reboot by Nova of the instance after a live migration can revert
-the domain back to the original persistent configuration from the
-source.
-
-Note that this is only possible in Nova as a soft reboot actually
-results in the virDomainShutdown and virDomainLaunch libvirt APIs being
-called that recreate the domain using the persistent configuration.
-virDomainReboot does not result in this but is not called at this time.
-
-The impact of this on the instance after the soft reboot is pretty
-severe, host devices referenced in the original persistent configuration
-on the source may not exist or could even be used by other users on the
-destination. CPU and NUMA affinity could also differ drastically between
-the two hosts resulting in the instance being unable to start etc.
-
-As MIN_LIBVIRT_VERSION is now > v1.3.4 this change simply includes the
-VIR_MIGRATE_PARAM_PERSIST_XML param using the same updated XML for the
-destination as is already provided to VIR_MIGRATE_PARAM_DEST_XML.
-
-NOTE(lyarwood): A simple change to test_migrate_v3_unicode is included
-as Iccce0ab50eee515e533ab36c8e7adc10cb3f7019 had removed this from
-master.
-
-Co-authored-by: Tadayoshi Hosoya <tad-hosoya@wr.jp.nec.com>
-Closes-Bug: #1890501
-Change-Id: Ia3f1d8e83cbc574ce5cb440032e12bbcb1e10e98
-(cherry picked from commit 1bb8ee95d4c3ddc3f607ac57526b75af1b7fbcff)
-Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
----
- nova/tests/unit/virt/libvirt/test_driver.py | 8 +++++++-
- nova/tests/unit/virt/libvirt/test_guest.py | 2 ++
- nova/virt/libvirt/guest.py | 1 +
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
-index b416641d362..99ce85a870b 100644
---- a/nova/tests/unit/virt/libvirt/test_driver.py
-+++ b/nova/tests/unit/virt/libvirt/test_driver.py
-@@ -11196,6 +11196,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
- 'migrate_disks': disk_paths,
- 'bandwidth': _bandwidth,
- 'destination_xml': target_xml,
-+ 'persistent_xml': target_xml,
- }
-
- # start test
-@@ -11303,7 +11304,8 @@ class LibvirtConnTestCase(test.NoDBTestCase,
- 'migrate_disks': disk_paths,
- 'migrate_uri': 'tcp://127.0.0.2',
- 'bandwidth': CONF.libvirt.live_migration_bandwidth,
-- 'destination_xml': target_xml
-+ 'destination_xml': target_xml,
-+ 'persistent_xml': target_xml,
- }
-
- # Start test
-@@ -11462,6 +11464,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
- 'migrate_uri': 'tcp://127.0.0.2',
- 'bandwidth': CONF.libvirt.live_migration_bandwidth,
- 'destination_xml': target_xml,
-+ 'persistent_xml': target_xml,
- }
-
- # start test
-@@ -11813,6 +11816,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
- 'migrate_disks': ['vda', 'vdb'],
- 'bandwidth': CONF.libvirt.live_migration_bandwidth,
- 'destination_xml': target_xml,
-+ 'persistent_xml': target_xml,
- }
-
- # start test
-@@ -11939,6 +11943,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
- 'migrate_disks': device_names,
- 'bandwidth': CONF.libvirt.live_migration_bandwidth,
- 'destination_xml': '<xml/>',
-+ 'persistent_xml': '<xml/>',
- }
- if not params['migrate_disks']:
- del params['migrate_disks']
-@@ -12078,6 +12083,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
- 'migrate_disks': disk_paths,
- 'bandwidth': CONF.libvirt.live_migration_bandwidth,
- 'destination_xml': '<xml/>',
-+ 'persistent_xml': '<xml/>',
- }
-
- # Prepare mocks
-diff --git a/nova/tests/unit/virt/libvirt/test_guest.py b/nova/tests/unit/virt/libvirt/test_guest.py
-index 55642c66f66..51899b730b3 100644
---- a/nova/tests/unit/virt/libvirt/test_guest.py
-+++ b/nova/tests/unit/virt/libvirt/test_guest.py
-@@ -682,6 +682,7 @@ class GuestTestCase(test.NoDBTestCase):
- 'an-uri', flags=1, params={'migrate_uri': 'dest-uri',
- 'migrate_disks': 'disk1',
- 'destination_xml': '</xml>',
-+ 'persistent_xml': '</xml>',
- 'bandwidth': 2})
-
- @testtools.skipIf(not six.PY2, 'libvirt python3 bindings accept unicode')
-@@ -699,6 +700,7 @@ class GuestTestCase(test.NoDBTestCase):
- 'migrate_disks': ['disk1',
- 'disk2'],
- 'destination_xml': expect_dest_xml,
-+ 'persistent_xml': expect_dest_xml,
- 'bandwidth': 2})
-
- def test_abort_job(self):
-diff --git a/nova/virt/libvirt/guest.py b/nova/virt/libvirt/guest.py
-index 0d485eb86d9..46593247303 100644
---- a/nova/virt/libvirt/guest.py
-+++ b/nova/virt/libvirt/guest.py
-@@ -638,6 +638,7 @@ class Guest(object):
-
- if destination_xml:
- params['destination_xml'] = destination_xml
-+ params['persistent_xml'] = destination_xml
- if migrate_disks:
- params['migrate_disks'] = migrate_disks
- if migrate_uri:
---
-2.26.2
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-11-20 13:26 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-30 6:43 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/files/ Matt Thode
-- strict thread matches above, loose matches on Subject: below --
2020-11-20 13:26 Aaron Bauman
2020-05-02 18:38 Matthew Thode
2017-09-18 4:55 Matt Thode
2016-11-30 6:32 Matt Thode
2016-11-30 5:51 Matt Thode
2016-11-29 0:54 Matt Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox