shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-06 12:58:18 +03:00
Code Releases Wiki Activity

feature #1112: Adds DATASTORE_LOCATION variable

Browse Source
This commit is contained in:
Ruben S. Montero 2012-02-25 01:29:36 +01:00
parent 3fb433b352
commit 6999911f52
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
share/etc/oned.conf
View File

@ -16,11 +16,6 @@
# (use 0 to disable VM monitoring).
# VM_PER_INTERVAL: Number of VMs monitored in each interval.
#
# VM_DIR: Remote path to store the VM images, it should be shared between all
# the cluster nodes to perform live migrations. This variable is the default
# for all the hosts in the cluster. VM_DIR IS ONLY FOR THE NODES AND *NOT* THE
# FRONT-END
#
# SCRIPTS_REMOTE_DIR: Remote path to store the monitoring and VM management
# scripts.
#
@ -49,7 +44,6 @@ HOST_MONITORING_INTERVAL = 600
VM_POLLING_INTERVAL = 600
#VM_PER_INTERVAL = 5
#VM_DIR=/srv/cloud/one/var
SCRIPTS_REMOTE_DIR=/var/tmp/one
@ -86,12 +80,9 @@ MAC_PREFIX = "02:00"
#*******************************************************************************
# DataStore Configuration
#*******************************************************************************
# SYSTEM_DS
# base_path : Base path for the system datastore. The system datastore
# keeps the images (or reference to) of running or stopped VMs.
# The images are stored in the form base_path/<vm_id>.
# type : SSH: non shared, will limit live_migration
# SHARED: needs to be exported and mounted in the hosts
# DATASTORE_LOCATION: Path for Datastores in the hosts. It IS the same all the
# hosts in the cluster. DATASTORE_LOCATION IS ONLY FOR THE HOSTS AND *NOT* THE
# FRONT-END
#
# DEFAULT_IMAGE_TYPE: This can take values
# OS Image file holding an operating system
@ -105,6 +96,8 @@ MAC_PREFIX = "02:00"
# vd KVM virtual disk
#*******************************************************************************
DATASTORE_LOCATION = /var/lib/one/datastores
DEFAULT_IMAGE_TYPE = "OS"
DEFAULT_DEVICE_PREFIX = "hd"

16
src/nebula/NebulaTemplate.cc
View File

@ -91,8 +91,7 @@ void OpenNebulaTemplate::set_conf_default()
# HOST_MONITORING_INTERVAL
# HOST_PER_INTERVAL
# VM_POLLING_INTERVAL
# VM_PER_INTERVAL
# VM_DIR
# VM_PER_INTERVAL
# PORT
# DB
# VNC_BASE_PORT
@ -123,10 +122,6 @@ void OpenNebulaTemplate::set_conf_default()
attribute = new SingleAttribute("VM_PER_INTERVAL",value);
conf_default.insert(make_pair(attribute->name(),attribute));
//VM_DIR
attribute = new SingleAttribute("VM_DIR",var_location);
conf_default.insert(make_pair(attribute->name(),attribute));
//XML-RPC Server PORT
value = "2633";
@ -180,12 +175,18 @@ void OpenNebulaTemplate::set_conf_default()
/*
#*******************************************************************************
# Image Repository Configuration
# Datastore Configuration
#*******************************************************************************
# DATASTORE_LOCATION
# DEFAULT_IMAGE_TYPE
# DEFAULT_DEVICE_PREFIX
#*******************************************************************************
*/
//DATASTORE_LOCATION
attribute = new SingleAttribute("DATASTORE_LOCATION",
var_location + "/datastores");
conf_default.insert(make_pair(attribute->name(),attribute));
//DEFAULT_IMAGE_TYPE
value = "OS";
@ -198,7 +199,6 @@ void OpenNebulaTemplate::set_conf_default()
attribute = new SingleAttribute("DEFAULT_DEVICE_PREFIX",value);
conf_default.insert(make_pair(attribute->name(),attribute));
/*
#*******************************************************************************
# Auth Manager Configuration
#*******************************************************************************