[PATCH conductor] Fix for bz #765907: change permissions tab label from 'Users' to 'Role Assignments'
by Scott Seago
---
src/app/controllers/application_controller.rb | 2 +-
src/app/views/deployables/show.html.haml | 2 +-
src/config/locales/en.yml | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb
index 5529a02..053a87b 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -296,7 +296,7 @@ class ApplicationController < ActionController::Base
if perm_obj.has_privilege(current_user, Privilege::PERM_VIEW)
@roles = Role.find_all_by_scope((a)permission_object.class.name)
if @tabs
- @tabs << {:name => t('users.users'),
+ @tabs << {:name => t('role_assignments'),
:view => 'permissions',
:id => 'permissions',
:count => perm_obj.permissions.count}
diff --git a/src/app/views/deployables/show.html.haml b/src/app/views/deployables/show.html.haml
index 6093a34..95e00cf 100644
--- a/src/app/views/deployables/show.html.haml
+++ b/src/app/views/deployables/show.html.haml
@@ -106,6 +106,6 @@
- if check_privilege(Privilege::PERM_VIEW,@permission_object)
%section.admin-content-section
%header
- %h2.roles= t('users.users')
+ %h2.roles= t('role_assignments')
.content
= render :partial => 'permissions/permissions'
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 85f82d2..05feeaf 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -99,6 +99,7 @@ en:
define_locales: Define Locales
permissions: Permissions
role: Role
+ role_assignments: Role Assignments
user: User
privileges: Privileges
general_settings: General Settings
--
1.7.6.4
12 years, 5 months
http 401s for all aeolus-cli commands
by Quint Van Deman
Hello--
I've got conductor up and running on a RHEL 6 virtual per the docs.
Unfortunately, any & all aelus-cli commands return with "Unknown error":
aeolus-cli build --target ec2 --template /root/f16.xml
ERROR: => Unknown Error
In looking into this further, the web error logs show a 401 being thrown:
127.0.0.1 - - [13/Dec/2011:14:16:55 -0500] "POST /conductor/api/images.xml
HTTP/1.1" 401 1
with no other obvious symptoms in any of the logs (to me anyhow).
I moved from the stable to devel version with no change, any suggestions?
Thanks,
-Quint
-------------------------------------------
[root@cloud1 ~]# cat /etc/redhat-release
Red Hat Enterprise Linux Server release 6.1 (Santiago)
[root@cloud1 ~]# rpm -qa | grep aeolus
rubygem-aeolus-cli-0.2.0-3.el6.noarch
rubygem-arel-2.0.10-0.aeolus.el6.noarch
aeolus-conductor-doc-0.7.0-4.el6.noarch
aeolus-conductor-daemons-0.7.0-4.el6.noarch
rubygem-ZenTest-4.3.3-2.aeolus.el6.noarch
rubygem-aeolus-image-0.2.0-1.el6.noarch
aeolus-configure-2.4.0-3.el6.noarch
aeolus-all-0.7.0-4.el6.noarch
rubygem-rack-mount-0.7.1-3.aeolus.el6.noarch
aeolus-conductor-0.7.0-4.el6.noarch
[root@cloud1 ~]# getenforce
Permissive
[root@cloud1 ~]# uname -a
Linux cloud1.private.net 2.6.32-131.21.1.el6.x86_64 #1 SMP Fri Nov 11
11:50:54 EST 2011 x86_64 x86_64 x86_64 GNU/Linux
12 years, 5 months
[PATCH conductor] Fix missing translation on Import image button
by jzigmund@redhat.com
From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/config/locales/en.yml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index dc25790..85f82d2 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -692,6 +692,7 @@ en:
os_version: OS Version
architecture: Architecture
last_rebuild: Last Rebuild
+ import: Import
show:
provider_images: Provider Images
provider_account: Provider Account
--
1.7.7.4
12 years, 5 months
[PATCH aeolus-conductor] BZ#753917 Added target to API Build Output
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/views/api/images/_factory_image.xml.haml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/app/views/api/images/_factory_image.xml.haml b/src/app/views/api/images/_factory_image.xml.haml
index c7d09e5..0a6914f 100644
--- a/src/app/views/api/images/_factory_image.xml.haml
+++ b/src/app/views/api/images/_factory_image.xml.haml
@@ -5,6 +5,7 @@
- image.build.target_images.each do |target_image|
%target_image{:id => target_image.id, :href => api_target_image_url(target_image.id)}
%status=Aeolus::Image::Factory::TargetImage.status(target_image.id) || "COMPLETE"
+ %target=target_image.target
%provider_images
- if target_image.respond_to?(:provider_images)
- target_image.provider_images.each do |provider_image|
--
1.7.6.4
12 years, 5 months
[PATCH aeolus-image-rubygem] BZ#753917 Added Target to Builder
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
lib/aeolus_image/model/factory/target_image.rb | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/lib/aeolus_image/model/factory/target_image.rb b/lib/aeolus_image/model/factory/target_image.rb
index 7410b5b..bda78c7 100644
--- a/lib/aeolus_image/model/factory/target_image.rb
+++ b/lib/aeolus_image/model/factory/target_image.rb
@@ -2,6 +2,8 @@ module Aeolus
module Image
module Factory
class TargetImage < Base
+ attr_accessor :target
+
def self.status(id)
begin
Aeolus::Image::Factory::Builder.find(id).status
@@ -9,7 +11,15 @@ module Aeolus
nil
end
end
+
+ def target
+ begin
+ @target = @target.nil? ? Aeolus::Image::Factory::Builder.find(id).target : @target
+ rescue ActiveResource::ResourceNotFound
+ nil
+ end
+ end
end
end
end
-end
\ No newline at end of file
+end
--
1.7.6.4
12 years, 5 months
[PATCH aeolus-conductor] BZ#753917 Updated API to return Provider/Account on Push
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
.../controllers/api/provider_images_controller.rb | 1 +
.../_factory_provider_image.xml.haml | 4 +++-
.../api/provider_images_controller_spec.rb | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/app/controllers/api/provider_images_controller.rb b/src/app/controllers/api/provider_images_controller.rb
index 78c6c0d..7055cb4 100644
--- a/src/app/controllers/api/provider_images_controller.rb
+++ b/src/app/controllers/api/provider_images_controller.rb
@@ -150,6 +150,7 @@ module Api
:build_id => target_image.build.id,
:target_image_id => target_image.id })
provider_image.save!
+ provider_image.account = account.label
provider_image
end
diff --git a/src/app/views/api/provider_images/_factory_provider_image.xml.haml b/src/app/views/api/provider_images/_factory_provider_image.xml.haml
index aa849a2..0145d87 100644
--- a/src/app/views/api/provider_images/_factory_provider_image.xml.haml
+++ b/src/app/views/api/provider_images/_factory_provider_image.xml.haml
@@ -1,3 +1,5 @@
!!!XML
%provider_image{:id => provider_image.id, :href => api_provider_image_url(provider_image.id) }
- %status=Aeolus::Image::Factory::ProviderImage.status(provider_image.id)
\ No newline at end of file
+ %status=Aeolus::Image::Factory::ProviderImage.status(provider_image.id)
+ %provider=provider_image.provider
+ %account=provider_image.account
\ No newline at end of file
diff --git a/src/spec/controllers/api/provider_images_controller_spec.rb b/src/spec/controllers/api/provider_images_controller_spec.rb
index 85fcfd2..162f9ee 100644
--- a/src/spec/controllers/api/provider_images_controller_spec.rb
+++ b/src/spec/controllers/api/provider_images_controller_spec.rb
@@ -108,9 +108,9 @@ describe Api::ProviderImagesController do
:provider_name => 'provider_name',
:provider => "provider",
:object_type => 'provider_image',
+ :account => 'account',
:target_identifier => '80',
:target_image => @timage)
-
end
context "when authenticated as admin" do
@@ -369,8 +369,8 @@ describe Api::ProviderImagesController do
@target_image.stub(:build).and_return(@build1)
Aeolus::Image::Warehouse::Image.stub(:find).and_return(@image)
+ controller.stub(:send_push_request).and_return(@pimage)
- @pimage.stub(:save!)
request.env['RAW_POST_DATA'] = xml.to_xml
post :create
end
--
1.7.6.4
12 years, 5 months
[PATCH conductor] Quick Fix, destroy method is not called for ec2 and Mock instances, or if instance is in CREATE_FAILED state
by Tomas Hrcka
---
src/app/models/instance.rb | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index 279e1a7..d146cce 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
@@ -483,14 +483,16 @@ class Instance < ActiveRecord::Base
]
def destroy_on_provider
- begin
- @task = self.queue_action(self.owner, 'destroy')
- unless @task
- raise ActionError.new("destroy cannot be performed on this instance.")
+ if (provider_account.label != "ec2" or provider_account.label != "mock") and state != STATE_CREATE_FAILED
+ begin
+ @task = self.queue_action(self.owner, 'destroy')
+ unless @task
+ raise ActionError.new("destroy cannot be performed on this instance.")
+ end
+ Taskomatic.destroy_instance(@task)
+ rescue Exception => e
+ retry if self.tasks.last.action != 'destroy'
end
- Taskomatic.destroy_instance(@task)
- rescue Exception => e
- retry if self.tasks.last.action != 'destroy'
end
end
--
1.7.7.4
12 years, 5 months
[PATCH conductor] Fixing jQuery template on deployments#show
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
---
.../views/deployments/_pretty_view_show.html.haml | 11 ++++++++---
src/config/locales/en.yml | 1 +
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/app/views/deployments/_pretty_view_show.html.haml b/src/app/views/deployments/_pretty_view_show.html.haml
index f7ceade..c8cfec6 100644
--- a/src/app/views/deployments/_pretty_view_show.html.haml
+++ b/src/app/views/deployments/_pretty_view_show.html.haml
@@ -11,7 +11,7 @@
%dd= count_uptime(instance.uptime)
%li
%dt.ip_address= t('deployments.pretty_view_show.ip_address')
- %dd= instance.public_addresses.present? ? instance.public_addresses : '-'
+ %dd= instance.public_addresses.present? ? instance.public_addresses : t('deployments.pretty_view_show.no_ip_address')
%li
%dt.state= t('deployments.pretty_view_show.state')
%dd= instance.state
@@ -43,7 +43,13 @@
</li>
<li>
<dt class="ip_address">#{t('deployments.pretty_view_show.ip_address')}</dt>
- <dd>${public_addresses}</dd>
+ <dd>
+ {{if public_addresses}}
+ ${public_addresses}
+ {{else}}
+ #{t('deployments.pretty_view_show.no_ip_address')}
+ {{/if}}
+ </dd>
</li>
<li>
<dt class="state">#{t('deployments.pretty_view_show.state')}</dt>
@@ -63,7 +69,6 @@
<li>#{button_to(t('deployments.pretty_view_show.stop'), stop_instance_path('replace_id').sub('replace_id', '${id}'), :disabled => true)}</li>
{{/if}}
-
{{if reboot_enabled}}
<li>#{button_to(t('deployments.pretty_view_show.reboot'), reboot_instance_path('replace_id').sub('replace_id', '${id}'), :disabled => false)}</li>
{{else}}
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 99050d5..dc25790 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -228,6 +228,7 @@ en:
delete_selected: Delete Selected
pretty_view_show:
ip_address: "IP Address:"
+ no_ip_address: '-'
state: "State:"
download_key: Download key
reboot: "Restart"
--
1.7.6.4
12 years, 5 months