[PATCH conductor] Fix the URL in the Realms table header
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=717542
---
src/app/views/realms/_list.haml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/realms/_list.haml b/src/app/views/realms/_list.haml
index f46e178..66c9871 100644
--- a/src/app/views/realms/_list.haml
+++ b/src/app/views/realms/_list.haml
@@ -13,7 +13,7 @@
%thead
%tr
%th.ignore
- %th= link_to "Realm Name", hardware_profiles_path(:sort_by => "name")
+ %th= link_to "Realm Name", params.merge(:sort_by => "name")
- unless @realms.blank?
- @realms.each do |realm|
%tr{:class => cycle('nostripe','stripe')}
--
1.7.4.4
12 years, 9 months
Fix typos in instance-matching
by Matt Wagner
Hi all,
This fixes two typos I stumbled upon in instance.rb... The big one was that we mistakenly defined the variable as 'blreams' instead of 'brealms', which broke the surrounding code. I also fixed another typo that wasn't being reached just yet. I'm not sure this gets me 100% end-to-end yet, but figured I'd send these out in the meantime...
-- Matt
12 years, 9 months
ANNOUNCE: oz 0.5.0 release
by Chris Lalancette
All,
I'm pleased to announce release 0.5.0 of Oz. Oz is a program for doing
automated installation of guest operating systems with limited input from the
user.
Release 0.5.0 is a bugfix and feature release for Oz. Some of the
highlights between Oz 0.4.0 and 0.5.0 are:
- Replace icicle-nc binary with a shell script to try various methods. Besides
being more portable, this also allows us to convert Oz to a noarch RPM (thanks
to Padraig Brady)
- Support for Ubuntu 6.06
- Support for md5sum/sha1sum/sha256sum checking of ISOs after download
- New -x flag for oz-install to write the libvirt XML file to a user-specified
location (thanks to Steve Dake)
- Support for OpenSUSE customization
- Support for F-15 customization (thanks to Steve Dake)
- Support for running commands at the end of package installation (thanks to
Steve Dake)
Fedora 14 and RHEL-6 packages are available for this release. Note that to
install the RHEL-6 packages, you must be running RHEL-6.1 or later.
Instructions of how to get and use Oz are available at
http://aeolusproject.org/oz.html
If you have any questions or comments about Oz, please feel free to contact
aeolus-devel(a)lists.fedorahosted.org or me (clalance(a)redhat.com) directly.
--
Chris Lalancette
12 years, 9 months
[PATCH configure 1/2] BZ #693514 - remove iwhd directories in aeolus-cleanup
by Mo Morsi
---
recipes/aeolus/manifests/iwhd.pp | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/recipes/aeolus/manifests/iwhd.pp b/recipes/aeolus/manifests/iwhd.pp
index d012258..157d562 100644
--- a/recipes/aeolus/manifests/iwhd.pp
+++ b/recipes/aeolus/manifests/iwhd.pp
@@ -45,6 +45,12 @@ class aeolus::iwhd::disabled {
ensure => 'stopped',
enable => false,
hasstatus => true}
+
+ file { "/var/lib/iwhd/images":
+ ensure => 'absent',
+ force => true,
+ require => Service['iwhd']}
+
}
# Create a named bucket in iwhd
--
1.7.5.4
12 years, 9 months
[PATCH conductor] fix breadcrumbs with viewstate
by Tomas Hrcka
---
src/app/controllers/application_controller.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb
index 4eed65a..fdd7d2f 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -261,7 +261,7 @@ class ApplicationController < ActionController::Base
viewstate = @viewstate ? @viewstate.id : nil
#if item with desired path is already in bc, then remove every bc behind it
- if index = breadcrumbs.find_index {|b| b[:path] == path}
+ if index = breadcrumbs.find_index {|b| b[:path] == path || path.start_with?(b[:path])}
breadcrumbs.slice!(index, breadcrumbs.length)
end
read_breadcrumbs
--
1.7.4.4
12 years, 9 months
[PATCH configure] BZ #688719 - disable curl http proxy when making aeolus requests
by Mo Morsi
---
recipes/aeolus/manifests/iwhd.pp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/aeolus/manifests/iwhd.pp b/recipes/aeolus/manifests/iwhd.pp
index d012258..ea8bccf 100644
--- a/recipes/aeolus/manifests/iwhd.pp
+++ b/recipes/aeolus/manifests/iwhd.pp
@@ -29,7 +29,7 @@ class aeolus::iwhd inherits aeolus {
# XXX ugly hack but iwhd might take some time to come up
exec{"iwhd_startup_pause":
command => "/bin/sleep 2",
- unless => '/usr/bin/curl http://localhost:9090',
+ unless => "/usr/bin/curl --proxy '' http://localhost:9090",
logoutput => true,
require => Service['iwhd']}
}
@@ -50,7 +50,7 @@ class aeolus::iwhd::disabled {
# Create a named bucket in iwhd
define aeolus::create_bucket(){
exec{"create-bucket-${name}":
- command => "/usr/bin/curl -X PUT http://localhost:9090/templates",
+ command => "/usr/bin/curl --proxy '' -X PUT http://localhost:9090/templates",
logoutput => true,
require => [Exec['iwhd_startup_pause'], Package[curl]] }
}
--
1.7.5.4
12 years, 9 months
[PATCH conductor] Add toggle to show/hide stopped instances
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=698270
---
src/app/controllers/pools_controller.rb | 5 +++++
src/app/views/instances/_list.haml | 7 +++++++
src/features/pool.feature | 15 +++++++++++++++
3 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/app/controllers/pools_controller.rb b/src/app/controllers/pools_controller.rb
index 200199f..e51aa8c 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -6,6 +6,7 @@ class PoolsController < ApplicationController
viewstate :index do |default|
default.merge!({
:view => 'pretty',
+ :hide_stopped => 'true',
})
end
@@ -32,6 +33,10 @@ class PoolsController < ApplicationController
@pools = Pool.list_or_search(params[:q], params[:order_field],params[:order_dir])
when 'instances'
@instances = Instance.list_or_search(params[:q], params[:order_field],params[:order_dir])
+ @hide_stopped = @viewstate && @viewstate.state['hide_stopped'] == 'true'
+ if @hide_stopped
+ @instances.delete_if {|i| i.state == 'stopped'}
+ end
when 'deployments'
@deployments = Deployment.list_or_search(params[:q], params[:order_field],params[:order_dir])
end
diff --git a/src/app/views/instances/_list.haml b/src/app/views/instances/_list.haml
index a80606f..085f977 100644
--- a/src/app/views/instances/_list.haml
+++ b/src/app/views/instances/_list.haml
@@ -1,6 +1,13 @@
- form_tag do
= restful_submit_tag 'Stop', 'stop', multi_stop_instances_path, 'GET', :class => 'button'
= restful_submit_tag 'Remove failed', 'remove_failed', remove_failed_instances_path, 'GET', :class => 'button'
+ - if @hide_stopped
+ %b Stopped
+ instances are hidden:
+ = link_to "show all", params.merge('hide_stopped' => 'false')
+ - else
+ Showing all instances:
+ = link_to "hide stopped", params.merge('hide_stopped' => 'true')
= render :partial => 'layouts/select_all_none'
diff --git a/src/features/pool.feature b/src/features/pool.feature
index 7a945a7..c5867ef 100644
--- a/src/features/pool.feature
+++ b/src/features/pool.feature
@@ -187,3 +187,18 @@ Feature: Manage Pools
When I am viewing the pool "mockpool"
And I follow link with ID "filter_view"
Then I should not see "0 Instances" within ".content.collapsible.toggle-view.pools"
+
+ Scenario: Hide/Show stopped instances
+ Given I am on the pools page
+ And there is a "mock1" running instance
+ And there is a "mock2" running instance
+ And there is a "mock3" stopped instance
+ When I follow link with ID "filter_view"
+ And I follow "Instances"
+ And I should see "mock1"
+ And I should see "mock2"
+ And I should not see "mock3"
+ When I follow "show all"
+ And I should see "mock1"
+ And I should see "mock2"
+ And I should see "mock3"
--
1.7.4.4
12 years, 9 months
[PATCH aeolus 1/2] Implemented aoelus-image list providers
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
.../image_factory/aeolus-image/lib/list_command.rb | 26 +++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/services/image_factory/aeolus-image/lib/list_command.rb b/services/image_factory/aeolus-image/lib/list_command.rb
index eb44cb1..5f97b2f 100644
--- a/services/image_factory/aeolus-image/lib/list_command.rb
+++ b/services/image_factory/aeolus-image/lib/list_command.rb
@@ -23,12 +23,36 @@ module Aeolus
end
def providers
- not_implemented
+ print_values = [["NAME", "TYPE", "URL"]]
+
+ doc = Nokogiri::XML conductor['/providers'].get
+ doc.xpath("/providers/provider").each do |provider|
+ print_values << [provider.xpath("name").text, provider.xpath("provider_type").text, provider.xpath("url").text]
+ end
+
+ format_print(print_values)
+ quit(0)
end
def accounts
not_implemented
end
+
+ private
+ # Takes a 2D array of strings and neatly prints them to STDOUT
+ def format_print(print_values)
+ widths = Array.new(print_values[0].size, 0)
+ print_values.each do |print_value|
+ widths = widths.zip(print_value).map! {|width, value| value.length > width ? value.length : width }
+ end
+
+ print_values.each do |print_value|
+ widths.zip(print_value) do |width, value|
+ printf("%-#{width + 5}s", value)
+ end
+ puts ""
+ end
+ end
end
end
end
--
1.7.4
12 years, 9 months
[PATCH aeolus 1/2] Implemented aoelus-image list providers
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
.../image_factory/aeolus-image/lib/list_command.rb | 26 +++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/services/image_factory/aeolus-image/lib/list_command.rb b/services/image_factory/aeolus-image/lib/list_command.rb
index eb44cb1..5f97b2f 100644
--- a/services/image_factory/aeolus-image/lib/list_command.rb
+++ b/services/image_factory/aeolus-image/lib/list_command.rb
@@ -23,12 +23,36 @@ module Aeolus
end
def providers
- not_implemented
+ print_values = [["NAME", "TYPE", "URL"]]
+
+ doc = Nokogiri::XML conductor['/providers'].get
+ doc.xpath("/providers/provider").each do |provider|
+ print_values << [provider.xpath("name").text, provider.xpath("provider_type").text, provider.xpath("url").text]
+ end
+
+ format_print(print_values)
+ quit(0)
end
def accounts
not_implemented
end
+
+ private
+ # Takes a 2D array of strings and neatly prints them to STDOUT
+ def format_print(print_values)
+ widths = Array.new(print_values[0].size, 0)
+ print_values.each do |print_value|
+ widths = widths.zip(print_value).map! {|width, value| value.length > width ? value.length : width }
+ end
+
+ print_values.each do |print_value|
+ widths.zip(print_value) do |width, value|
+ printf("%-#{width + 5}s", value)
+ end
+ puts ""
+ end
+ end
end
end
end
--
1.7.4
12 years, 9 months
[PATCH conductor] Make tables slightly more attractive, as part of the completed table layout.
by kkeiter@redhat.com
From: Kenneth Keiter <kkeiter(a)redhat.com>
---
src/app/stylesheets/layout.scss | 103 +++++++++++++++++++-
src/app/views/deployments/_list.haml | 2 +-
src/app/views/hardware_profiles/_list.haml | 2 +-
src/app/views/layouts/_filter_table.haml | 5 +-
src/app/views/pool_families/_list.haml | 2 +-
.../views/pool_families/_provider_accounts.haml | 2 +-
src/app/views/provider_accounts/_list.haml | 2 +-
src/app/views/providers/_list.haml | 2 +-
src/app/views/realms/_list.haml | 2 +-
src/app/views/roles/_list.haml | 2 +-
src/app/views/suggested_deployables/index.haml | 2 +-
src/app/views/users/_list.haml | 2 +-
12 files changed, 114 insertions(+), 14 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 18fff1c..726d8d6 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -1,6 +1,6 @@
/* ###########################################################################
Generated SCSS for Aeolus UI [aeolus_ui]
-Compiled on 2011-06-16 22:42:20 -0700
+Compiled on Tue Jun 28 23:45:57 -0700 2011
########################################################################### */
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2331,6 +2331,107 @@ ul.deployment-array.small + ul.deployment-array.small{
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Flat Table Component -- v.0.0.1 [flat_table] (flat_table.scss)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+$font-family-primary: Helvetica, Arial, "Lucida Grande", sans-serif;
+
+/* padding configuration */
+$th_padding: 8px 10px 8px 10px;
+$td_padding: 8px;
+
+/* color configuration */
+$cell_color_base: #ffffff;
+$cell_color_header: #cccccc;
+$cell_color_stripe: #efefef;
+$cell_color_selected: #f9fafe;
+$cell_color_gradient: 5%;
+
+$cell_header_text_color: #666666;
+
+/* useful mixins */
+@mixin gradient-bg($from, $to){
+ background-color: $cell_color_base;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
+ background-image: -moz-linear-gradient($from, $to);
+ background-image: -o-linear-gradient($from, $to);
+ background-image: linear-gradient($from, $to);
+}
+
+/* Flat Table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+table.flat{
+
+ border-collapse: separate;
+ font-family: $font-family-primary;
+
+ /* header */
+
+ th{
+ @include gradient-bg($cell_color_base, $cell_color_header);
+ text-align: center;
+ font-size: 11px;
+ color: $cell_header_text_color;
+ font-weight: bold;
+ text-shadow: 0px 1px 0px #ffffff;
+ padding: $th_padding;
+ border-bottom: 1px solid #D6DADD;
+ border-left: 1px solid darken(#E9EAEC, $cell_color_gradient);
+ }
+
+ th.ignore{
+ background-color: transparent;
+ background-image: none;
+ border: 0;
+ }
+
+ th.ignore + th{
+ -webkit-border-top-left-radius: 5px;
+ -moz-border-radius-topleft: 5px;
+ border-top-left-radius: 5px;
+ }
+
+ td{
+ $cell_color_end: darken($cell_color_base, $cell_color_gradient);
+ border-spacing: 0px;
+ text-align: center;
+ padding: $td_padding;
+ border-top: 1px solid #fff;
+ font-size: 12px;
+ color: #333;
+ @include gradient-bg($cell_color_base, $cell_color_end);
+ border-top: 1px solid #fff;
+ border-left: 1px solid #fff;
+ border-bottom: 1px solid darken($cell_color_end, $cell_color_gradient);
+ border-right: 1px solid darken($cell_color_end, $cell_color_gradient);
+ }
+
+ tr{
+ height: 30px;
+ }
+
+ tr.stripe{
+ td{
+ $cell_color_end: darken($cell_color_stripe, $cell_color_gradient);
+ @include gradient-bg($cell_color_stripe, $cell_color_end);
+ border-bottom: 1px solid darken($cell_color_stripe, $cell_color_gradient);
+ border-right: 1px solid darken($cell_color_stripe, $cell_color_gradient);
+ }
+ }
+
+ tr.selected{
+ td{
+ $cell_color_end: darken($cell_color_selected, $cell_color_gradient);
+ @include gradient-bg($cell_color_selected, $cell_color_end);
+ border-top: 1px solid #fff;
+ border-left: 1px solid #fff;
+ border-bottom: 1px solid darken($cell_color_end, $cell_color_gradient);
+ border-right: 1px solid darken($cell_color_end, $cell_color_gradient);
+ }
+ }
+
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Page Footer -- v.0.0.1 [footer] (footer.scss)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/src/app/views/deployments/_list.haml b/src/app/views/deployments/_list.haml
index 874b21c..6ea9e62 100644
--- a/src/app/views/deployments/_list.haml
+++ b/src/app/views/deployments/_list.haml
@@ -13,7 +13,7 @@
= @deployments.count.to_s + " results"
= text_field_tag :q, @search_term || "Search result for...", :disabled => true
- %table#deployments_table
+ %table#deployments_table.flat
%tr
%th
= check_box_tag "all"
diff --git a/src/app/views/hardware_profiles/_list.haml b/src/app/views/hardware_profiles/_list.haml
index b7a4322..98b2e95 100644
--- a/src/app/views/hardware_profiles/_list.haml
+++ b/src/app/views/hardware_profiles/_list.haml
@@ -9,7 +9,7 @@
= render :partial => 'layouts/select_all_none'
- %table#hardware_profiles_table.checkbox_table
+ %table#hardware_profiles_table.checkbox_table.flat
%thead
%tr
%th.ignore
diff --git a/src/app/views/layouts/_filter_table.haml b/src/app/views/layouts/_filter_table.haml
index 1c50d2d..d8847cb 100644
--- a/src/app/views/layouts/_filter_table.haml
+++ b/src/app/views/layouts/_filter_table.haml
@@ -10,10 +10,9 @@
%p
= link_to('Share this view', '#')
= link_to('Add/Remove Columns', '#')
- %table(class="#{lower_class}_table")
+ %table.flat(class="#{lower_class}_table")
%thead
%tr
- columns.each do |column|
- %th
- = column[:name]
+ %th= column[:name]
= rows.collect {|row| capture_haml(row, &block)}.to_s
\ No newline at end of file
diff --git a/src/app/views/pool_families/_list.haml b/src/app/views/pool_families/_list.haml
index 5ada358..e4b5ec1 100644
--- a/src/app/views/pool_families/_list.haml
+++ b/src/app/views/pool_families/_list.haml
@@ -9,7 +9,7 @@
= render :partial => 'layouts/select_all_none'
- %table#pool_families_table.checkbox_table
+ %table#pool_families_table.checkbox_table.flat
%thead
%tr
%th.ignore
diff --git a/src/app/views/pool_families/_provider_accounts.haml b/src/app/views/pool_families/_provider_accounts.haml
index ea21e4d..f06c4f4 100644
--- a/src/app/views/pool_families/_provider_accounts.haml
+++ b/src/app/views/pool_families/_provider_accounts.haml
@@ -7,7 +7,7 @@
= restful_submit_tag "Remove selected", 'destroy', multi_destroy_provider_accounts_pool_families_path(:pool_family_id => @pool_family.id), 'DELETE', :id => 'delete_button', :class => 'button'
= #submit_tag "Remove selected"
- %table#provider_accounts_table
+ %table#provider_accounts_table.flat
= sortable_table_header @provider_accounts_header
- @pool_family.provider_accounts.each do |provider_account|
%tr
diff --git a/src/app/views/provider_accounts/_list.haml b/src/app/views/provider_accounts/_list.haml
index 214f7be..50b2e25 100644
--- a/src/app/views/provider_accounts/_list.haml
+++ b/src/app/views/provider_accounts/_list.haml
@@ -9,7 +9,7 @@
= render :partial => 'layouts/select_all_none'
- %table#provider_accounts_table.checkbox_table
+ %table#provider_accounts_table.checkbox_table.flat
%thead
%tr
%th.ignore
diff --git a/src/app/views/providers/_list.haml b/src/app/views/providers/_list.haml
index 8d0d25d..7d48eca 100644
--- a/src/app/views/providers/_list.haml
+++ b/src/app/views/providers/_list.haml
@@ -9,7 +9,7 @@
= render :partial => 'layouts/select_all_none'
- %table#providers_table.checkbox_table
+ %table#providers_table.checkbox_table.flat
%thead
%tr
%th.ignore
diff --git a/src/app/views/realms/_list.haml b/src/app/views/realms/_list.haml
index 94b0ca6..fc51d7e 100644
--- a/src/app/views/realms/_list.haml
+++ b/src/app/views/realms/_list.haml
@@ -9,7 +9,7 @@
= render :partial => 'layouts/select_all_none'
- %table#realms_table.checkbox_table
+ %table#realms_table.checkbox_table.flat
%thead
%tr
%th.ignore
diff --git a/src/app/views/roles/_list.haml b/src/app/views/roles/_list.haml
index dc7251b..cb2be24 100644
--- a/src/app/views/roles/_list.haml
+++ b/src/app/views/roles/_list.haml
@@ -8,7 +8,7 @@
= submit_tag "Delete", :id => 'delete_button', :class => 'button'
= render :partial => 'layouts/select_all_none'
- %table#roles_table.checkbox_table
+ %table#roles_table.checkbox_table.flat
%thead
%tr
%th.ignore
diff --git a/src/app/views/suggested_deployables/index.haml b/src/app/views/suggested_deployables/index.haml
index 3a43440..c0d304e 100644
--- a/src/app/views/suggested_deployables/index.haml
+++ b/src/app/views/suggested_deployables/index.haml
@@ -12,7 +12,7 @@
= render :partial => 'layouts/select_all_none'
= filter_table(@header, @suggested_deployables, :form_header => form_header) do |deployable|
- %table#deployables_table.checkbox_table
+ %table#deployables_table.checkbox_table.flat
%tr
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/users/_list.haml b/src/app/views/users/_list.haml
index 69a9c06..841a8e1 100644
--- a/src/app/views/users/_list.haml
+++ b/src/app/views/users/_list.haml
@@ -9,7 +9,7 @@
= render :partial => 'layouts/select_all_none'
- %table#users_table.checkbox_table
+ %table#users_table.checkbox_table.flat
%thead
%tr
%th.ignore
--
1.7.4.1
12 years, 9 months