This fixes an argument mapping that still references the old cloud_account_id. This allows the condor quota plugin to work again.
Signed-off-by: Ian Main imain@redhat.com --- src/config/routes.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/config/routes.rb b/src/config/routes.rb index 61e4221..1bcb88f 100644 --- a/src/config/routes.rb +++ b/src/config/routes.rb @@ -38,8 +38,8 @@ ActionController::Routing::Routes.draw do |map| r.resources :instances, :collection => {:start => :get, :stop => :get, :select_template => :get, :remove_failed => :get, :can_start => :get, :can_create => :get }, :member => {:key => :get} end
- map.can_start_instance '/resources/instances/:instance_id/can_start/:cloud_account_id', :controller => 'resources/instances', :action => 'can_start', :conditions => { :method => :get } - map.can_create_instance '/resources/instances/:instance_id/can_create/:cloud_account_id', :controller => 'resources/instances', :action => 'can_create', :conditions => { :method => :get } + map.can_start_instance '/resources/instances/:instance_id/can_start/:provider_account_id', :controller => 'resources/instances', :action => 'can_start', :conditions => { :method => :get } + map.can_create_instance '/resources/instances/:instance_id/can_create/:provider_account_id', :controller => 'resources/instances', :action => 'can_create', :conditions => { :method => :get }
map.namespace 'image_factory' do |r| r.resources :assemblies
On Thu, 2011-02-10 at 19:59 -0800, Ian Main wrote:
This fixes an argument mapping that still references the old cloud_account_id. This allows the condor quota plugin to work again.
Signed-off-by: Ian Main imain@redhat.com
src/config/routes.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/config/routes.rb b/src/config/routes.rb index 61e4221..1bcb88f 100644 --- a/src/config/routes.rb +++ b/src/config/routes.rb @@ -38,8 +38,8 @@ ActionController::Routing::Routes.draw do |map| r.resources :instances, :collection => {:start => :get, :stop => :get, :select_template => :get, :remove_failed => :get, :can_start => :get, :can_create => :get }, :member => {:key => :get} end
- map.can_start_instance '/resources/instances/:instance_id/can_start/:cloud_account_id', :controller => 'resources/instances', :action => 'can_start', :conditions => { :method => :get }
- map.can_create_instance '/resources/instances/:instance_id/can_create/:cloud_account_id', :controller => 'resources/instances', :action => 'can_create', :conditions => { :method => :get }
map.can_start_instance '/resources/instances/:instance_id/can_start/:provider_account_id', :controller => 'resources/instances', :action => 'can_start', :conditions => { :method => :get }
map.can_create_instance '/resources/instances/:instance_id/can_create/:provider_account_id', :controller => 'resources/instances', :action => 'can_create', :conditions => { :method => :get }
map.namespace 'image_factory' do |r| r.resources :assemblies
ACK
aeolus-devel@lists.fedorahosted.org