BZ 758644 - reset login counter after aeolus-configure
by Jan Provazník
Login counter for admin after first login is not >1 because
aeolus-configure logins as admin when adding providers and hwps.
This patchset adds rake task for resetting login counter information,
and it's called from aeolus-configure script on logout.
12 years, 4 months
[PATCH conductor] Fixing deployment's json representation
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=771637
---
src/app/models/deployment.rb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 52880c0..fe6f654 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -397,7 +397,6 @@ class Deployment < ActiveRecord::Base
def as_json(options={})
json = super(options).merge({
- :owner => owner.name,
:deployable_xml_name => deployable_xml.name,
:deployment_state => deployment_state,
:instances_count => instances.count,
@@ -411,6 +410,8 @@ class Deployment < ActiveRecord::Base
:created_at => created_at.to_s
})
+ json[:owner] = owner.name if owner.present?
+
if provider
json[:provider] = {
:name => provider.provider_type.name,
--
1.7.6.5
12 years, 4 months
[PATCH configure] BZ#773060 - do not add provider accounts for rhevm, vshpere in aeolus-configure
by John Eckersberg
https://bugzilla.redhat.com/show_bug.cgi?id=773060
---
recipes/aeolus/manifests/profiles/rhevm.pp | 8 --------
recipes/aeolus/manifests/profiles/vsphere.pp | 8 --------
2 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp
index eddba26..0663a47 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -66,13 +66,6 @@ class aeolus::profiles::rhevm {
deltacloud_provider => "$rhevm_deltacloud_api;$rhevm_deltacloud_data_center",
require => Aeolus::Conductor::Login["admin"] }
- aeolus::conductor::provider::account{"rhevm":
- provider => 'rhevm',
- type => 'rhevm',
- username => "$rhevm_deltacloud_username",
- password => "$rhevm_deltacloud_password",
- require => Aeolus::Conductor::Provider["rhevm"] }
-
aeolus::conductor::hwp{"hwp1":
memory => "512",
cpu => "1",
@@ -82,7 +75,6 @@ class aeolus::profiles::rhevm {
aeolus::conductor::logout{"admin":
require => [Aeolus::Conductor::Provider['rhevm'],
- Aeolus::Conductor::Provider::Account['rhevm'],
Aeolus::Conductor::Hwp['hwp1']] }
# TODO: create a realm and mappings
diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp
index 009ca2b..130a80a 100644
--- a/recipes/aeolus/manifests/profiles/vsphere.pp
+++ b/recipes/aeolus/manifests/profiles/vsphere.pp
@@ -45,13 +45,6 @@ class aeolus::profiles::vsphere {
deltacloud_provider => "$vsphere_deltacloud_provider",
require => [Aeolus::Conductor::Login["admin"]] }
- aeolus::conductor::provider::account{"vsphere":
- provider => 'vsphere',
- type => 'vsphere',
- username => "$vsphere_username",
- password => "$vsphere_password",
- require => Aeolus::Conductor::Provider["vsphere"] }
-
aeolus::conductor::hwp{"hwp1":
memory => "512",
cpu => "1",
@@ -61,6 +54,5 @@ class aeolus::profiles::vsphere {
aeolus::conductor::logout{"admin":
require => [Aeolus::Conductor::Provider['vsphere'],
- Aeolus::Conductor::Provider::Account['vsphere'],
Aeolus::Conductor::Hwp['hwp1']] }
}
--
1.7.7.5
12 years, 4 months
How to know all iwhd queries
by Pete Zaitcev
Hi, Matt:
I am looking at a possible reduction in functionality of iwhd
(e.g. replacing it with Glance, for example). This means ditching
the universal query. So, I'm wondering if it is possible to obtain
a master list of all queries that Conductor issues.
In the logs it looks like Conductor only uses a small set, like these:
Dec 06 11:16:07 iwhd[31534]: 127.0.0.1.48930 "POST /builds/_query" 50
AND
COMPARISON
OBJECT FIELD target_image
STRING 899459d3-7251-4fab-8de5-3f9ca6efa06e
COMPARISON
OBJECT FIELD provider
STRING mock
If that is all, the whole power of Mongo is not excercised and I can
substitute a simple fixed-form API with no impact on Conductor.
What part of the code is responsible for forming queries? Maybe I can
just read the code (although it's Ruby).
-- Pete
12 years, 4 months
[PATCH conductor] Show loadmask when switching pretty/filter views
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=760876
---
src/public/javascripts/application.js | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js
index 621a175..84fd443 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -78,6 +78,7 @@ $.extend(Conductor, {
bind_pretty_toggle: function() {
Conductor.nicelyHookAjaxClick($("#pretty_view"), function() {
var link_element = this;
+ $('#content .toggle-view').html('<span class="loading_tabs"></span>');
$.get($(this).attr("href"), $(this).serialize(), function(result) {
$('#content .toggle-view').html(result);
$(link_element).addClass('active');
@@ -86,6 +87,7 @@ $.extend(Conductor, {
});
Conductor.nicelyHookAjaxClick($("#filter_view"), function() {
var link_element = this;
+ $('#content .toggle-view').html('<span class="loading_tabs"></span>');
$.get($(this).attr("href"), $(this).serialize(), function(result) {
$('#content .toggle-view').html(result);
$('#details-selected').hide();
--
1.7.7.5
12 years, 4 months
[PATCH conductor] Changing default filter for instanes on pools#index
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=770623
---
src/app/controllers/pools_controller.rb | 1 -
src/features/pool.feature | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/app/controllers/pools_controller.rb b/src/app/controllers/pools_controller.rb
index 76c6d5a..2133a7a 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -47,7 +47,6 @@ class PoolsController < ApplicationController
when 'pools'
@pools = Pool.list_for_user(current_user, Privilege::VIEW).apply_filters(:preset_filter_id => params[:pools_preset_filter], :search_filter => params[:pools_search]).list(sort_column(Pool), sort_direction)
when 'instances'
- params[:instances_preset_filter] = "other_than_stopped" unless params[:instances_preset_filter]
@instances = Instance.apply_filters(:preset_filter_id => params[:instances_preset_filter], :search_filter => params[:instances_search]).list(sort_column(Instance), sort_direction)
when 'deployments'
@deployments = Deployment.apply_filters(:preset_filter_id => params[:deployments_preset_filter], :search_filter => params[:deployments_search]).list(sort_column(Deployment), sort_direction)
diff --git a/src/features/pool.feature b/src/features/pool.feature
index b52d7f6..c6d20ea 100644
--- a/src/features/pool.feature
+++ b/src/features/pool.feature
@@ -194,12 +194,12 @@ Feature: Manage Pools
And I follow "details_instances"
And I should see "mock1"
And I should see "mock2"
- And I should not see "mock3"
- When I select "" from "instances_preset_filter"
+ And I should see "mock3"
+ When I select "Non-stopped Instances" from "instances_preset_filter"
And I press "apply_instances_preset_filter"
And I should see "mock1"
And I should see "mock2"
- And I should see "mock3"
+ And I should not see "mock3"
Scenario: Select Catalog Images on pool detail page
Given a pool "mockpool" exists
--
1.7.6.5
12 years, 4 months