diff --git a/src/oca/java/test/oned.conf b/src/oca/java/test/oned.conf index da03cb5716..35a1e81f4c 100644 --- a/src/oca/java/test/oned.conf +++ b/src/oca/java/test/oned.conf @@ -28,6 +28,7 @@ # scripts. # # PORT: Port where oned will listen for xmlrpc calls. +# LISTEN_ADDRESS: Host IP to listen on for xmlrpc calls (default: all IPs). # # DB: Configuration attributes for the database backend # backend : can be sqlite or mysql (default is sqlite) @@ -72,6 +73,8 @@ SCRIPTS_REMOTE_DIR=/var/tmp/one PORT = 2666 +LISTEN_ADDRESS = "0.0.0.0" + DB = [ backend = "sqlite" ] # Sample configuration for MySQL @@ -108,6 +111,20 @@ FEDERATION = [ MASTER_ONED = "" ] +#******************************************************************************* +# Default showback cost +#------------------------------------------------------------------------------- +# The following attributes define the default cost for Virtual Machines that +# don't have a CPU, MEMORY or DISK cost. This is used by the oneshowback +# calculate method. +#******************************************************************************* + +DEFAULT_COST = [ + CPU_COST = 0, + MEMORY_COST = 0, + DISK_COST = 0 +] + #******************************************************************************* # XML-RPC server configuration #------------------------------------------------------------------------------- @@ -132,8 +149,19 @@ FEDERATION = [ # RPC_LOG: Create a separated log file for xml-rpc requests, in # "/var/log/one/one_xmlrpc.log". # -# MESSAGE_SIZE: Buffer size in bytes for XML-RPC responses. Only relevant for -# slave zones. +# MESSAGE_SIZE: Buffer size in bytes for XML-RPC responses. +# +# LOG_CALL_FORMAT: Format string to log XML-RPC calls. Interpreted strings: +# %i -- request id +# %m -- method name +# %u -- user id +# %U -- user name +# %l -- param list +# %p -- user password +# %g -- group id +# %G -- group name +# %a -- auth token +# %% -- % #******************************************************************************* #MAX_CONN = 15 @@ -143,6 +171,7 @@ FEDERATION = [ #TIMEOUT = 15 #RPC_LOG = NO #MESSAGE_SIZE = 1073741824 +#LOG_CALL_FORMAT = "Req:%i UID:%u %m invoked %l" #******************************************************************************* # Physical Networks configuration @@ -310,6 +339,17 @@ IM_MAD = [ # arguments = "-c -t 15 -r 0 vmware" ] #------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# vCenter Information Driver Manager Configuration +# -r number of retries when monitoring a host +# -t number of threads, i.e. number of hosts monitored at the same time +#------------------------------------------------------------------------------- +#IM_MAD = [ +# name = "vcenter", +# executable = "one_im_sh", +# arguments = "-c -t 15 -r 0 vcenter" ] +#------------------------------------------------------------------------------- + #------------------------------------------------------------------------------- # EC2 Information Driver Manager Configuration # -r number of retries when monitoring a host @@ -378,6 +418,10 @@ IM_MAD = [ name="dummy", executable="one_im_dummy"] # overridden for each action. # Valid actions: deploy, shutdown, cancel, save, restore, migrate, poll # An example: "-l migrate=migrate_local,save" +# -p more than one action per host in parallel, needs support from hypervisor +# -s to execute remote commands, bash by default +# -d detach disks on running VMs before creating/reverting snaps, by default +# the VM will be suspended # # Note: You can use type = "qemu" to use qemu emulated guests, e.g. if your # CPU does not have virtualization extensions or use nested Qemu-KVM hosts @@ -398,8 +442,12 @@ VM_MAD = [ # overridden for each action. # Valid actions: deploy, shutdown, cancel, save, restore, migrate, poll # An example: "-l migrate,save" +# -p more than one action per host in parallel, needs support from hypervisor +# -s to execute commands, bash by default +# -d detach disks on running VMs before creating/reverting snaps, by default +# the VM will be suspended #------------------------------------------------------------------------------- - +# # Driver for Xen 3.x #VM_MAD = [ # name = "xen", @@ -407,7 +455,7 @@ VM_MAD = [ # arguments = "-t 15 -r 0 xen3", # default = "vmm_exec/vmm_exec_xen3.conf", # type = "xen" ] - +# # Driver for Xen 4.x #VM_MAD = [ # name = "xen", @@ -415,13 +463,17 @@ VM_MAD = [ # arguments = "-t 15 -r 0 xen4", # default = "vmm_exec/vmm_exec_xen4.conf", # type = "xen" ] - +# #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- # VMware Virtualization Driver Manager Configuration # -r number of retries when monitoring a host # -t number of threads, i.e. number of hosts monitored at the same time +# -p more than one action per host in parallel, needs support from hypervisor +# -s to execute commands, bash by default +# -d detach disks on running VMs before creating/reverting snaps, by default +# the VM will be suspended #------------------------------------------------------------------------------- #VM_MAD = [ # name = "vmware", @@ -431,6 +483,23 @@ VM_MAD = [ # type = "vmware" ] #------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# vCenter Virtualization Driver Manager Configuration +# -r number of retries when monitoring a host +# -t number of threads, i.e. number of hosts monitored at the same time +# -p more than one action per host in parallel, needs support from hypervisor +# -s to execute commands, bash by default +# -d detach disks on running VMs before creating/reverting snaps, by default +# the VM will be suspended +#------------------------------------------------------------------------------- +#VM_MAD = [ +# name = "vcenter", +# executable = "one_vmm_sh", +# arguments = "-p -t 15 -r 0 vcenter -s sh", +# default = "vmm_exec/vmm_exec_vcenter.conf", +# type = "xml" ] +#------------------------------------------------------------------------------- + #------------------------------------------------------------------------------- # EC2 Virtualization Driver Manager Configuration # -r number of retries when monitoring a host @@ -539,7 +608,6 @@ DATASTORE_MAD = [ # - SHUTDOWN, after the VM is shutdown # - STOP, after the VM is stopped (including VM image transfers) # - DONE, after the VM is deleted or shutdown -# - FAILED, when the VM enters the failed state # - CUSTOM, user defined specific STATE and LCM_STATE combination # of states to trigger the hook. # command : path is relative to $ONE_LOCATION/var/remotes/hook @@ -609,6 +677,9 @@ DATASTORE_MAD = [ # arguments : for the hook. You can use the following Host information: # - $ID, the ID of the host # - $TEMPLATE, the vnet template in xml and base64 encoded +# +# Please note: In a Federation, User and Group hooks can only be defined in +# the master OpenNebula. #------------------------------------------------------------------------------- HM_MAD = [ executable = "one_hm" ] @@ -619,7 +690,8 @@ HM_MAD = [ # This hook is used to perform recovery actions when a host fails. # Script to implement host failure tolerance # It can be set to -# -r recreate VMs running in the host +# -m migrate VMs to another host. Only for images in shared storage +# -r recreate VMs running in the host. State will be lost. # -d delete VMs running in the host # Additional flags # -f force resubmission of suspended VMs @@ -631,29 +703,9 @@ HM_MAD = [ # name = "error", # on = "ERROR", # command = "ft/host_error.rb", -# arguments = "$ID -r", +# arguments = "$ID -m -p 5", # remote = "no" ] #------------------------------------------------------------------------------- -# These two hooks can be used to automatically delete or resubmit VMs that reach -# the "failed" state. This way, the administrator doesn't have to interact -# manually to release its resources or retry the deployment. -# -# -# Only one of them should be uncommented. -#------------------------------------------------------------------------------- -# -#VM_HOOK = [ -# name = "on_failure_delete", -# on = "FAILED", -# command = "/usr/bin/env onevm delete", -# arguments = "$ID" ] -# -#VM_HOOK = [ -# name = "on_failure_recreate", -# on = "FAILED", -# command = "/usr/bin/env onevm delete --recreate", -# arguments = "$ID" ] -#------------------------------------------------------------------------------- #******************************************************************************* # Auth Manager Configuration @@ -670,6 +722,13 @@ HM_MAD = [ # defined all the modules available will be enabled # authz : list of authentication modules separated by commas # +# DEFAULT_AUTH: The default authentication driver to use when OpenNebula does +# not know the user and needs to authenticate it externally. If you want to +# use "default" (not recommended, but supported for backwards compatibility +# reasons) make sure you create a symlink pointing to the actual authentication +# driver in /var/lib/one/remotes/auth, and add "default" to the 'auth' +# parameter in the 'AUTH_MAD' section. +# # SESSION_EXPIRATION_TIME: Time in seconds to keep an authenticated token as # valid. During this time, the driver is not used. Use 0 to disable session # caching @@ -688,6 +747,8 @@ AUTH_MAD = [ authn = "ssh,x509,ldap,server_cipher,server_x509" ] +#DEFAULT_AUTH = "default" + SESSION_EXPIRATION_TIME = 900 #ENABLE_OTHER_PERMISSIONS = "YES" @@ -722,6 +783,9 @@ VM_RESTRICTED_ATTR = "DISK/WRITE_BYTES_SEC" VM_RESTRICTED_ATTR = "DISK/TOTAL_IOPS_SEC" VM_RESTRICTED_ATTR = "DISK/READ_IOPS_SEC" VM_RESTRICTED_ATTR = "DISK/WRITE_IOPS_SEC" +VM_RESTRICTED_ATTR = "CPU_COST" +VM_RESTRICTED_ATTR = "MEMORY_COST" +VM_RESTRICTED_ATTR = "DISK_COST" #VM_RESTRICTED_ATTR = "RANK" #VM_RESTRICTED_ATTR = "SCHED_RANK" @@ -730,6 +794,21 @@ VM_RESTRICTED_ATTR = "DISK/WRITE_IOPS_SEC" IMAGE_RESTRICTED_ATTR = "SOURCE" +#******************************************************************************* +# The following restricted attributes only apply to VNets that are a reservation. +# Normal VNets do not have restricted attributes. +#******************************************************************************* + +VNET_RESTRICTED_ATTR = "PHYDEV" +VNET_RESTRICTED_ATTR = "VLAN_ID" +VNET_RESTRICTED_ATTR = "VLAN" +VNET_RESTRICTED_ATTR = "BRIDGE" + +VNET_RESTRICTED_ATTR = "AR/PHYDEV" +VNET_RESTRICTED_ATTR = "AR/VLAN_ID" +VNET_RESTRICTED_ATTR = "AR/VLAN" +VNET_RESTRICTED_ATTR = "AR/BRIDGE" + #******************************************************************************* # Inherited Attributes Configuration #******************************************************************************* @@ -759,6 +838,10 @@ INHERIT_DATASTORE_ATTR = "GLUSTER_HOST" INHERIT_DATASTORE_ATTR = "GLUSTER_VOLUME" INHERIT_VNET_ATTR = "VLAN_TAGGED_ID" +INHERIT_VNET_ATTR = "BRIDGE_OVS" +INHERIT_VNET_ATTR = "FILTER_IP_SPOOFING" +INHERIT_VNET_ATTR = "FILTER_MAC_SPOOFING" +INHERIT_VNET_ATTR = "MTU" #******************************************************************************* # Transfer Manager Driver Behavior Configuration