[PATCH 0/3] Take 2- Bundler usage revamp
by Jason Guiditta
This may need a second patch to fully square away proper test runs,
but at the very least, should make the app run/install via rpm without
bunlder mucking anything up. I already have a feature in redmine to
cleanup the rake test tasks as needed, so this can be cleaned up as
this direction gets vetted.
12 years, 8 months
[PATCH 0/3] Stage 1 Bundler usage revamp
by Jason Guiditta
This may need a second patch to fully square away proper test runs,
but at the very least, should make the app run/install via rpm without
bunlder mucking anything up. I already have a feature in redmine to
cleanup the rake test tasks as needed, so this can be cleaned up as
this direction gets vetted.
12 years, 8 months
New package for aeolus-image required for Conductor
by Tomas Sedovic
All,
I've just pulled the latest Conductor source and it failed to run.
It tries to load aeolus-image, but the packages that are currently
available packaged don't provide a an interface that can be `require`d.
The necessary changes are in the aeolus-image codebase, but they don't
seem to have been pushed to rubygems and the RPM repos yet.
Would the packaging wizards please go ahead and fix this?
In the interim, Jan kindly built an RPM for Fedora 15 that installs a
working wersion. It's attached to this email.
Cheers,
Thomas
--
No trees were killed to send this message, but a large number of
electrons were terribly inconvenienced.
12 years, 8 months
[PATCH conductor] Load table contents on pools#show dynamically
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
https://www.aeolusproject.org/redmine/issues/2248
---
src/app/controllers/pools_controller.rb | 2 +-
src/app/models/pool.rb | 8 +++++++-
src/public/javascripts/backbone/routers.js | 5 +++--
src/public/javascripts/backbone/views.js | 9 ++++++++-
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/app/controllers/pools_controller.rb b/src/app/controllers/pools_controller.rb
index 796a99a..5d0c8be 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -85,7 +85,7 @@ class PoolsController < ApplicationController
respond_to do |format|
format.html { render :action => :show}
format.js { render :partial => @view }
- format.json { render :json => @pool }
+ format.json { render :json => @pool.as_json(:with_deployments => true) }
end
end
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index 0896788..27eb217 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -107,7 +107,7 @@ class Pool < ActiveRecord::Base
end
def as_json(options={})
- super(options).merge({
+ result = super(options).merge({
:statistics => statistics,
:deployments_count => deployments.count,
:href => Rails.application.routes.url_helpers.pool_path(id),
@@ -117,6 +117,12 @@ class Pool < ActiveRecord::Base
},
})
+
+ if options[:with_deployments]
+ result[:deployments] = deployments.map {|d| d.as_json}
+ end
+
+ result
end
def provider_image_map
diff --git a/src/public/javascripts/backbone/routers.js b/src/public/javascripts/backbone/routers.js
index 62de835..07eb092 100644
--- a/src/public/javascripts/backbone/routers.js
+++ b/src/public/javascripts/backbone/routers.js
@@ -41,9 +41,10 @@ Conductor.Routers.Pools = Backbone.Router.extend({
var pool = new Conductor.Models.Pool({ id: id });
var view = new Conductor.Views.PoolsShow({ model: pool });
- pool.bind('change', function() { view.render() });
- setInterval(function() { pool.fetch() }, Conductor.AJAX_REFRESH_INTERVAL);
+ setInterval(function() {
+ pool.fetch({ success: function() { view.render(); } })
+ }, Conductor.AJAX_REFRESH_INTERVAL);
},
});
diff --git a/src/public/javascripts/backbone/views.js b/src/public/javascripts/backbone/views.js
index f456a85..cc0fb99 100644
--- a/src/public/javascripts/backbone/views.js
+++ b/src/public/javascripts/backbone/views.js
@@ -40,7 +40,14 @@ Conductor.Views.PoolsShow = Backbone.View.extend({
render: function() {
this.$('h1.pools').text(this.model.get('name') + ' Pool');
- return this;
+
+ var $template = $('#deploymentTemplate');
+ var $table = this.$('table.checkbox_table > tbody');
+ if($table.length === 0 || $template.length === 0) return;
+
+ var checkboxes = Conductor.saveCheckboxes('td :checkbox', $table);
+ $table.empty().append($template.tmpl(this.model.get('deployments')))
+ Conductor.restoreCheckboxes(checkboxes, 'td :checkbox', $table);
},
});
--
1.7.6
12 years, 8 months
[PATCH configure] Updated login and logout web requests according to switching to warden
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
---
recipes/aeolus/manifests/conductor.pp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp
index ad7fb24..1cba5cf 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -167,7 +167,7 @@ define aeolus::conductor::site_admin($email="", $password="", $first_name="", $l
define aeolus::conductor::login($password){
web_request{ "$name-conductor-login":
post => 'https://localhost/conductor/user_session',
- parameters => { 'user_session[login]' => "$name", 'user_session[password]' => "$password",
+ parameters => { 'login' => "$name", 'password' => "$password",
'commit' => 'submit' },
returns => '200',
follow => true,
@@ -180,7 +180,7 @@ define aeolus::conductor::login($password){
define aeolus::conductor::logout(){
web_request{ "$name-conductor-logout":
post => 'https://localhost/conductor/logout',
- parameters => { 'user_session[login]' => "admin", 'user_session[password]' => "password",
+ parameters => { 'login' => "admin", 'password' => "password",
'commit' => 'submit' },
returns => '200',
follow => true,
--
1.7.6.2
12 years, 8 months
[PATCH conductor] Remove compass gems from Gemfile
by jzigmund@redhat.com
From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/Gemfile | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile
index 05d3b7c..b9d62ff 100644
--- a/src/Gemfile
+++ b/src/Gemfile
@@ -10,8 +10,6 @@ gem 'sass'
gem 'haml'
gem 'will_paginate', '>= 3.0.pre1'
gem 'nokogiri'
-gem 'compass'
-gem 'compass-960-plugin', :require => 'ninesixty'
gem 'simple-navigation'
gem 'typhoeus'
gem 'rest-client'
--
1.7.6
12 years, 8 months
[PATCH mixed] Clean up aeolus-image config + Conductor integration
by Matt Wagner
Hi all,
Scott pointed out that it's not great to have Conductor read from
~aeolus/.aeolus-cli for its configuration, and that the configuration
should live in Conductor.
Attached is a quick series of patches. Conductor's config/settings.yml
now has information pointing to iwhd, and will set this information up
when aeolus-image is initialized.
aeolus-image is also modified so that this information is shared among
different modules. There's still a little duplication of code that I
didn't attempt to fix here, but the good news is that now we'll only
read the config file once.
-- Matt
12 years, 8 months
[PATCH 0/5 conductor v2] Image browsing
by Matt Wagner
Resending. This time it doesn't include the Gemfile I'm not supposed to check in, and tests pass on master.
This depends on the patches Martyn has sent for aeolus-image.
12 years, 8 months
[PATCH conductor] Remove the hard dependency between aeolus-all and aeolus-conductor.
by Chris Lalancette
It's not really necessary as aeolus-all is just a meta package
dragging dependencies in.
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
aeolus-all.spec.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/aeolus-all.spec.in b/aeolus-all.spec.in
index 164b157..ed63458 100644
--- a/aeolus-all.spec.in
+++ b/aeolus-all.spec.in
@@ -7,8 +7,8 @@ Group: Applications/Internet
License: GPLv2+
URL: http://aeolusproject.org
-Requires: aeolus-conductor-daemons = %{version}-%{release}
-Requires: aeolus-conductor-doc = %{version}-%{release}
+Requires: aeolus-conductor-daemons
+Requires: aeolus-conductor-doc
Requires: condor-deltacloud-gahp
Requires: iwhd
Requires: aeolus-configure
--
1.7.4.4
12 years, 8 months