Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
99658ee3
Commit
99658ee3
authored
Mar 27, 2015
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use PVE::HA::Config to skip HA enabled VMs
parent
f5e7b4e1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
Nodes.pm
PVE/API2/Nodes.pm
+4
-3
No files found.
PVE/API2/Nodes.pm
View file @
99658ee3
...
...
@@ -22,6 +22,7 @@ use PVE::Storage;
use
PVE::
Firewall
;
use
PVE::
OpenVZ
;
use
PVE::
APLInfo
;
use
PVE::HA::
Config
;
use
PVE::
QemuServer
;
use
PVE::API2::
Subscription
;
use
PVE::API2::
Services
;
...
...
@@ -1225,7 +1226,7 @@ __PACKAGE__->register_method({
my
$get_start_stop_list
=
sub
{
my
(
$nodename
,
$autostart
)
=
@_
;
# fixmem: $cc = PVE::Cluster::cfs_read_file('cluster.conf'
);
my
$haconf
=
PVE::HA::Config::
read_resources_config
(
);
my
$vmlist
=
PVE::Cluster::
get_vmlist
();
my
$resList
=
{};
...
...
@@ -1261,8 +1262,8 @@ my $get_start_stop_list = sub {
die
"
unknown VM type '
$d
->{type}'
\n
";
}
#
fixme: skip ha managed VMs (started by rg
manager)
##return if PVE::Cluster::cluster_conf_lookup_pvevm($cc, 0, $vmid, 1
);
#
skip ha managed VMs (started by pve-ha-
manager)
return
if
defined
(
$haconf
->
{
ids
}
->
{"
pvevm:
$vmid
"}
);
$resList
->
{
$startup
->
{
order
}}
->
{
$vmid
}
=
$startup
;
$resList
->
{
$startup
->
{
order
}}
->
{
$vmid
}
->
{
type
}
=
$d
->
{
type
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment