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

Merge branch 'feature-795' of git.opennebula.org:one into feature-795

Browse Source
This commit is contained in:
Daniel Molina 2011-09-23 01:27:53 +02:00
commit c00ecba9ab
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cloud/ec2/etc/econe.conf
View File

@ -24,6 +24,9 @@
# SSL proxy that serves the API (set if is being used)
#:ssl_server: fqdm.of.the.server
# Authentication protocol for the econe server:
# ec2, default Acess key and Secret key scheme
# x509, for x509 certificates based authentication
:auth: ec2
# VM types allowed and its template file (inside templates directory)

8
src/cloud/occi/etc/occi-server.conf
View File

@ -17,7 +17,7 @@
# OpenNebula sever contact information
:one_xmlrpc: http://localhost:2633/RPC2
# Host and port where econe server will run
# Host and port where OCCI server will run
:server: localhost
:port: 4567
@ -25,9 +25,11 @@
#:ssl_server: fqdm.of.the.server
# Configuration for OpenNebula's Virtual Networks
#:bridge: <NAME_OF_DEFAULT_BRIDGE>
:bridge: vbr1
#:bridge: NAME_OF_DEFAULT_BRIDGE
# Authentication protocol for the OCCI server:
# basic, for OpenNebula's user-password scheme
# x509, for x509 certificates based authentication
:auth: basic
# VM types allowed and its template file (inside templates directory)