You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2011/02/25 13:48:40 UTC
svn commit: r1074506 - in /incubator/deltacloud/trunk:
client/lib/deltacloud.rb server/config/drivers.yaml
server/views/api/drivers.xml.haml
Author: mfojtik
Date: Fri Feb 25 12:48:40 2011
New Revision: 1074506
URL: http://svn.apache.org/viewvc?rev=1074506&view=rev
Log:
Removed message catalog from drivers configuration file
Modified:
incubator/deltacloud/trunk/client/lib/deltacloud.rb
incubator/deltacloud/trunk/server/config/drivers.yaml
incubator/deltacloud/trunk/server/views/api/drivers.xml.haml
Modified: incubator/deltacloud/trunk/client/lib/deltacloud.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/deltacloud.rb?rev=1074506&r1=1074505&r2=1074506&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/deltacloud.rb (original)
+++ incubator/deltacloud/trunk/client/lib/deltacloud.rb Fri Feb 25 12:48:40 2011
@@ -78,10 +78,6 @@ module DeltaCloud
entrypoint = (entrypoint/'entrypoint').collect { |e| { :id => e[:id], :url => e.text } }
end
drivers[d[:id].to_sym].merge!({ :entrypoints => entrypoint }) unless entrypoint.empty?
- if (d/'credentials')
- drivers[d[:id].to_sym].merge!({ :username => (d/'credentials/username').text}) if (d/'credentials/username')
- drivers[d[:id].to_sym].merge!({ :password => (d/'credentials/password').text}) if (d/'credentials/password')
- end
end
end
drivers
Modified: incubator/deltacloud/trunk/server/config/drivers.yaml
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/config/drivers.yaml?rev=1074506&r1=1074505&r2=1074506&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/config/drivers.yaml (original)
+++ incubator/deltacloud/trunk/server/config/drivers.yaml Fri Feb 25 12:48:40 2011
@@ -1,19 +1,11 @@
---
:gogrid:
- :username: API key
- :password: GoGrid Account password
:name: Gogrid
:mock:
- :username: Username
- :password: Password
:name: Mock
:rhevm:
- :username: RHEV-M Username (with domain)
- :password: RHEV-M Password
:name: RHEVM
:rimuhosting:
- :username: API key
- :password: API password
:name: RimuHosting
:opennebula:
:class: OpennebulaDriver
@@ -23,8 +15,6 @@
:terremark:
:name: Terremark
:rackspace:
- :username: API key
- :password: Rackspace password
:name: Rackspace
:azure:
:name: Azure
@@ -45,6 +35,4 @@
ap-southeast-1: ec2.ap-southeast-1.amazonaws.com
eu-west-1: ec2.eu-west-1.amazonaws.com
us-east-1: ec2.us-east-1.amazonaws.com
- :username: Access Key ID
- :password: Secret Access Key
:name: EC2
Modified: incubator/deltacloud/trunk/server/views/api/drivers.xml.haml
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/views/api/drivers.xml.haml?rev=1074506&r1=1074505&r2=1074506&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/views/api/drivers.xml.haml (original)
+++ incubator/deltacloud/trunk/server/views/api/drivers.xml.haml Fri Feb 25 12:48:40 2011
@@ -4,10 +4,6 @@
%driver{ :id => id }
%name<
=details[:name]
- - if details[:username] or details[:password]
- %credentials
- %username<=cdata(details[:username])
- %password<=cdata(details[:password])
- if details[:entrypoints]
- details[:entrypoints].each do |list_id, entrypoints|
%entrypoints{:id => list_id}