<div>From 911869d69e3a1e24cf5232803b5e073c49adfbb9 Mon Sep 17 00:00:00 2001</div><div>From: David Busby &lt;<a href="mailto:david.busby@psycle.com">david.busby@psycle.com</a>&gt;</div><div>Date: Fri, 30 Mar 2012 18:54:59 +0100</div>
<div>Subject: [PATCH] Adding in rackspace and openstack support</div><div><br></div><div>---</div><div> AUTHORS                                     |    1 +</div><div> src/app/controllers/providers_controller.rb |    2 +-</div>
<div> src/config/locales/en.yml                   |    2 ++</div><div> src/db/seeds.rb                             |    2 ++</div><div> 4 files changed, 6 insertions(+), 1 deletions(-)</div><div><br></div><div>diff --git a/AUTHORS b/AUTHORS</div>
<div>index b8b68dc..fa7a78f 100644</div><div>--- a/AUTHORS</div><div>+++ b/AUTHORS</div><div>@@ -31,5 +31,6 @@ People who have contributed to aeolus-conductor:</div><div>   Mike Orazi           &lt;<a href="mailto:morazi@redhat.com">morazi@redhat.com</a>&gt;</div>
<div>   Simon Harris         &lt;<a href="mailto:sharris@redhat.com">sharris@redhat.com</a>&gt;</div><div>   Tomas Hrcka          &lt;<a href="mailto:thrcka@redhat.com">thrcka@redhat.com</a>&gt;</div><div>+  David Busby          &lt;<a href="mailto:oneiroi@fedoraproject.org">oneiroi@fedoraproject.org</a>&gt;</div>
<div> </div><div>   [....send patches to get your name here....]</div><div>diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb</div><div>index e276813..ea22fdf 100644</div>
<div>--- a/src/app/controllers/providers_controller.rb</div><div>+++ b/src/app/controllers/providers_controller.rb</div><div>@@ -240,7 +240,7 @@ class ProvidersController &lt; ApplicationController</div><div>   end</div><div>
 </div><div>   def load_providers_types</div><div>-    available_providers = [&quot;Mock&quot;,&quot;Amazon EC2&quot;,&quot;RHEV-M&quot;,&quot;VMware vSphere&quot;]</div><div>+    available_providers = [&quot;Mock&quot;,&quot;Amazon EC2&quot;,&quot;RHEV-M&quot;,&quot;VMware vSphere&quot;,&quot;Rackspace&quot;,&quot;Openstack&quot;]</div>
<div>     provider_types = ProviderType.where(:name =&gt; available_providers).map do |type|</div><div>       begin</div><div>         label = I18n.translate!(&quot;providers.form.x_deltacloud_provider.#{type.deltacloud_driver}&quot;)</div>
<div>diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml</div><div>index 4050e0b..956e754 100644</div><div>--- a/src/config/locales/en.yml</div><div>+++ b/src/config/locales/en.yml</div><div>@@ -993,6 +993,8 @@ en:</div>
<div>         ec2: EC2 Region</div><div>         rhevm: RHEV-M API_PROVIDER</div><div>         vsphere: vSphere API hostname</div><div>+        rackspace: Rackspace API_PROVIDER</div><div>+        openstack: Openstack API_ENTRYPOINT</div>
<div>       select_type_of_provider: Select type of provider</div><div>       caution_alt_text: Caution</div><div>       enter_correct_url_msg: Please enter a correct URL format.</div><div>diff --git a/src/db/seeds.rb b/src/db/seeds.rb</div>
<div>index 03aff0e..5347820 100644</div><div>--- a/src/db/seeds.rb</div><div>+++ b/src/db/seeds.rb</div><div>@@ -175,6 +175,8 @@ if ProviderType.all.empty?</div><div>   ProviderType.create!(:name =&gt; &quot;Amazon EC2&quot;, :deltacloud_driver =&gt;&quot;ec2&quot;, :ssh_user =&gt; &quot;root&quot;, :home_dir =&gt; &quot;/root&quot;)</div>
<div>   ProviderType.create!(:name =&gt; &quot;RHEV-M&quot;, :deltacloud_driver =&gt;&quot;rhevm&quot;)</div><div>   ProviderType.create!(:name =&gt; &quot;VMware vSphere&quot;, :deltacloud_driver =&gt;&quot;vsphere&quot;)</div>
<div>+  ProviderType.create!(:name =&gt; &quot;Rackspace&quot;, :deltacloud_driver =&gt; &quot;rackspace&quot;)</div><div>+  ProviderType.create!(:name =&gt; &quot;Openstack&quot;, :deltacloud_driver =&gt; &quot;openstack&quot;)</div>
<div> end</div><div> </div><div> # fill table CredentialDefinitions by default values</div><div>-- </div><div>1.7.8.2</div>