[PATCH conductor] BZ 786225 - New Image workflow tweak
by Matt Wagner
Building a new image no longer leads to a dead-end, but instead
takes you to the image details view for the image you've just defined.
---
src/app/controllers/images_controller.rb | 6 +-----
src/app/views/images/overview.html.haml | 3 ---
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/app/controllers/images_controller.rb b/src/app/controllers/images_controller.rb
index 997ab6a..cfdc969 100644
--- a/src/app/controllers/images_controller.rb
+++ b/src/app/controllers/images_controller.rb
@@ -280,11 +280,7 @@ class ImagesController < ApplicationController
:template => @template.uuid
})
flash.now[:error] = t('images.flash.notice.created')
- if params[:make_deployable]
- redirect_to new_deployable_path(:create_from_image => @image.id)
- else
- redirect_to image_path((a)image.id)
- end
+ redirect_to image_path((a)image.id)
end
def edit
diff --git a/src/app/views/images/overview.html.haml b/src/app/views/images/overview.html.haml
index 0167513..0b716a1 100644
--- a/src/app/views/images/overview.html.haml
+++ b/src/app/views/images/overview.html.haml
@@ -16,9 +16,6 @@
%h2= t('.valid_image')
%p.description= t('.description', :name => @name)
- %fieldset.align-center
- = check_box_tag :make_deployable, 1, true
- = label_tag :make_deployable, t('.make_deployable', :name => @name)
.centered
%fieldset.align-center
= submit_tag t('.back'), :name => 'back', :id => 'back_button', :class => 'button'
--
1.7.6.5
12 years, 2 months
[PATCH conductor] BZ#785188 Remove the Aeolus logo from the footer
by Tomas Sedovic
From: Tomas Sedovic <tomas(a)sedovic.cz>
https://bugzilla.redhat.com/show_bug.cgi?id=785188
---
src/app/stylesheets/layout.scss | 7 -------
src/app/views/layouts/application.html.haml | 1 -
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index bf39acb..9a15017 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -3417,13 +3417,6 @@ footer.standard{
height: 40px;
}
- .logo{
- margin-right: 14px;
- font-size: 18px;
- top: 9px;
- position: absolute;
- }
-
#legal {
position: absolute;
top: 0;
diff --git a/src/app/views/layouts/application.html.haml b/src/app/views/layouts/application.html.haml
index 249b19e..348faaa 100644
--- a/src/app/views/layouts/application.html.haml
+++ b/src/app/views/layouts/application.html.haml
@@ -56,7 +56,6 @@
.clearfooter
%footer.standard
.container
- %span.logo Aeolus
#legal
%nav.footer
%a{:href => '#'}= t :disclaimer
--
1.7.6.5
12 years, 2 months
[PATCH conductor 1/2] BZ 785231: deployments: reworked launch time params form
by Maros Zatko
From: Maros Zatko <mzatko(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=785231
This allows you to fill in launch time parameters
when there are more than five parameters in a service.
---
.../views/deployments/launch_time_params.html.haml | 47 +++++++++++--------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/app/views/deployments/launch_time_params.html.haml b/src/app/views/deployments/launch_time_params.html.haml
index 9e633f8..f342256 100644
--- a/src/app/views/deployments/launch_time_params.html.haml
+++ b/src/app/views/deployments/launch_time_params.html.haml
@@ -13,27 +13,30 @@
= hidden_field_tag :deployable_id, params[:deployable_id]
%section.services
+ .labels
+ - @services.each do |service, assembly_name|
+ %h4.service{:id => service.id}= service.name.titleize
+ %p.hidden.description= service.description
+
%header
%h3.service
%p.description
- - @services.each do |service, assembly_name|
- %h4.service= service.name.titleize
- %p.hidden.description= service.description
-
- .parameters
- - service.parameters.each do |parameter|
- .parameter
- - if not parameter.reference?
- - id = "deployment[launch_parameters][#{assembly_name}][#{service.name}][#{parameter.name}]"
- = label_tag id, parameter.name.titleize + ':'
- - value = get_hash_multi(params, [:deployment, :launch_parameters, assembly_name, service.name, parameter.name])
- - if parameter.type == "password"
- = password_field_tag id, (parameter.value or value)
+ .params-container
+ - @services.each do |service, assembly_name|
+ .parameters{:id => service.id}
+ - service.parameters.each do |parameter|
+ .parameter
+ - if not parameter.reference?
+ - id = "deployment[launch_parameters][#{assembly_name}][#{service.name}][#{parameter.name}]"
+ = label_tag id, parameter.name.titleize + ':'
+ - value = get_hash_multi(params, [:deployment, :launch_parameters, assembly_name, service.name, parameter.name])
+ - if parameter.type == "password"
+ = password_field_tag id, (parameter.value or value)
+ - else
+ = text_field_tag id, (parameter.value or value)
- else
- = text_field_tag id, (parameter.value or value)
- - else
- = t('.reference', :assembly => parameter.reference_assembly, :parameter => parameter.reference_parameter)
+ = t('.reference', :assembly => parameter.reference_assembly, :parameter => parameter.reference_parameter)
#service-headers
@@ -42,10 +45,13 @@
:javascript
(function () {
function selectService($service) {
- $('.service.selected').next().next('.parameters').hide();
+ var old_param_id = $('.service.selected').attr('id');
+ $('div.params-container').find('#' + old_param_id).hide();
$('.service.selected').removeClass('selected');
+
$service.addClass('selected');
- $service.next().next('.parameters').show();
+ var new_param_id = $service.attr('id');
+ $('div.params-container').find('#' + new_param_id).show();
$service.parents('.services').find('header .service').text($service.text());
$service.parents('.services').find('header .description')
@@ -58,12 +64,13 @@
var filledOut = _.all($parameters, function(item) {
return ! _.isEmpty($(item).val());
});
- $(this).prev().prev('.service').toggleClass('filled-out', filledOut);
+ var param_id = $(this).attr('id');
+ $('.labels').find('#' + param_id).toggleClass('filled-out', filledOut);
$('#submit_params').attr('disabled', !filledOut);
});
}
- var $services = $('.launch-time-params .services h4.service');
+ var $services = $('.launch-time-params .services .labels h4.service');
selectService($services.first());
$services.live('click', function(e) { selectService($(this)); });
--
1.7.7.6
12 years, 2 months
[PATCH conductor] Fix translation conflict in the footer
by Tomas Sedovic
From: Tomas Sedovic <tomas(a)sedovic.cz>
The commit 9209d5811298aae1c390d03a6c7dbf8d90f3800e introduced a "support" top
level entry in our I18n glossary which conflicts with the entry for the
"Support" text in Conductor's footer.
---
src/app/views/layouts/application.html.haml | 8 ++++----
src/config/locales/en.yml | 11 ++++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/app/views/layouts/application.html.haml b/src/app/views/layouts/application.html.haml
index 249b19e..c5c1bf7 100644
--- a/src/app/views/layouts/application.html.haml
+++ b/src/app/views/layouts/application.html.haml
@@ -59,7 +59,7 @@
%span.logo Aeolus
#legal
%nav.footer
- %a{:href => '#'}= t :disclaimer
- %a{:href => '#'}= t :terms_of_use
- %a{:href => '#'}= t :support
- %span.copyright!= t :copyright
+ %a{:href => '#'}= t('layout.disclaimer')
+ %a{:href => '#'}= t('layout.terms_of_use')
+ %a{:href => '#'}= t('layout.support')
+ %span.copyright!= t('layout.copyright')
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index d6258ef..d76e0ef 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -1,9 +1,10 @@
en:
- disclaimer: Disclaimer
- terms_of_use: Terms of Use
- support: Support
- copyright: "Copyright © 2009-2012 Red Hat, Inc. All Rights Reserved."
- dashboard: Dashboard
+ layout:
+ disclaimer: Disclaimer
+ terms_of_use: Terms of Use
+ support: Support
+ copyright: "Copyright © 2009-2012 Red Hat, Inc. All Rights Reserved."
+ dashboard: Dashboard
datetime:
distance_in_words:
x_hours:
--
1.7.6.5
12 years, 2 months
[PATCH aeolus-conductor] BZ786452 Correct inconsistency in returning
by Petr Blaho
Changes returning error from 500 to 404 of API::ImagesController#destroy
when looked up Image does not exist
This mimics behaviour and code in API::ProviderImagesController#destroy
and API::BuildsController#destroy.
The same correction for API::TargetImagesController#destroy method.
12 years, 2 months
[PATCH conductor] Fixing translation missing for to_sentence method
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
This patch fixes the translation missing error messages caused by the usage of
to_sentence by adding the appropriate keys to en.yml
---
src/config/locales/en.yml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 71cdb65..d6258ef 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -1273,3 +1273,8 @@ en:
target_image_not_found: Could not find TargetImage %{targetimage}
target_image_not_found_for_account: Could not find an appropriate target image for account %{account}
target_not_found: Could not find Target %{target}
+ support:
+ array:
+ words_connector: ', '
+ two_words_connector: ' and '
+ last_word_connector: ', and '
--
1.7.6.5
12 years, 2 months
Aeolus 0.8.0 installation not working with Eucalyptus
by Ilpo Latvala
Hi,
Aeolus 0.8.0 seems to be bundled with deltacloud 0.4.1, but I get lots of errors when I try to connect to my eucalyptus (enterprise 2.0.1) installation directly with deltacloud by using the following command:
$ deltacloudd -i eucalyptus -p 8080 -P " ec2=192.168.1.10:8773;s3=192.168.1.10:8773"
If I do a standalone deltacloud 0.4.1 installation and run the same command, then deltacloud can connect to my eucalyptus (enterprise 2.0.1) just fine.
Seems like the deltacloud version bundled with Aeolus is a little different than the one on http://deltacloud.apache.org/ Or maybe the ruby version is different?
Since Aeolus does not have Eucalyptus as a provider (yet) I am forced to use EC2 as a provider type and X-Deltacloud-Provider is giving my Euca installation details.
When I try to add a new account with my user details in aeolus, I get the error "undefined method `provider_type' for nil:NilClass".
So it seems like the current deltacloud included in aeolus does not recognize the euca provider format (ec2=192.168.1.10:8773;s3=192.168.1.10:8773).
Once the Aeolus bundled deltacloud would be able to connect to eucalyptus with "eucalyptus" as driver, then soon hopefully someone can add eucalyptus to be one of the options in the Aeolus provider list :-)
Would be great to get this to work...
Thanks,
-Ilpo Latvala-
12 years, 2 months
[PATCH conductor] Fixing syntax error in model.js
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/public/javascripts/backbone/models.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/public/javascripts/backbone/models.js b/src/public/javascripts/backbone/models.js
index 9c33fd8..cb43f18 100644
--- a/src/public/javascripts/backbone/models.js
+++ b/src/public/javascripts/backbone/models.js
@@ -2,12 +2,12 @@ Conductor.Models = Conductor.Models || {}
Conductor.Models.Pool = Backbone.Model.extend({
- urlRoot: Conductor.prefixedPath('/pools')
+ urlRoot: Conductor.prefixedPath('/pools'),
initialize: function() {
this.deployments = new Conductor.Models.Deployments().filter(function(attributes) {
- return attributes.pool.id == this.id;
- });
+ return attributes.pool.id == this.id;
+ });
}
});
--
1.7.6.5
12 years, 2 months
rake spec output format
by Jason Guiditta
Question for the group: would anyone be opposed to me changing the
output format default for rspec in conductor to be the same style as
cucumber? I drives me crazy to see the progress dots for 10 minutes
and hav no clue what test(s) failed until the run is complete. I find
the doc format much more usable. If I dont hear any strong 'NO's,
I'll push this chnge sometime tomorrow (to give folks in earlier time
zones a chance to respond). Remember that silence is implicit
agreement.
-j
12 years, 2 months
[PATCH Conductor] BZ 785216 - Fix priority comparison for provider accounts
by Greg Blomquist
From: Greg Blomquist <gblomqui(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=785216
Launching a deployment should not fail if any of the provider accounts' priority
value is nil.
---
src/app/models/deployment.rb | 12 +++++++++++-
src/spec/models/deployment_spec.rb | 18 ++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 68b5a57..8f6fac1 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -236,7 +236,17 @@ class Deployment < ActiveRecord::Base
return status
end
# grab the account with the best priority that can launch this deployment
- account = account_matches.keys.sort{|a,b| a.priority <=> b.priority}.first
+ account = account_matches.keys.sort do |a,b|
+ if a.priority.nil? and b.priority.nil?
+ 0
+ elsif a.priority.nil?
+ 1
+ elsif b.priority.nil?
+ -1
+ else
+ a.priority <=> b.priority
+ end
+ end.first
instances_matches = account_matches[account]
if deployable_xml.requires_config_server?
diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb
index 38b2b19..b8806e7 100644
--- a/src/spec/models/deployment_spec.rb
+++ b/src/spec/models/deployment_spec.rb
@@ -224,6 +224,24 @@ describe Deployment do
deployment2.instances[1].provider_account.should == @provider_account2
end
+ it "should not fail to launch if a provider account has a nil priority" do
+ @deployment.save!
+ @deployment.instances.should be_empty
+
+ @provider_account1.priority = nil
+ @provider_account1.save!
+
+ Instance.any_instance.stub(:provider_images_for_match).and_return([@provider_image])
+ Taskomatic.stub!(:create_dcloud_instance).and_return(true)
+ Taskomatic.stub!(:handle_dcloud_error).and_return(true)
+ Taskomatic.stub!(:handle_instance_state).and_return(true)
+ @deployment.launch(@user_for_launch)[:errors].should be_empty
+ @deployment.reload
+ @deployment.instances.count.should == 2
+ @deployment.instances[0].provider_account.should == @provider_account2
+ @deployment.instances[1].provider_account.should == @provider_account2
+ end
+
it "should not launch instances if user has no access to hardware profile" do
@deployment.save!
@deployment.instances.should be_empty
--
1.7.6.5
12 years, 2 months