[PATCH] Adding in rackspace and openstack support

Jason Guiditta jguiditt at redhat.com
Fri Mar 30 19:36:09 UTC 2012


On 30/03/12 19:04 +0100, David Busby wrote:
>From 911869d69e3a1e24cf5232803b5e073c49adfbb9 Mon Sep 17 00:00:00 2001
>From: David Busby <david.busby at psycle.com>
>Date: Fri, 30 Mar 2012 18:54:59 +0100
>Subject: [PATCH] Adding in rackspace and openstack support
>
OK, I am not sure what the deal is with this patch, but it wont apply,
git tells me it is a corrupt patch.  I did pull from your github repo
with 'git pull https://github.com/Oneiroi/conductor master', and that
worked fine, so I am just going to squash your patches and push them
with the subject of this one, unless I hear otherwise from you.  I'll
give you the weekend to reply and push this first thing monday my time
if I havent heard any reason not to.  Thanks for the patch!

-j

>---
> AUTHORS                                     |    1 +
> src/app/controllers/providers_controller.rb |    2 +-
> src/config/locales/en.yml                   |    2 ++
> src/db/seeds.rb                             |    2 ++
> 4 files changed, 6 insertions(+), 1 deletions(-)
>
>diff --git a/AUTHORS b/AUTHORS
>index b8b68dc..fa7a78f 100644
>--- a/AUTHORS
>+++ b/AUTHORS
>@@ -31,5 +31,6 @@ People who have contributed to aeolus-conductor:
>   Mike Orazi           <morazi at redhat.com>
>   Simon Harris         <sharris at redhat.com>
>   Tomas Hrcka          <thrcka at redhat.com>
>+  David Busby          <oneiroi at fedoraproject.org>
> 
>   [....send patches to get your name here....]
>diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/
>providers_controller.rb
>index e276813..ea22fdf 100644
>--- a/src/app/controllers/providers_controller.rb
>+++ b/src/app/controllers/providers_controller.rb
>@@ -240,7 +240,7 @@ class ProvidersController < ApplicationController
>   end
> 
>   def load_providers_types
>-    available_providers = ["Mock","Amazon EC2","RHEV-M","VMware vSphere"]
>+    available_providers = ["Mock","Amazon EC2","RHEV-M","VMware
>vSphere","Rackspace","Openstack"]
>     provider_types = ProviderType.where(:name => available_providers).map do |
>type|
>       begin
>         label = I18n.translate!("providers.form.x_deltacloud_provider.#
>{type.deltacloud_driver}")
>diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
>index 4050e0b..956e754 100644
>--- a/src/config/locales/en.yml
>+++ b/src/config/locales/en.yml
>@@ -993,6 +993,8 @@ en:
>         ec2: EC2 Region
>         rhevm: RHEV-M API_PROVIDER
>         vsphere: vSphere API hostname
>+        rackspace: Rackspace API_PROVIDER
>+        openstack: Openstack API_ENTRYPOINT
>       select_type_of_provider: Select type of provider
>       caution_alt_text: Caution
>       enter_correct_url_msg: Please enter a correct URL format.
>diff --git a/src/db/seeds.rb b/src/db/seeds.rb
>index 03aff0e..5347820 100644
>--- a/src/db/seeds.rb
>+++ b/src/db/seeds.rb
>@@ -175,6 +175,8 @@ if ProviderType.all.empty?
>   ProviderType.create!(:name => "Amazon EC2", :deltacloud_driver =>"ec2",
>:ssh_user => "root", :home_dir => "/root")
>   ProviderType.create!(:name => "RHEV-M", :deltacloud_driver =>"rhevm")
>   ProviderType.create!(:name => "VMware vSphere", :deltacloud_driver =>
>"vsphere")
>+  ProviderType.create!(:name => "Rackspace", :deltacloud_driver =>
>"rackspace")
>+  ProviderType.create!(:name => "Openstack", :deltacloud_driver =>
>"openstack")
> end
> 
> # fill table CredentialDefinitions by default values
>-- 
>1.7.8.2
>SECURITY NOTE: file ~/.netrc must not be accessible by others



More information about the aeolus-devel mailing list