aeolus-devel September 2011

aeolus-devel@lists.fedorahosted.org

47 participants
201 discussions

[PATCH conductor] Remove the parseconfig dependency.
by Chris Lalancette 21 Sep '11

21 Sep '11

As far as I can tell, we never use it anywhere. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- aeolus-conductor.spec.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in index cb5e4d8..52ff5ac 100644 --- a/aeolus-conductor.spec.in +++ b/aeolus-conductor.spec.in @@ -23,7 +23,6 @@ Requires: rubygem(rails) >= 3.0.7 Requires: rubygem(haml) >= 3.1 Requires: rubygem(nokogiri) >= 1.4.0 Requires: rubygem(will_paginate) >= 3.0 -Requires: rubygem(parseconfig) Requires: rubygem(deltacloud-client) >= 0.4.0 Requires: rubygem(simple-navigation) Requires: rubygem(typhoeus) -- 1.7.4.4

2 2

[PATCH conductor] Remove the ruby-postgres dependency.
by Chris Lalancette 21 Sep '11

21 Sep '11

We are now using rubygem-pg instead. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- aeolus-conductor.spec.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in index cb5e4d8..9fa06f4 100644 --- a/aeolus-conductor.spec.in +++ b/aeolus-conductor.spec.in @@ -40,7 +40,6 @@ Requires: rubygem(pg) Requires: rubygem(ruby-net-ldap) Requires: postgresql Requires: postgresql-server -Requires: ruby-postgres # to ensure the service is actually started # and is accessible in the init script -- 1.7.4.4

2 2

Pushed a large copyright patch
by Chris Lalancette 21 Sep '11

21 Sep '11

All, I just went through the conductor sources and updated the copyright headers everywhere to read 2011. Quite a number of files were missing copyright headers completely, so I added those. The net should be no functional change, but it will most likely cause some conflicts with existing patches. Please make sure to pull and rebase your patches before posting. -- Chris Lalancette

1 0

Conductor packaging and the ruby community
by Chris Alfonso 21 Sep '11

21 Sep '11

This probably isn't going to be a popular idea, and it's probably been brought up before. What if we went against everything we've done before and deliver conductor as a bundle of gems? The team has chosen to use the rails framework to build and maintain a web application as the tool our customers will know as Cloud Forms. There is a lot of merit to using rails, but it requires substantial work to package conductor and its gem dependencies. The conductor packaging effort will be never ending, as well as the rails framework and its dependencies themselves will continue to evolve and continue to require packaging effort. The ruby community is a large and continues to thrive; however, much of the community is content with gem based library management. Much of the benefit of using rails comes from the availablity of the community based dependencies. We are currently purposefully drawing scope around the dependencies we require in conductor because of the packaging effort required. I'm not trolling here...there are a lot of benefits to a sysadmin having consistent packaging given the tooling built around rpm. This idea of using gems is contrary to fundamental principles and expectations our development teams, QA, release engineering, and customers have come to know and love. I find myself asking whether our way of doing things should be reconsidered so that we can participate in and benefit from a much larger community. I'd like your feedback on this idea as time permits. -- Chris

1 0

[PATCH conductor] Removed unused JS and helpers
by Jan Provazník 21 Sep '11

21 Sep '11

