shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-08 05:57:23 +03:00
Code Releases Wiki Activity

F #2283: Set ordering to default to 5.6.0

Browse Source
This commit is contained in:
Ruben S. Montero 2018-08-06 14:22:14 +02:00
parent cdd5222e86
commit 2faa46fb33
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
share/etc/oned.conf
View File

@ -103,16 +103,6 @@ VNC_PORTS = [
# RESERVED = "6800, 6801, 6810:6820, 9869" # RESERVED = "6800, 6801, 6810:6820, 9869"
] ]
#*******************************************************************************
# API configuration attributes
#-------------------------------------------------------------------------------
# VM_SUBMIT_ON_HOLD: Forces VMs to be created on hold state instead of pending.
# Values: YES or NO.
# API_LIST_ORDER: Sets order (by ID) of elements in list API calls.
# Values: ASC (ascending order) or DESC (descending order)
#*******************************************************************************
#
#API_LIST_ORDER = "DESC"
#VM_SUBMIT_ON_HOLD = "NO" #VM_SUBMIT_ON_HOLD = "NO"
#******************************************************************************* #*******************************************************************************
@ -323,6 +313,14 @@ VXLAN_IDS = [
# vd KVM virtual disk # vd KVM virtual disk
# #
# DEFAULT_CDROM_DEVICE_PREFIX: Same as above but for CDROM devices. # DEFAULT_CDROM_DEVICE_PREFIX: Same as above but for CDROM devices.
#
# DEFAULT_IMAGE_PERSISTENT: Control the default value for the PERSISTENT
# attribute on image creation (oneimage clone, onevm disk-saveas). If blank
# images will inherit the persistent attribute from the base image.
#
# DEFAULT_IMAGE_PERSISTENT_NEW: Control the default value for the PERSISTENT
# attribute on image creation (oneimage create). By default images are no
# persistent if not set.
#******************************************************************************* #*******************************************************************************
#DATASTORE_LOCATION = /var/lib/one/datastores #DATASTORE_LOCATION = /var/lib/one/datastores

2
src/nebula/NebulaTemplate.cc
View File

@ -402,7 +402,7 @@ void OpenNebulaTemplate::set_conf_default()
set_conf_single("LISTEN_ADDRESS", "0.0.0.0"); set_conf_single("LISTEN_ADDRESS", "0.0.0.0");
set_conf_single("SCRIPTS_REMOTE_DIR", "/var/tmp/one"); set_conf_single("SCRIPTS_REMOTE_DIR", "/var/tmp/one");
set_conf_single("VM_SUBMIT_ON_HOLD", "NO"); set_conf_single("VM_SUBMIT_ON_HOLD", "NO");
set_conf_single("API_LIST_ORDER", "DESC"); set_conf_single("API_LIST_ORDER", "ASC");
//DB CONFIGURATION //DB CONFIGURATION
vvalue.insert(make_pair("BACKEND","sqlite")); vvalue.insert(make_pair("BACKEND","sqlite"));