shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-22 22:03:39 +03:00
Code Releases Wiki Activity

M #-: Removed unused variables

Browse Source 
(cherry picked from commit ce38105efff517fdfa42a6a67617006b74229390)
This commit is contained in:
Ruben S. Montero 2020-08-06 21:05:37 +02:00
parent a2ee52f40d
commit 998f2ddd1e
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
6 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/VirtualMachineManager.h
View File

@ -35,7 +35,6 @@ class VirtualMachineManager :
public:
VirtualMachineManager(
int _vm_limit,
const std::string& _mads);
~VirtualMachineManager() = default;
@ -150,11 +149,6 @@ private:
*/
DatastorePool * ds_pool;
/**
* Virtual Machine polling limit
*/
int vm_limit;
// -------------------------------------------------------------------------
// Protocol implementation, procesing messages from driver
// -------------------------------------------------------------------------

2
share/doc/xsd/opennebula_configuration.xsd
View File

@ -164,7 +164,6 @@
</xs:element>
<xs:element name="HOST_ENCRYPTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="HOST_PER_INTERVAL" type="xs:integer" minOccurs="0" maxOccurs="1"/>
<xs:element name="IMAGE_RESTRICTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="IM_MAD" minOccurs="0" maxOccurs="unbounded">
@ -352,7 +351,6 @@
<xs:element name="VM_MANAGE_OPERATIONS" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="VM_MONITORING_EXPIRATION_TIME" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="VM_PER_INTERVAL" type="xs:integer" minOccurs="0" maxOccurs="1"/>
<xs:element name="VM_RESTRICTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="VM_SUBMIT_ON_HOLD" minOccurs="0" maxOccurs="1">

9
share/etc/oned.conf
View File

@ -16,11 +16,6 @@
# DS_MONITOR_VM_DISK: Number of MONIROTING_INTERVAL_DATASTORE intervals to monitor
# VM disks. 0 to disable. Only applies to fs and fs_lvm datastores
#
# HOST_PER_INTERVAL: Number of hosts monitored in each interval.
#
# VM_PER_INTERVAL: Number of VMs monitored in each interval, if the individual
# VM monitoring is set to yes.
#
# SCRIPTS_REMOTE_DIR: Remote path to store the monitoring and VM management
# scripts.
#
@ -66,13 +61,9 @@ MONITORING_INTERVAL_MARKET = 600
MONITORING_INTERVAL_DB_UPDATE = 0
#DS_MONITOR_VM_DISK = 10
#HOST_PER_INTERVAL = 15
#VM_PER_INTERVAL = 5
SCRIPTS_REMOTE_DIR=/var/tmp/one
DB = [ BACKEND = "sqlite",
TIMEOUT = 2500 ]

7
src/nebula/Nebula.cc
View File

@ -869,15 +869,10 @@ void Nebula::start(bool bootstrap_only)
if (!cache)
{
vector<const VectorAttribute *> vmm_mads;
int vm_limit;
nebula_configuration->get("VM_PER_INTERVAL", vm_limit);
nebula_configuration->get("VM_MAD", vmm_mads);
vmm = new VirtualMachineManager(
vm_limit,
mad_location);
vmm = new VirtualMachineManager(mad_location);
if (vmm->load_drivers(vmm_mads) != 0)
{

4
src/template/OpenNebulaTemplate.cc
View File

@ -352,8 +352,6 @@ void OpenNebulaTemplate::set_conf_default()
# MONITORING_INTERVAL_DATASTORE
# MONITORING_INTERVAL_DB_UPDATE
# DS_MONITOR_VM_DISK
# HOST_PER_INTERVAL
# VM_PER_INTERVAL
# VM_MONITORING_EXPIRATION_TIME
# LISTEN_ADDRESS
# PORT
@ -369,8 +367,6 @@ void OpenNebulaTemplate::set_conf_default()
set_conf_single("MONITORING_INTERVAL_DATASTORE", "300");
set_conf_single("MONITORING_INTERVAL_DB_UPDATE", "0");
set_conf_single("DS_MONITOR_VM_DISK", "10");
set_conf_single("HOST_PER_INTERVAL", "15");
set_conf_single("VM_PER_INTERVAL", "5");
set_conf_single("VM_MONITORING_EXPIRATION_TIME", "14400");
set_conf_single("PORT", "2633");
set_conf_single("LISTEN_ADDRESS", "0.0.0.0");

4
src/vmm/VirtualMachineManager.cc
View File

@ -36,11 +36,9 @@ using namespace std;
/* ************************************************************************** */
VirtualMachineManager::VirtualMachineManager(
int _vm_limit,
const string& _mad_location):
DriverManager(_mad_location),
Listener("Virtual Machine Manager"),
vm_limit(_vm_limit)
Listener("Virtual Machine Manager")
{
Nebula& nd = Nebula::instance();