From: Jan Provaznik <jprovazn(a)redhat.com> Removed code for rendering JS tables which we don't user anymore. --- src/app/helpers/application_helper.rb | 107 --------------------------------- src/public/javascripts/application.js | 48 --------------- 2 files changed, 0 insertions(+), 155 deletions(-) diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index c3cf0cc..a2e74b5 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -20,31 +20,6 @@ # Likewise, all the methods added will be available for all controllers. module ApplicationHelper - - def confirmation_dialog(div_id, text, action) - %{ - <div id="#{div_id}" style="display:none;"> - <div class="confirm_dialog_title"> - <div class="confirm_dialog_header">#{text}</div> - <div style="clear:both;"></div> - </div> - - <div class="confirm_dialog_footer"> - <div class="button"> - <div class="button_left_grey"></div> - <div class="button_middle_grey"><a href="#" onclick="$(document).trigger('close.facebox')">Cancel</a></div> - <div class="button_right_grey"></div> - </div> - <div class="button"> - <div class="button_left_blue"></div> - <div class="button_middle_blue"><a href="#" onclick="#{action}">OK</a></div> - <div class="button_right_blue"></div> - </div> - </div> - </div> - } - end - def number_to_duration(input_num) input_int = input_num.to_i hours_to_seconds = [input_int/3600 % 24, @@ -59,29 +34,6 @@ module ApplicationHelper day_str + hours_to_seconds end - def column_header(column, order, order_dir, check_all) - next_dir = order_dir.to_s == 'asc' ? 'desc' : 'asc' - if order and column[:id] == order - dir = order_dir.to_s == 'desc' ? 'desc' : 'asc' - cls = "ordercol #{dir}" - else - cls = nil - end - - if column[:sortable] - label = link_to( - column[:header], - {:action => controller.action_name, :partial => true, :order => column[:id], :order_dir => next_dir, :search => params[:search]}, - :class => cls) - elsif check_all.to_s == column[:id] - label = check_box_tag 'check_all' - else - label = column[:header] - end - - content_tag 'th', label - end - # Fields example: # [ # { :name => 'Pool name', :sort_attr => 'name'}, @@ -135,65 +87,6 @@ module ApplicationHelper } end - def paginated_table(html_id, columns, data, opts = {}) - search_url = url_for(:partial => true, :order => opts[:order], :order_dir => opts[:order_dir]) - - # for now submit url for base table form can be same as search url - # it's possible to change it in a future - submit_url = search_url - - extend_table_js = "<script type=\"text/javascript\">Conductor.extendTable({id: '##{html_id}',single_select:#{opts[:single_select] ? true : false}});#{opts[:load_callback]};</script>" - extend_sfield_js = "<script type=\"text/javascript\">Conductor.extendTableSearchField({id: '##{html_id}'})</script>" - - rows = data.map do |rec| - if block_given? - capture_haml{yield rec} - else - content_tag 'tr', :class => cycle('even', 'odd') do - columns.map { |c| content_tag 'td', rec[c[:id]] } - end - end - end - - header_cols = columns.map {|c| column_header(c, opts[:order], opts[:order_dir], opts[:check_all])} - - table = content_tag 'table' do - content_tag('thead', content_tag('tr', header_cols)) + content_tag('tbody', rows) - end - - internal_header = content_tag 'div', :class => 'header' do - content_tag('div', opts[:title], :class => 'title') - end - - internal_footer = content_tag 'div', :class => 'footer' do - will_paginate(data, :params => {:partial => true}).to_s + - page_entries_info(data).to_s - end - - ajax_content = table + internal_footer + extend_table_js - - if params[:partial] and request.xhr? - ajax_content - else - wrapped_table = content_tag 'div', :class => 'wrapped_table' do - internal_header + - content_tag('div', ajax_content, :class => 'wrapper') - end - base_form = content_tag 'form', :action => submit_url, :class => 'dtable_form' do - opts[:header].to_s + wrapped_table + opts[:footer].to_s - end - - # search field is in separate form because of submitting on enter key - search_field = content_tag 'form', :action => search_url, :class => 'search_field' do - 'Search ' + text_field_tag('search', params[:search], :size => 10, :value => params[:search]) + extend_sfield_js - end - - content_tag 'div', :id => html_id, :class => "dtable #{opts[:class]}" do - base_form + search_field - end - end - end - # Integration of rack-restful_submit convention to be able to call # RESTful resources defined by Rails conventions without Javascript. # diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js index bb23e4e..cd4a0dc 100644 --- a/src/public/javascripts/application.js +++ b/src/public/javascripts/application.js @@ -3,54 +3,6 @@ $.extend(Conductor, { - extendTable: function(options) { - var table = $(options.id); - var wrapper = $(".wrapper", table); - - // show searchfield (it's disabled by default because with JS off, - // when enter is pressed in search field, form is submited) - $(".search_field", table).css('display', 'block'); - - // make column head links ajax - $("table thead tr th a", table).click(function() {wrapper.load($(this).attr('href'));return false;}); - - // pagination links should be ajax too - $(".pagination a", table).click(function() {wrapper.load($(this).attr('href'));return false;}); - - // check all checkboxes when checking "check all" - $("input[name='check_all']", table).click(function() {$("input[name='ids[]']", table).attr('checked', $(this).attr('checked'))}); - - // check checkbox if row is clicked - $("table tbody tr", table).click(function(ev) { - var on_checkbox = $(ev.target).attr('name') == 'ids[]'; - var box = $("input[name='ids[]']", this); - var old_val = box.attr('checked'); - if (options.single_select || !on_checkbox) $("input[name='ids[]']", table).attr('checked', false); - // when click is on checkbox, value is already toggled - box.attr('checked', on_checkbox ? old_val : !old_val); - }); - }, - - extendTableSearchField: function(options) { - var table = $(options.id); - var wrapper = $(".wrapper", table); - $(".search_field input", table).keypress(function(ev) { - var delay = 1000; - if (ev.keyCode == 13) { - delay = 0; - ev.preventDefault(); - } - if (table.searching) clearTimeout(table.searching); - table.searching = setTimeout(function() { - $(".wrapper", table).mask('Searching...'); - table.search_lock = false; - var search = $(".search_field input", table).val(); - var url = $("form", table).attr('action') + '&search=' + search; - wrapper.load(url, function() {$(".wrapper", table).unmask()}); - }, delay); - }); - }, - positionFooter: function () { var $footer = $('footer'); if ($(document.body).height() < $(window).height()) { -- 1.7.6

