diff --git a/src/cloud/ec2/etc/econe.conf b/src/cloud/ec2/etc/econe.conf index 0e6c5a0b5d..5bb0893ab9 100644 --- a/src/cloud/ec2/etc/econe.conf +++ b/src/cloud/ec2/etc/econe.conf @@ -14,6 +14,10 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +############################################################# +# Server Configuration +############################################################# + # OpenNebula sever contact information :one_xmlrpc: http://localhost:2633/RPC2 @@ -24,6 +28,10 @@ # SSL proxy that serves the API (set if is being used) #:ssl_server: fqdm.of.the.server +############################################################# +# Auth +############################################################# + # Authentication driver for incomming requests # ec2, default Acess key and Secret key scheme # x509, for x509 certificates based authentication @@ -34,24 +42,41 @@ # x509, for x509 certificate encryption of tokens :core_auth: cipher -# 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG +############################################################# +# Log +############################################################# + +# Log debug level +# 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG :debug_level: 3 -# -# -# -:cluster_id: -:datastore_id: +############################################################# +# Resources +############################################################# -# -# -# -:elasticips_vnet_id: 0 +# Cluster associated with the EC2 resources, by default no Cluster is defined +#:cluster_id: -:associate_script: /usr/bin/false -:disassociate_script: /usr/bin/false +# Datastore in which the Images uploaded through EC2 will be allocated, by default 1 +#:datastore_id: # VM types allowed and its template file (inside templates directory) :instance_types: :m1.small: :template: m1.small.erb + +############################################################# +# Elastic IP +############################################################# + +# VirtualNetwork containing the elastic ips to be used with EC2. If no defined +# the Elastic IP functionality is disabled +#:elasticips_vnet_id: + +# Script to associate a public IP with a private IP +# arguments: elastic_ip private_ip vnet_template(base64_encoded) +:associate_script: /usr/bin/false + +# Script to disassociate a public IP +# arguments: elastic_ip +:disassociate_script: /usr/bin/false diff --git a/src/cloud/occi/etc/occi-server.conf b/src/cloud/occi/etc/occi-server.conf index 0d97e3bbfa..16f0f6ea6c 100644 --- a/src/cloud/occi/etc/occi-server.conf +++ b/src/cloud/occi/etc/occi-server.conf @@ -14,6 +14,10 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +############################################################# +# Server configuration +############################################################# + # OpenNebula sever contact information :one_xmlrpc: http://localhost:2633/RPC2 @@ -24,6 +28,10 @@ # SSL proxy that serves the API (set if is being used) #:ssl_server: fqdm.of.the.server +############################################################# +# Auth +############################################################# + # Authentication driver for incomming requests # occi, for OpenNebula's user-password scheme # x509, for x509 certificates based authentication @@ -35,11 +43,23 @@ # x509, for x509 certificate encryption of tokens :core_auth: cipher -# 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG +############################################################# +# Log +############################################################# + +# Log debug level +# 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG :debug_level: 3 -:cluster_id: -:datastore_id: +############################################################# +# Resources +############################################################# + +# Cluster associated with the OCCI resources, by default no Cluster is defined +#:cluster_id: + +# Datastore in which the Images uploaded through OCCI will be allocated, by default 1 +#:datastore_id: # VM types allowed and its template file (inside templates directory) :instance_types: diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf index cddab640a1..64915b50c0 100644 --- a/src/sunstone/etc/sunstone-server.conf +++ b/src/sunstone/etc/sunstone-server.conf @@ -1,16 +1,47 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +#--------------------------------------------------------------------------- # + +############################################################# +# Server Configuration +############################################################# + # OpenNebula sever contact information :one_xmlrpc: http://localhost:2633/RPC2 -# 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG -:debug_level: 3 - # Server Configuration :host: 127.0.0.1 :port: 9869 +############################################################# +# Log +############################################################# + +# Log debug level +# 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG +:debug_level: 3 + +############################################################# +# Auth +############################################################# + # Authentication driver for incomming requests # sunstone, for OpenNebula's user-password scheme # x509, for x509 certificates based authentication +# opennebula, the authentication will be done by the opennebula core using the driver +# defined for the user :auth: sunstone # Authentication driver to communicate with OpenNebula core @@ -18,6 +49,10 @@ # x509, for x509 certificate encryption of tokens :core_auth: cipher +############################################################# +# UI Settings +############################################################# + # VNC Configuration # base_port: base_port + vnc_port of the VM is the port where the # proxy will listen for VNC session connections to that VM.