2 1

[PATCH] Added app/views/provider_types into rpm spec file
by Jan Provazník 21 Sep '11

21 Sep '11

From: Jan Provaznik <jprovazn(a)redhat.com> --- aeolus-conductor.spec.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in index d66f5cf..5139e92 100644 --- a/aeolus-conductor.spec.in +++ b/aeolus-conductor.spec.in @@ -135,7 +135,8 @@ haml="app/views/hardware_profiles app/views/realm_mappings \ app/views/quotas app/views/permissions \ app/views/deployments app/views/pools \ app/views/instances app/views/user_sessions \ - app/views/catalog_entries app/views/catalogs" + app/views/catalog_entries app/views/catalogs \ + app/views/provider_types" html="public" ico="public" jpg="public/images public/stylesheets/images" -- 1.7.6.2

2 1

Ripped out aeolus-image CLI code
by Martyn Taylor 21 Sep '11

21 Sep '11

Appologies if you have received this more than once. There is now a new repo for aeolus-image ruby client found here: git@github.com:aeolusproject/aeolus-image-rubygem.git This patch applies to that repo

1 1

Ripped out aeolus-image CLI code
by Martyn Taylor (none) 21 Sep '11

21 Sep '11

I've forked the aeolus-image repo to create a new repo for the ruby client. This patch applies to the new repo which can be found here: git@github.com:aeolusproject/aeolus-image-rubygem.git

1 1

Ripped out aeolus-image CLI code
by Martyn Taylor (none) 21 Sep '11

21 Sep '11

I've forked the aeolus-image repo in order to create a new git repo for the client library. This patch applies to the new aeolus-image-rubygem repository found here: https://github.com/aeolusproject/aeolus-image-rubygem

1 1

[PATCH configure 1/2] added usage to aeolus-check-services
by Maros Zatko 21 Sep '11

21 Sep '11

From: Maros Zatko <mzatko(a)redhat.com> --- bin/aeolus-check-services | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/bin/aeolus-check-services b/bin/aeolus-check-services index 56c2d71..03792f4 100755 --- a/bin/aeolus-check-services +++ b/bin/aeolus-check-services @@ -14,6 +14,18 @@ # See the License for the specific language governing permissions and # limitations under the License. +if ARGV.include?('-h') || ARGV.include?('--help') + puts "Usage: #{$0} [OPTION] +Show status of Aeolus services. + + -h, --help display this help and exit + +To restart aeolus services please use aeolus-restart-services. +" + + exit +end + init_scripts=%w(mongod iwhd postgresql httpd qpidd deltacloud-core libvirtd condor aeolus-conductor conductor-dbomatic imagefactory ntpd) init_scripts.each do |script| -- 1.7.6

1 1

← Newer
1
...
6
7
8
9
10
11
12
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

aeolus-devel September 2011