deltacloud-devel

deltacloud-devel@lists.fedorahosted.org

1160 discussions

Start a nNew thread

InstanceKey patch (rev. 3)
by Jan Provazník 18 Jan '11

18 Jan '11

Fixed one spec test, which for some reason passes for me but not for Tomas.

3 4

Deltacloud Aggregator renamed to Aeolus Conductor
by Chris Lalancette 17 Jan '11

17 Jan '11

All, As promised[1], we have renamed the Deltacloud Aggregator to the Aeolus Conductor. The new website is http://www.aeolusproject.org. The now-obsolete deltacloud git repositories have been left in place, but set read-only; new code will be committed to the aeolus repositories (links to these are at the website). The yum repositories with in-progress packages have been moved from http://repos.fedorapeople.org/deltacloud/appliance to http://repos.fedorapeople.org/aeolus/packages . There is also a new mailing list for Aeolus development, aeolus-devel(a)fedorahosted.org [2]. The old mailing list will continue to function for now, but those who mail to that list will be gently asked to repost to aeolus-devel. As usual, any questions, comments, or requests for clarification are welcome. -- Chris Lalancette [1] https://fedorahosted.org/pipermail/deltacloud-devel/2011-January/003668.html [2] https://fedorahosted.org/mailman/listinfo/aeolus-devel

1 0

[PATCH aeolus] Cucumber tests for Users search
by Tomas Sedovic 17 Jan '11

17 Jan '11

From: Tomas Sedovic <tsedovic(a)redhat.com> --- src/features/step_definitions/user_steps.rb | 4 +++- src/features/user.feature | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/src/features/step_definitions/user_steps.rb b/src/features/step_definitions/user_steps.rb index ed474e3..13932fa 100644 --- a/src/features/step_definitions/user_steps.rb +++ b/src/features/step_definitions/user_steps.rb @@ -1,5 +1,7 @@ Given /^there is a user "([^"]*)"$/ do |name| - User.find_by_login(name).should_not == nil + unless User.find_by_login(name) + Factory :user, :login => name, :email => "#{name}(a)example.com" + end end Given /^there are (\d+) users$/ do |number| diff --git a/src/features/user.feature b/src/features/user.feature index 89dd7d5..1819cb5 100644 --- a/src/features/user.feature +++ b/src/features/user.feature @@ -42,3 +42,18 @@ Feature: Manage Users When I follow "cancel" Then there should only be 2 users And I should be on the admin users page + + Scenario: Search for hardware profiles + Given there is a user "myuser" + And there is a user "someuser" + And I am on the admin users page + Then I should see "myuser" + And I should see "someuser" + When I fill in "q" with "some" + And I press "Search" + Then I should see "someuser" + And I should not see "myuser" + When I fill in "q" with "myuser" + And I press "Search" + Then I should see "myuser" + And I should not see "someuser" -- 1.7.3.4

2 1

[PATCH aeolus] Add search for Users
by Tomas Sedovic 17 Jan '11

17 Jan '11

From: Tomas Sedovic <tsedovic(a)redhat.com> --- src/app/controllers/admin/users_controller.rb | 16 +++++++++++++++- src/app/models/user.rb | 7 +++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/app/controllers/admin/users_controller.rb b/src/app/controllers/admin/users_controller.rb index 0e854a9..1c48dcb 100644 --- a/src/app/controllers/admin/users_controller.rb +++ b/src/app/controllers/admin/users_controller.rb @@ -1,7 +1,21 @@ class Admin::UsersController < ApplicationController before_filter :require_user before_filter :only_admin, :only => [:index, :multi_destroy] - before_filter :load_users, :only => [:index, :show] + before_filter :load_users, :only => [:show] + + def index + @params = params + @search_term = params[:q] + if @search_term.blank? + load_users + return + end + + search = User.search do + keywords(params[:q]) + end + @users = search.results + end def new @user = User.new diff --git a/src/app/models/user.rb b/src/app/models/user.rb index 7942ae4..cc77d9d 100644 --- a/src/app/models/user.rb +++ b/src/app/models/user.rb @@ -19,7 +19,14 @@ # Filters added to this controller apply to all controllers in the application. # Likewise, all the methods added will be available for all controllers. +require 'sunspot_rails' class User < ActiveRecord::Base + searchable do + text :login, :as => :code_substring + text :last_name, :as => :code_substring + text :first_name, :as => :code_substring + text :email, :as => :code_substring + end acts_as_authentic has_many :permissions -- 1.7.3.4

2 1

Re: [deltacloud-devel] Rename of deltacloud aggregator
by Chris Lalancette 17 Jan '11

17 Jan '11

On 01/16/11 - 11:23:51AM, Peter Robinson wrote: > On Wed, Jan 12, 2011 at 6:26 PM, Chris Lalancette <clalance(a)redhat.com> wrote: > > All, > > A few months ago we transferred the deltacloud API and core over to the > > apache foundation. Along with that we have also transferred the name > > "deltacloud" to apache (at least in spirit, I don't know what the legal > > situation is). > > To reduce confusion between the API and what is currently called the > > deltacloud aggregator, and to give a new home to the sub-projects that the > > aggregator depends on, we are launching the http://www.aeolusproject.org > > website. Aeolus is the Greek god of wind, so we think it fits in nicely with > > the cloud theme. The aggregator will be formally renamed to > > "Aeolus Conductor", and several of the subprojects that the Conductor depends > > on will be added to the website. The old deltacloud git repositories will be > > marked read-only, and new development will happen in the aeolus repositories. > > Additionally, http://deltacloud.org will be modified to redirect to the > > apache incubator page. > > We plan on making the changes to the mailing lists, git repositories, and > > website on Monday, Jan 17. The code inside the git repositories will probably > > continue to use the old names for a little while longer, but we will patch them > > as quickly as possible. > > As usual, any questions, comments, or criticisms are welcome. > > Is there any packages already in Fedora that will need to be renamed > as a result of this? There shouldn't be. Due to our long chain of dependencies (along with some not-yet-upstream code), we have not yet packaged Aeolus Conductor (nee Deltacloud Aggregator) for Fedora. Given the Fedora timeline, it is unlikely that we will make it in for F-15, but it is our goal to get the thing pacakged and included in F-16. Thanks, -- Chris Lalancette

1 0

[PATCH aeolus] Hardware Profiles UI
by Martyn Taylor 17 Jan '11

17 Jan '11

From: Martyn Taylor <mtaylor(a)redhat.com> --- .../admin/hardware_profiles_controller.rb | 114 +++++++++++++++++++- src/app/models/hardware_profile.rb | 13 ++- src/app/models/hardware_profile_property.rb | 2 +- src/app/models/property_enum_entry.rb | 3 + src/app/stylesheets/newui.scss | 5 + src/app/views/admin/hardware_profiles/_form.haml | 28 +++++ src/app/views/admin/hardware_profiles/_list.haml | 37 ++++--- .../_matching_provider_hardware_profiles.haml | 8 +- .../views/admin/hardware_profiles/_properties.haml | 1 + src/app/views/admin/hardware_profiles/create.haml | 6 + src/app/views/admin/hardware_profiles/edit.haml | 7 ++ src/app/views/admin/hardware_profiles/new.haml | 7 ++ src/app/views/admin/provider_accounts/new.haml | 2 +- src/config/routes.rb | 3 +- .../20090804135630_create_hardware_profiles.rb | 2 +- src/features/hardware_profile.feature | 63 +++++++++++- .../step_definitions/hardware_profile_steps.rb | 21 ++++ src/features/support/paths.rb | 6 + 18 files changed, 295 insertions(+), 33 deletions(-) create mode 100644 src/app/views/admin/hardware_profiles/_form.haml create mode 100644 src/app/views/admin/hardware_profiles/create.haml create mode 100644 src/app/views/admin/hardware_profiles/edit.haml create mode 100644 src/app/views/admin/hardware_profiles/new.haml diff --git a/src/app/controllers/admin/hardware_profiles_controller.rb b/src/app/controllers/admin/hardware_profiles_controller.rb index 67c655d..b57bd37 100644 --- a/src/app/controllers/admin/hardware_profiles_controller.rb +++ b/src/app/controllers/admin/hardware_profiles_controller.rb @@ -2,6 +2,9 @@ class Admin::HardwareProfilesController < ApplicationController before_filter :require_user before_filter :load_hardware_profiles, :only => [:index, :show] before_filter :load_hardware_profile, :only => [:show] + before_filter :setup_new_hardware_profile, :only => [:new] + before_filter :setup_hardware_profile, :only => [:new, :create, :edit, :update] + def index end @@ -29,12 +32,73 @@ class Admin::HardwareProfilesController < ApplicationController end def create + build_hardware_profile(params[:hardware_profile]) + if params[:commit] == 'Save' + if @hardware_profile.save! + redirect_to admin_hardware_profiles_path + else + params.delete :commit + render :action => 'create' + end + else + matching_provider_hardware_profiles + render :action => 'new' + end end def delete end + def edit + unless @hardware_profile + @hardware_profile = HardwareProfile.find(params[:id]) + end + matching_provider_hardware_profiles + end + + def update + if params[:commit] == "Reset" + redirect_to edit_admin_hardware_profile_url(@hardware_profile) and return + end + + if params[:id] + @hardware_profile = HardwareProfile.find(params[:id]) + build_hardware_profile(params[:hardware_profile]) + end + + if params[:commit] == "Check Matches" + matching_provider_hardware_profiles + render :edit and return + end + + unless @hardware_profile.save! + render :action => 'edit' and return + else + flash[:notice] = "Hardware Profile updated!" + redirect_to admin_hardware_profiles_path + end + end + + def multi_destroy + HardwareProfile.destroy(params[:hardware_profile_selected]) + redirect_to admin_hardware_profiles_path + end + private + def setup_new_hardware_profile + if params[:hardware_profile] + begin + @hardware_profile = HardwareProfile.new(remove_irrelevant_params(params[:hardware_profile])) + end + else + @hardware_profile = HardwareProfile.new(:memory => HardwareProfileProperty.new(:name => "memory", :unit => "MB"), + :cpu => HardwareProfileProperty.new(:name => "cpu", :unit => "count"), + :storage => HardwareProfileProperty.new(:name => "storage", :unit => "GB"), + :architecture => HardwareProfileProperty.new(:name => "architecture", :unit => "label")) + end + matching_provider_hardware_profiles + end + def properties @properties_header = [ { :name => "Name", :sort_attr => :name}, @@ -58,8 +122,26 @@ class Admin::HardwareProfilesController < ApplicationController { :name => "Storage", :sort_attr => :storage }, { :name => "Virtual CPU", :sort_attr => :cpus} ] - @matching_hwps = HardwareProfile.all(:include => "aggregator_hardware_profiles", - :conditions => {:hardware_profile_map => { :aggregator_hardware_profile_id => params[:id] }}) + + begin + @matching_hwps = HardwareProfile.matching_hwps((a)hardware_profile).map { |hwp| hwp[:hardware_profile] } + rescue + @matching_hwps = [] + end + end + + def setup_hardware_profile + @tab_captions = ['Matched Provider Hardware Profiles'] + @details_tab = 'matching_provider_hardware_profiles' + @url_params = params + @header = [ + { :name => "Name", :sort_attr => :name}, + { :name => "Unit", :sort_attr => :unit}, + { :name => "Kind", :sort_attr => :kind }, + { :name => "Value (Default)", :sort_attr => :value}, + { :name => "Enum Entries", :sort_attr => :false }, + { :name => "Range First", :sort_attr => :range_first}, + { :name => "Range Last", :sort_attr => :range_last }] end def load_hardware_profiles @@ -75,7 +157,33 @@ class Admin::HardwareProfilesController < ApplicationController end def load_hardware_profile - @hardware_profile = HardwareProfile.find((params[:id] || []).first) + @hardware_profile = HardwareProfile.find(params[:id]) end + def build_hardware_profile(params) + hwpps = [:memory_attributes, :cpu_attributes, :storage_attributes, :architecture_attributes] + enum_values = {} + hwpps.each do |attr| + unless params[attr][:kind] == "range" + params[attr].delete(:range_first) + params[attr].delete(:range_last) + end + + unless params[attr][:kind] == "enum" + params[attr].delete(:enum) + else + enum_values[params[attr][:name]] = params[attr][:property_enum_entries].split(%r{,\s*}) + end + params[attr].delete(:property_enum_entries) + end + + @hardware_profile.nil? ? @hardware_profile = HardwareProfile.new(params) : @hardware_profile.update_attributes(params) + + # Set Property Enum Entries on enum types + [@hardware_profile.memory, @hardware_profile.cpu, @hardware_profile.architecture, @hardware_profile.storage].each do |hwpp| + if hwpp.kind == "enum" + hwpp.property_enum_entries = enum_values[hwpp.name].map { |value| PropertyEnumEntry.new(:value => value) } + end + end + end end \ No newline at end of file diff --git a/src/app/models/hardware_profile.rb b/src/app/models/hardware_profile.rb index d7ae995..10f1283 100644 --- a/src/app/models/hardware_profile.rb +++ b/src/app/models/hardware_profile.rb @@ -29,13 +29,18 @@ class HardwareProfile < ActiveRecord::Base belongs_to :memory, :class_name => "HardwareProfileProperty", :dependent => :destroy + belongs_to :storage, :class_name => "HardwareProfileProperty", :dependent => :destroy + belongs_to :cpu, :class_name => "HardwareProfileProperty", :dependent => :destroy + belongs_to :architecture, :class_name => "HardwareProfileProperty", :dependent => :destroy + accepts_nested_attributes_for :memory, :cpu, :storage, :architecture + has_and_belongs_to_many :aggregator_hardware_profiles, :class_name => "HardwareProfile", :join_table => "hardware_profile_map", @@ -48,8 +53,8 @@ class HardwareProfile < ActiveRecord::Base :foreign_key => "aggregator_hardware_profile_id", :association_foreign_key => "provider_hardware_profile_id" - validates_presence_of :external_key - validates_uniqueness_of :external_key, :scope => [:provider_id] + #validates_presence_of :external_key + #validates_uniqueness_of :external_key, :scope => [:provider_id] validates_presence_of :name validates_uniqueness_of :name, :scope => [:provider_id] @@ -67,8 +72,8 @@ class HardwareProfile < ActiveRecord::Base def validate if provider.nil? if !aggregator_hardware_profiles.empty? - errors.add(:aggregator_hardware_profiles, - "Aggregator profiles only allowed for provider profiles") + #errors.add(:aggregator_hardware_profiles, + #"Aggregator profiles only allowed for provider profiles") end else if !provider_hardware_profiles.empty? diff --git a/src/app/models/hardware_profile_property.rb b/src/app/models/hardware_profile_property.rb index 46e4b8e..3f6bdfe 100644 --- a/src/app/models/hardware_profile_property.rb +++ b/src/app/models/hardware_profile_property.rb @@ -101,7 +101,7 @@ class HardwareProfileProperty < ActiveRecord::Base def to_s case kind when FIXED - value + value.to_s when RANGE range_first.to_s + " - " + range_last.to_s when ENUM diff --git a/src/app/models/property_enum_entry.rb b/src/app/models/property_enum_entry.rb index ff497ef..81bb67e 100644 --- a/src/app/models/property_enum_entry.rb +++ b/src/app/models/property_enum_entry.rb @@ -32,4 +32,7 @@ class PropertyEnumEntry < ActiveRecord::Base HardwareProfileProperty::STORAGE or p.hardware_profile_property.name == HardwareProfileProperty::CPU } + def to_s + value.to_s + ", " + end end diff --git a/src/app/stylesheets/newui.scss b/src/app/stylesheets/newui.scss index 513d510..d0fbcc9 100644 --- a/src/app/stylesheets/newui.scss +++ b/src/app/stylesheets/newui.scss @@ -1371,6 +1371,11 @@ $content-left: 180px; float: left; } +#list { + float: left; + width: 100%; +} + #details-view { border: 1px solid; position: absolute; diff --git a/src/app/views/admin/hardware_profiles/_form.haml b/src/app/views/admin/hardware_profiles/_form.haml new file mode 100644 index 0000000..65278f2 --- /dev/null +++ b/src/app/views/admin/hardware_profiles/_form.haml @@ -0,0 +1,28 @@ +=hwp_form.label :name +=hwp_form.text_field :name +%table + = sortable_table_header @header + - [:memory, :cpu, :storage, :architecture].each do |type| + - hwp_form.fields_for type do |hwpp_form| + %tr + %td + =hwpp_form.text_field(:name, :readonly => "readonly") + %td + =hwpp_form.text_field(:unit, :size => 5, :readonly => "readonly") + %td + -unless type == :architecture + =hwpp_form.select("kind", ["fixed", "range", "enum"], {}) + -else + =hwpp_form.select("kind", ["fixed", "enum"], {}) + %td + =hwpp_form.text_field(:value) + %td + =hwpp_form.text_field(:property_enum_entries) + %td + -unless type == :architecture + =hwpp_form.text_field(:range_first) + %td + -unless type == :architecture + =hwpp_form.text_field(:range_last) += hwp_form.submit 'Check Matches', :class => "submit formbutton" += hwp_form.submit 'Save', :class => 'submit formbutton' \ No newline at end of file diff --git a/src/app/views/admin/hardware_profiles/_list.haml b/src/app/views/admin/hardware_profiles/_list.haml index 7399549..e2f344e 100644 --- a/src/app/views/admin/hardware_profiles/_list.haml +++ b/src/app/views/admin/hardware_profiles/_list.haml @@ -1,7 +1,7 @@ - form_tag do #object-actions - = restful_submit_tag "Create", "create", admin_hardware_profiles_path, "PUT" - = restful_submit_tag "Delete", "delete", admin_hardware_profiles_path, "DELETE" + = link_to "New Hardware Profile", new_admin_hardware_profile_path, :class => 'button' + = restful_submit_tag "Delete", "destroy", multi_destroy_admin_hardware_profiles_path, "DELETE", :id => 'delete_button' #selections %p @@ -10,19 +10,20 @@ %span> ,  = link_to "None", @url_params.merge(:select => 'none') -%table - = sortable_table_header @header - - @hardware_profiles.each do |hwp| - %tr - %td - - selected = @url_params[:select] == 'all' - = check_box(:pool, "selected[#{hwp.id}]", :checked => selected) - = link_to hwp.name, admin_hardware_profile_path(hwp) - %td - =hwp.architecture.to_s - %td - =hwp.memory.to_s - %td - =hwp.storage.to_s - %td - =hwp.cpu.to_s + #list + %table + = sortable_table_header @header + - @hardware_profiles.each do |hwp| + %tr + %td + - selected = @url_params[:select] == 'all' + %input{:name => "hardware_profile_selected[]", :type => "checkbox", :value => hwp.id, :id => "hardware_profile_checkbox_#{hwp.id}", :checked => selected } + = link_to hwp.name, admin_hardware_profile_path(hwp) + %td + =hwp.architecture.to_s + %td + =hwp.memory.to_s + %td + =hwp.storage.to_s + %td + =hwp.cpu.to_s diff --git a/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml b/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml index cfbb856..0f4ba7b 100644 --- a/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml +++ b/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml @@ -1,11 +1,13 @@ -%h3 - = @hardware_profile.name +- if @hardware_profile + %h3 + =(a)hardware_profile.name %table = sortable_table_header @provider_hwps_header - @matching_hwps.each do |hwp| %tr %td - = link_to hwp.provider.name, admin_provider_path(hwp.provider) + - if hwp.provider + = link_to hwp.provider.name, admin_provider_path(hwp.provider) %td = link_to hwp.name, admin_hardware_profile_path(hwp) %td diff --git a/src/app/views/admin/hardware_profiles/_properties.haml b/src/app/views/admin/hardware_profiles/_properties.haml index 590edc5..bc91219 100644 --- a/src/app/views/admin/hardware_profiles/_properties.haml +++ b/src/app/views/admin/hardware_profiles/_properties.haml @@ -1,5 +1,6 @@ %h3 = @hardware_profile.name + "(" + (@hardware_profile.provider_id.nil? ? "Front End" : "Provider" ) + ")" += link_to 'Edit', edit_admin_hardware_profile_path(@hardware_profile), :class => 'button' %table = sortable_table_header @properties_header - @hwp_properties.each do |hwpp| diff --git a/src/app/views/admin/hardware_profiles/create.haml b/src/app/views/admin/hardware_profiles/create.haml new file mode 100644 index 0000000..c26bbe9 --- /dev/null +++ b/src/app/views/admin/hardware_profiles/create.haml @@ -0,0 +1,6 @@ +%h3 + Check Matching Hardware Profiles +- content_for :list do + = render :partial => "form" +- content_for :details do + = render :partial => 'layouts/details_pane' \ No newline at end of file diff --git a/src/app/views/admin/hardware_profiles/edit.haml b/src/app/views/admin/hardware_profiles/edit.haml new file mode 100644 index 0000000..e32eebd --- /dev/null +++ b/src/app/views/admin/hardware_profiles/edit.haml @@ -0,0 +1,7 @@ +- content_for :list do + %h3 + Edit Hardware Profile + -form_for @hardware_profile, :url => admin_hardware_profile_path(@hardware_profile), :html => { :multipart => true } do |hwp_form| + = render :partial => "form", :locals => { :hwp_form => hwp_form } +- content_for :details do + = render :partial => 'layouts/details_pane' diff --git a/src/app/views/admin/hardware_profiles/new.haml b/src/app/views/admin/hardware_profiles/new.haml new file mode 100644 index 0000000..3355c87 --- /dev/null +++ b/src/app/views/admin/hardware_profiles/new.haml @@ -0,0 +1,7 @@ +- content_for :list do + %h3 + New Hardware Profile + -form_for @hardware_profile, :url => admin_hardware_profiles_path, :html => { :multipart => true } do |hwp_form| + = render :partial => "form", :locals => { :hwp_form => hwp_form } +- content_for :details do + = render :partial => 'layouts/details_pane' \ No newline at end of file diff --git a/src/app/views/admin/provider_accounts/new.haml b/src/app/views/admin/provider_accounts/new.haml index e567bce..55e469c 100644 --- a/src/app/views/admin/provider_accounts/new.haml +++ b/src/app/views/admin/provider_accounts/new.haml @@ -13,4 +13,4 @@ %p.requirement %span.required * \- - = t('cloud_accounts.new.required_field') + = t('cloud_accounts.new.required_field') \ No newline at end of file diff --git a/src/config/routes.rb b/src/config/routes.rb index 6d9b5cf..463031d 100644 --- a/src/config/routes.rb +++ b/src/config/routes.rb @@ -47,7 +47,8 @@ ActionController::Routing::Routes.draw do |map| map.connect '/set_layout', :controller => 'application', :action => 'set_layout' map.namespace 'admin' do |r| - r.resources :hardware_profiles, :pool_families, :realms + r.resources :hardware_profiles, :collection => { :multi_destroy => :delete } + r.resources :pool_families, :realms r.resources :providers, :collection => { :multi_destroy => :delete } r.resources :users, :collection => { :multi_destroy => :delete } r.resources :provider_accounts, :collection => { :multi_destroy => :delete } diff --git a/src/db/migrate/20090804135630_create_hardware_profiles.rb b/src/db/migrate/20090804135630_create_hardware_profiles.rb index 5ad0435..ec4a50f 100644 --- a/src/db/migrate/20090804135630_create_hardware_profiles.rb +++ b/src/db/migrate/20090804135630_create_hardware_profiles.rb @@ -40,7 +40,7 @@ class CreateHardwareProfiles < ActiveRecord::Migration end create_table :hardware_profiles do |t| - t.string :external_key, :null => false + t.string :external_key t.string :name, :null => false, :limit => 1024 t.integer :memory_id t.integer :storage_id diff --git a/src/features/hardware_profile.feature b/src/features/hardware_profile.feature index 6f1cc81..e6fa89e 100644 --- a/src/features/hardware_profile.feature +++ b/src/features/hardware_profile.feature @@ -48,4 +48,65 @@ Feature: Manage Pools And I follow "Matching Provider Hardware Profiles" Then I should see the following: | Name | Memory | CPU | Storage | Architecture | - | m1-small | 1740 | 2 | 160 | i386 | \ No newline at end of file + | m1-small | 1740 | 2 | 160 | i386 | + + Scenario: Create a new Hardware Profile + Given I am an authorised user + And I am on the hardware profiles page + When I follow "New Hardware Profile" + Then I should be on the new hardware profile page + When I fill in "name" with "Test Hardware Profile" + And I enter the following details for the Hardware Profile Properties + | name | kind | range_first | range_last | property_enum_entries | value | unit | + | memory | fixed | | | | 1740 | MB | + | cpu | range | 1 | 4 | | 2 | count | + | storage | range | 250 | 500 | | 300 | GB | + | architecture | enum | | | i386, x86_64 | i386 | label | + And I press "Save" + Then I should be on the hardware profiles page + And I should see the following: + | Name | memory | cpu | storage | architecture | + | Test Hardware Profile | 1740 | 1 - 4 | 250 - 500 | i386, x86_64 | + + Scenario: Check New Hardware Profile matching Provider Hardware Profiles + Given I am an authorised user + And there are the following provider hardware profiles: + | name | memory | cpu |storage | architecture | + | small | 1740 | 1 | 250 | i386 | + | medium | 1740 | 2 | 500 | i386 | + | large | 2048 | 4 | 850 | x86_64 | + And I am on the new hardware profile page + When I fill in "name" with "Test Hardware Profile" + And I enter the following details for the Hardware Profile Properties + | name | kind | range_first | range_last | property_enum_entries | value | unit | + | memory | fixed | | | | 1740 | MB | + | cpu | range | 1 | 4 | | 2 | count | + | storage | range | 250 | 500 | | 300 | GB | + | architecture | enum | | | i386, x86_64 | i386 | label | + And I press "Check Matches" + Then I should see the following: + | Name | Memory | CPU | Storage | Architecture | + | small | 1740 | 1 | 300 | i386 | + | medium | 1740 | 2 | 500 | i386 | + + Scenario: Update a HardwareProfile + Given I am an authorised user + And there are the following aggregator hardware profiles: + | name | memory | cpu |storage | architecture | + | m1-small | 1740 | 2 | 160 | i386 | + And I am on the hardware profiles page + When I follow "m1-small" + Then I should see "Properties" + When I follow "edit" + Then I should be on the edit hardware profiles page + When I enter the following details for the Hardware Profile Properties + | name | kind | range_first | range_last | property_enum_entries | value | + | memory | fixed | | | | 1740 | + | cpu | range | 1 | 4 | | 1 | + | storage | range | 250 | 500 | | 300 | + | architecture | enum | | | i386, x86_64 | i386 | + And I press "Save" + Then I should be on the hardware profiles page + Then I should see the following: + | Name | Memory | CPU | Storage | Architecture | + | m1-small | 1740 | 1 - 4 | 250 - 500 | i386, x86_64 | \ No newline at end of file diff --git a/src/features/step_definitions/hardware_profile_steps.rb b/src/features/step_definitions/hardware_profile_steps.rb index d29d136..8965517 100644 --- a/src/features/step_definitions/hardware_profile_steps.rb +++ b/src/features/step_definitions/hardware_profile_steps.rb @@ -19,4 +19,25 @@ def create_hwp(hash, provider=nil) cpu = Factory(:mock_hwp1_cpu, :value => hash[:cpu]) arch = Factory(:mock_hwp1_arch, :value => hash[:architecture]) Factory(:mock_hwp1, :name => hash[:name], :memory => memory, :cpu => cpu, :storage => storage, :architecture => arch, :provider => provider) +end + +When /^I enter the following details for the Hardware Profile Properties$/ do |table| + table.hashes.each do |hash| + hash.each_pair do |key, value| + unless (hash[:name] == "architecture" && (key == "range_first" || key == "range_last")) || key == "name" + When "I fill in \"#{"hardware_profile_" + hash[:name] + "_attributes_" + key}\" with \"#{value}\"" + end + end + end +end + +Given /^there are the following provider hardware profiles:$/ do |table| + provider = Factory :mock_provider + table.hashes do |hash| + memory = Factory(:mock_hwp1_memory, :value => hash[:memory]) + cpu = Factory(:mock_hwp1_cpu, :value => hash[:cpu]) + storage = Factory(:mock_hwp1_storage, :value => hash[:storage]) + architecture = Factory(:mock_hwp1_architecture, :value => hash[:architecture]) + Factory(:hardware_profile, :provider => provider, :memory => memory, :storage => storage, :cpu => cpu, :architecture => architecture) + end end \ No newline at end of file diff --git a/src/features/support/paths.rb b/src/features/support/paths.rb index 66de0d2..5dd1116 100644 --- a/src/features/support/paths.rb +++ b/src/features/support/paths.rb @@ -98,6 +98,12 @@ module NavigationHelpers when /the hardware profiles page/ url_for admin_hardware_profiles_path + when /the new hardware profile page/ + url_for new_admin_hardware_profile_path + + when /the edit hardware profiles page/ + url_for :action => 'edit', :controller => 'hardware_profiles', :only_path => true + when /^(.*)'s provider account page$/ admin_provider_account_path(CloudAccount.find_by_label($1)) -- 1.7.2.3

1 0

Search
by Tomas Sedovic 14 Jan '11

14 Jan '11

This is a new revision of the previous patches. It features simpler models, views and controllers plus some Cucumber tests.

3 6

[PATCH 0/2]: Remove bogus references
by Chris Lalancette 14 Jan '11

14 Jan '11

As mother always said, late is better than never. Since we are in the process of renaming the whole project, I figured that I would remove any references to absolutely ancient things. This series does that. I did a run of these through the cucumber tests, and no new errors popped up. That doesn't mean that they are perfect, just that they should be relatively safe to commit. Please review and ACK.

2 3

[PATCH aggregator] Implement Assemblies basic UI
by lmartinc＠redhat.com 14 Jan '11

14 Jan '11

From: Ladislav Martincik <lmartinc(a)redhat.com> --- .../image_factory/assemblies_controller.rb | 63 ++++++++++++++++++++ src/app/models/assembly.rb | 2 + src/app/views/image_factory/assemblies/_form.haml | 7 ++ src/app/views/image_factory/assemblies/_list.haml | 28 +++++++++ .../image_factory/assemblies/_properties.haml | 4 + src/app/views/image_factory/assemblies/edit.haml | 4 + src/app/views/image_factory/assemblies/index.haml | 3 +- src/app/views/image_factory/assemblies/new.haml | 3 + src/app/views/image_factory/assemblies/show.haml | 5 ++ src/config/routes.rb | 2 +- src/db/migrate/20110114111158_create_assemblies.rb | 13 ++++ src/features/assembly.feature | 50 ++++++++++++++++ src/features/step_definitions/assembly_steps.rb | 20 ++++++ src/features/support/paths.rb | 3 + 14 files changed, 205 insertions(+), 2 deletions(-) create mode 100644 src/app/models/assembly.rb create mode 100644 src/app/views/image_factory/assemblies/_form.haml create mode 100644 src/app/views/image_factory/assemblies/_list.haml create mode 100644 src/app/views/image_factory/assemblies/_properties.haml create mode 100644 src/app/views/image_factory/assemblies/edit.haml create mode 100644 src/app/views/image_factory/assemblies/new.haml create mode 100644 src/app/views/image_factory/assemblies/show.haml create mode 100644 src/db/migrate/20110114111158_create_assemblies.rb create mode 100644 src/features/assembly.feature create mode 100644 src/features/step_definitions/assembly_steps.rb diff --git a/src/app/controllers/image_factory/assemblies_controller.rb b/src/app/controllers/image_factory/assemblies_controller.rb index ce67f14..6627656 100644 --- a/src/app/controllers/image_factory/assemblies_controller.rb +++ b/src/app/controllers/image_factory/assemblies_controller.rb @@ -1,6 +1,69 @@ class ImageFactory::AssembliesController < ApplicationController before_filter :require_user + before_filter :load_assemblies, :only => [:index, :show] def index end + + def show + @assembly = Assembly.find(params[:id]) + @url_params = params.clone + @tab_captions = ['Properties'] + @details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab] + respond_to do |format| + format.js do + if @url_params.delete :details_pane + render :partial => 'layouts/details_pane' and return + end + render :partial => @details_tab and return + end + format.html { render :action => 'show'} + end + end + + def new + @assembly = Assembly.new + end + + def create + @assembly = Assembly.new(params[:assembly]) + if @assembly.save + flash[:notice] = "Assembly added." + redirect_to image_factory_assembly_url(@assembly) + else + render :action => :new + end + end + + def edit + @assembly = Assembly.find(params[:id]) + end + + def update + @assembly = Assembly.find(params[:id]) + if @assembly.update_attributes(params[:assembly]) + flash[:notice] = "Assembly updated." + redirect_to image_factory_assembly_url(@assembly) + else + render :action => :edit + end + end + + def multi_destroy + Assembly.destroy(params[:assemblies_selected]) + redirect_to image_factory_assemblies_url + end + + protected + + def load_assemblies + @header = [ + { :name => "Assembly name", :sort_attr => :name } + ] + @assemblies = Assembly.paginate(:all, + :page => params[:page] || 1, + :order => (params[:order_field] || 'name') +' '+ (params[:order_dir] || 'asc') + ) + @url_params = params.clone + end end diff --git a/src/app/models/assembly.rb b/src/app/models/assembly.rb new file mode 100644 index 0000000..5eac9de --- /dev/null +++ b/src/app/models/assembly.rb @@ -0,0 +1,2 @@ +class Assembly < ActiveRecord::Base +end diff --git a/src/app/views/image_factory/assemblies/_form.haml b/src/app/views/image_factory/assemblies/_form.haml new file mode 100644 index 0000000..39556e5 --- /dev/null +++ b/src/app/views/image_factory/assemblies/_form.haml @@ -0,0 +1,7 @@ += form.error_messages +%fieldset.clear + = form.label :name, t(:name), :class => "grid_3 alpha" + = form.text_field :name, :class => "grid_5" +%fieldset.clearfix + = form.submit "Save", :class => "submit formbutton" + = link_to t(:cancel), image_factory_assemblies_path, :class => 'button formbutton' diff --git a/src/app/views/image_factory/assemblies/_list.haml b/src/app/views/image_factory/assemblies/_list.haml new file mode 100644 index 0000000..f29b322 --- /dev/null +++ b/src/app/views/image_factory/assemblies/_list.haml @@ -0,0 +1,28 @@ +- form_tag do + = link_to "Create", new_image_factory_assembly_url, :class => 'button' + = restful_submit_tag "Delete", 'destroy', multi_destroy_image_factory_assemblies_path, 'DELETE', :id => 'delete_button' + + %table#assemblies_table + %thead + %tr + %th + %th= link_to "Name", image_factory_assemblies_url(:sort_by => "name") + -(a)assemblies.each do |assembly| + %tr + %td + %input{:name => "assemblies_selected[]", :type => "checkbox", :value => assembly.id, :id => "assembly_checkbox_#{assembly.id}" } + %td= link_to assembly.name, image_factory_assembly_path(assembly) + +:javascript + $(document).ready(function () { + $('#delete_button').click(function(e) { + if ($("#assemblies_table input[@type=radio]:checked").length == 0) { + alert('Please select any assembly to be deleted before clicking Delete button.'); + e.preventDefault(); + } else { + if (!confirm("Are you sure you want to delete this assembly?")) { + e.preventDefault(); + } + } + }); + }); diff --git a/src/app/views/image_factory/assemblies/_properties.haml b/src/app/views/image_factory/assemblies/_properties.haml new file mode 100644 index 0000000..5f91f6e --- /dev/null +++ b/src/app/views/image_factory/assemblies/_properties.haml @@ -0,0 +1,4 @@ +.grid_13 + %h2 #{(a)assembly.name} + + = link_to 'Edit', edit_image_factory_assembly_path(@assembly), :class => 'button' diff --git a/src/app/views/image_factory/assemblies/edit.haml b/src/app/views/image_factory/assemblies/edit.haml new file mode 100644 index 0000000..04871c3 --- /dev/null +++ b/src/app/views/image_factory/assemblies/edit.haml @@ -0,0 +1,4 @@ +%h2 Editing Assembly: #{(a)assembly.name} + +- form_for @assembly, :url => image_factory_assembly_path(@assembly), :html => { :method => :put } do |f| + = render :partial => "form", :locals => { :form => f } diff --git a/src/app/views/image_factory/assemblies/index.haml b/src/app/views/image_factory/assemblies/index.haml index 766d92c..62ccbc6 100644 --- a/src/app/views/image_factory/assemblies/index.haml +++ b/src/app/views/image_factory/assemblies/index.haml @@ -1 +1,2 @@ -image_factory/assemblies/index.haml +- content_for :list do + = render :partial => 'list' diff --git a/src/app/views/image_factory/assemblies/new.haml b/src/app/views/image_factory/assemblies/new.haml new file mode 100644 index 0000000..4763405 --- /dev/null +++ b/src/app/views/image_factory/assemblies/new.haml @@ -0,0 +1,3 @@ +%h2 New Assembly +- form_for @assembly, :url => image_factory_assemblies_path do |f| + = render :partial => "form", :locals => { :form => f } diff --git a/src/app/views/image_factory/assemblies/show.haml b/src/app/views/image_factory/assemblies/show.haml new file mode 100644 index 0000000..05eeedd --- /dev/null +++ b/src/app/views/image_factory/assemblies/show.haml @@ -0,0 +1,5 @@ +- content_for :list do + = render :partial => 'list' + +- content_for :details do + = render :partial => 'layouts/details_pane' diff --git a/src/config/routes.rb b/src/config/routes.rb index ad9fb67..00aaade 100644 --- a/src/config/routes.rb +++ b/src/config/routes.rb @@ -39,7 +39,7 @@ ActionController::Routing::Routes.draw do |map| end map.namespace 'image_factory' do |r| - r.resources :assemblies + r.resources :assemblies, :collection => { :multi_destroy => :delete } r.resources :deployables, :collection => { :multi_destroy => :delete } r.resources :templates, :collection => {:collections => :get, :add_selected => :get, :metagroup_packages => :get, :remove_package => :get, :multi_destroy => :delete} r.resources :builds diff --git a/src/db/migrate/20110114111158_create_assemblies.rb b/src/db/migrate/20110114111158_create_assemblies.rb new file mode 100644 index 0000000..25aaf7b --- /dev/null +++ b/src/db/migrate/20110114111158_create_assemblies.rb @@ -0,0 +1,13 @@ +class CreateAssemblies < ActiveRecord::Migration + def self.up + create_table :assemblies do |t| + t.string :name + + t.timestamps + end + end + + def self.down + drop_table :assemblies + end +end diff --git a/src/features/assembly.feature b/src/features/assembly.feature new file mode 100644 index 0000000..970f1b5 --- /dev/null +++ b/src/features/assembly.feature @@ -0,0 +1,50 @@ +Feature: Manage assemblies + In order to manage my cloud infrastructure + As a user + I want to manage assemblies + + Background: + Given I am an authorised user + And I am logged in + And I am using new UI + + Scenario: List assemblies + Given I am on the homepage + And there is a assembly named "MySQL cluster" + When I go to the image factory assemblies page + Then I should see "MySQL cluster" + + Scenario: Create a new Assembly + Given there is a assembly named "MySQL cluster" + And I am on the image factory assemblies page + When I follow "Create" + Then I should be on the new image factory assembly page + And I should see "New Assembly" + When I fill in "assembly[name]" with "App" + And I press "Save" + Then I should be on App's image factory assembly page + And I should see "Assembly added" + And I should have a assembly named "App" + And I should see "App" + + Scenario: Edit a assembly + Given there is a assembly named "MySQL cluster" + And I am on the image factory assemblies page + When I follow "MySQL cluster" + And I follow "Edit" + Then I should be on the edit image factory assembly page + And I should see "Editing Assembly" + When I fill in "assembly[name]" with "AppModified" + And I press "Save" + Then I should be on AppModified's image factory assembly page + And I should see "Assembly updated" + And I should have a assembly named "AppModified" + And I should see "AppModified" + + Scenario: Delete a assembly + Given there is a assembly named "App" + And I am on the image factory assemblies page + When I check the "App" assembly + And I press "Delete" + Then I should be on the image factory assemblies page + And there should be no assemblies diff --git a/src/features/step_definitions/assembly_steps.rb b/src/features/step_definitions/assembly_steps.rb new file mode 100644 index 0000000..cb9c5f0 --- /dev/null +++ b/src/features/step_definitions/assembly_steps.rb @@ -0,0 +1,20 @@ +Then /^there should be no assemblies$/ do + Assembly.count.should == 0 +end + +Given /^there are no assemblies$/ do + Assembly.count.should == 0 +end + +Then /^I should have a assembly named "([^"]*)"$/ do |name| + Assembly.find_by_name(name).should_not be_nil +end + +Given /^there is a assembly named "([^"]*)"$/ do |name| + Assembly.create!(:name => name) +end + +When /^I check the "([^"]*)" assembly$/ do |name| + assembly = Assembly.find_by_name(name) + check("assembly_checkbox_#{assembly.id}") +end diff --git a/src/features/support/paths.rb b/src/features/support/paths.rb index c0c77dc..dbe0077 100644 --- a/src/features/support/paths.rb +++ b/src/features/support/paths.rb @@ -104,6 +104,9 @@ module NavigationHelpers when /^(.*)'s image factory deployable page$/ image_factory_deployable_path(Deployable.find_by_name($1)) + when /^(.*)'s image factory assembly page$/ + image_factory_assembly_path(Assembly.find_by_name($1)) + # Add more mappings here. # Here is an example that pulls values out of the Regexp: # -- 1.7.3.5

2 1

[PATCH appliance] postgres/ssl support for the aeolus database
by Mo Morsi 14 Jan '11

14 Jan '11

--- bin/deltacloud-cleanup | 1 + bin/deltacloud-configure | 1 + contrib/deltacloud-configure.spec | 6 +- recipes/deltacloud_recipe/files/pg_hba-ssl.conf | 5 + recipes/deltacloud_recipe/files/postgresql.conf | 503 +++++++++++++++++++++ recipes/deltacloud_recipe/manifests/aggregator.pp | 34 ++- recipes/deltacloud_recipe/manifests/deltacloud.pp | 7 + recipes/openssl/manifests/init.pp | 34 ++ 8 files changed, 587 insertions(+), 4 deletions(-) create mode 100644 recipes/deltacloud_recipe/files/pg_hba-ssl.conf create mode 100644 recipes/deltacloud_recipe/files/postgresql.conf create mode 100644 recipes/openssl/manifests/init.pp diff --git a/bin/deltacloud-cleanup b/bin/deltacloud-cleanup index a359fce..a988f52 100755 --- a/bin/deltacloud-cleanup +++ b/bin/deltacloud-cleanup @@ -1,4 +1,5 @@ #!/bin/sh +export FACTER_DELTACLOUD_ENABLE_SECURITY=true puppet /usr/share/deltacloud-configure/deltacloud_uninstall.pp \ --modulepath=/usr/share/deltacloud-configure/modules/ diff --git a/bin/deltacloud-configure b/bin/deltacloud-configure index c034d4c..bfd340e 100755 --- a/bin/deltacloud-configure +++ b/bin/deltacloud-configure @@ -1,4 +1,5 @@ #!/bin/sh +export FACTER_DELTACLOUD_ENABLE_SECURITY=true puppet /usr/share/deltacloud-configure/deltacloud_recipe.pp \ --modulepath=/usr/share/deltacloud-configure/modules/ diff --git a/contrib/deltacloud-configure.spec b/contrib/deltacloud-configure.spec index 04ff82d..e49877f 100644 --- a/contrib/deltacloud-configure.spec +++ b/contrib/deltacloud-configure.spec @@ -4,7 +4,7 @@ Summary: DeltaCloud Configure Puppet Recipe Name: deltacloud-configure Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: GPLv2+ @@ -36,6 +36,7 @@ rm -rf %{buildroot} %{__cp} -R %{pbuild}/recipes/firewall/ %{buildroot}/%{dchome}/modules/firewall %{__cp} -R %{pbuild}/recipes/ntp/ %{buildroot}/%{dchome}/modules/ntp %{__cp} -R %{pbuild}/recipes/postgres/ %{buildroot}/%{dchome}/modules/postgres +%{__cp} -R %{pbuild}/recipes/openssl/ %{buildroot}/%{dchome}/modules/openssl %{__cp} -R %{pbuild}/bin/deltacloud-configure %{buildroot}/%{_sbindir}/ %{__cp} -R %{pbuild}/bin/deltacloud-cleanup %{buildroot}/%{_sbindir}/ @@ -49,6 +50,9 @@ rm -rf %{buildroot} %{dchome} %changelog +* Thu Jan 14 2011 Mohammed Morsi <mmorsi(a)redhat.com> 2.0.0-2 +- include openssl module + * Mon Jan 10 2011 Mike Orazi <morazi(a)redhat.com> 2.0.0-1 - Make this a drop in replacement for the old deltacloud-configure scripts diff --git a/recipes/deltacloud_recipe/files/pg_hba-ssl.conf b/recipes/deltacloud_recipe/files/pg_hba-ssl.conf new file mode 100644 index 0000000..94a64d0 --- /dev/null +++ b/recipes/deltacloud_recipe/files/pg_hba-ssl.conf @@ -0,0 +1,5 @@ +# we are still leaving Unix-domain sockets open, if we want to disable +# make sure to append "sslmode=require" and "-h localhost" to all psql +# commands +local all all trust +hostssl all all 127.0.0.1/32 md5 diff --git a/recipes/deltacloud_recipe/files/postgresql.conf b/recipes/deltacloud_recipe/files/postgresql.conf new file mode 100644 index 0000000..cf97fce --- /dev/null +++ b/recipes/deltacloud_recipe/files/postgresql.conf @@ -0,0 +1,503 @@ +# ----------------------------- +# PostgreSQL configuration file +# ----------------------------- +# +# This file consists of lines of the form: +# +# name = value +# +# (The "=" is optional.) Whitespace may be used. Comments are introduced with +# "#" anywhere on a line. The complete list of parameter names and allowed +# values can be found in the PostgreSQL documentation. +# +# The commented-out settings shown in this file represent the default values. +# Re-commenting a setting is NOT sufficient to revert it to the default value; +# you need to reload the server. +# +# This file is read on server startup and when the server receives a SIGHUP +# signal. If you edit the file on a running system, you have to SIGHUP the +# server for the changes to take effect, or use "pg_ctl reload". Some +# parameters, which are marked below, require a server shutdown and restart to +# take effect. +# +# Any parameter can also be given as a command-line option to the server, e.g., +# "postgres -c log_connections=on". Some parameters can be changed at run time +# with the "SET" SQL command. +# +# Memory units: kB = kilobytes Time units: ms = milliseconds +# MB = megabytes s = seconds +# GB = gigabytes min = minutes +# h = hours +# d = days + + +#------------------------------------------------------------------------------ +# FILE LOCATIONS +#------------------------------------------------------------------------------ + +# The default values of these variables are driven from the -D command-line +# option or PGDATA environment variable, represented here as ConfigDir. + +#data_directory = 'ConfigDir' # use data in another directory + # (change requires restart) +#hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file + # (change requires restart) +#ident_file = 'ConfigDir/pg_ident.conf' # ident configuration file + # (change requires restart) + +# If external_pid_file is not explicitly set, no extra PID file is written. +#external_pid_file = '(none)' # write an extra PID file + # (change requires restart) + + +#------------------------------------------------------------------------------ +# CONNECTIONS AND AUTHENTICATION +#------------------------------------------------------------------------------ + +# - Connection Settings - + +#listen_addresses = 'localhost' # what IP address(es) to listen on; + # comma-separated list of addresses; + # defaults to 'localhost', '*' = all + # (change requires restart) +#port = 5432 # (change requires restart) +max_connections = 100 # (change requires restart) +# Note: Increasing max_connections costs ~400 bytes of shared memory per +# connection slot, plus lock space (see max_locks_per_transaction). +#superuser_reserved_connections = 3 # (change requires restart) +#unix_socket_directory = '' # (change requires restart) +#unix_socket_group = '' # (change requires restart) +#unix_socket_permissions = 0777 # begin with 0 to use octal notation + # (change requires restart) +#bonjour_name = '' # defaults to the computer name + # (change requires restart) + +# - Security and Authentication - + +#authentication_timeout = 1min # 1s-600s +#ssl = off # (change requires restart) +#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH' # allowed SSL ciphers + # (change requires restart) +#ssl_renegotiation_limit = 512MB # amount of data between renegotiations +#password_encryption = on +#db_user_namespace = off + +# Kerberos and GSSAPI +#krb_server_keyfile = '' +#krb_srvname = 'postgres' # (Kerberos only) +#krb_caseins_users = off + +# - TCP Keepalives - +# see "man 7 tcp" for details + +#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; + # 0 selects the system default +#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; + # 0 selects the system default +#tcp_keepalives_count = 0 # TCP_KEEPCNT; + # 0 selects the system default + + +#------------------------------------------------------------------------------ +# RESOURCE USAGE (except WAL) +#------------------------------------------------------------------------------ + +# - Memory - + +shared_buffers = 24MB # min 128kB + # (change requires restart) +#temp_buffers = 8MB # min 800kB +#max_prepared_transactions = 0 # zero disables the feature + # (change requires restart) +# Note: Increasing max_prepared_transactions costs ~600 bytes of shared memory +# per transaction slot, plus lock space (see max_locks_per_transaction). +# It is not advisable to set max_prepared_transactions nonzero unless you +# actively intend to use prepared transactions. +#work_mem = 1MB # min 64kB +#maintenance_work_mem = 16MB # min 1MB +#max_stack_depth = 2MB # min 100kB + +# - Kernel Resource Usage - + +#max_files_per_process = 1000 # min 25 + # (change requires restart) +#shared_preload_libraries = '' # (change requires restart) + +# - Cost-Based Vacuum Delay - + +#vacuum_cost_delay = 0ms # 0-100 milliseconds +#vacuum_cost_page_hit = 1 # 0-10000 credits +#vacuum_cost_page_miss = 10 # 0-10000 credits +#vacuum_cost_page_dirty = 20 # 0-10000 credits +#vacuum_cost_limit = 200 # 1-10000 credits + +# - Background Writer - + +#bgwriter_delay = 200ms # 10-10000ms between rounds +#bgwriter_lru_maxpages = 100 # 0-1000 max buffers written/round +#bgwriter_lru_multiplier = 2.0 # 0-10.0 multipler on buffers scanned/round + +# - Asynchronous Behavior - + +#effective_io_concurrency = 1 # 1-1000. 0 disables prefetching + + +#------------------------------------------------------------------------------ +# WRITE AHEAD LOG +#------------------------------------------------------------------------------ + +# - Settings - + +#fsync = on # turns forced synchronization on or off +#synchronous_commit = on # immediate fsync at commit +#wal_sync_method = fsync # the default is the first option + # supported by the operating system: + # open_datasync + # fdatasync + # fsync + # fsync_writethrough + # open_sync +#full_page_writes = on # recover from partial page writes +#wal_buffers = 64kB # min 32kB + # (change requires restart) +#wal_writer_delay = 200ms # 1-10000 milliseconds + +#commit_delay = 0 # range 0-100000, in microseconds +#commit_siblings = 5 # range 1-1000 + +# - Checkpoints - + +#checkpoint_segments = 3 # in logfile segments, min 1, 16MB each +#checkpoint_timeout = 5min # range 30s-1h +#checkpoint_completion_target = 0.5 # checkpoint target duration, 0.0 - 1.0 +#checkpoint_warning = 30s # 0 disables + +# - Archiving - + +#archive_mode = off # allows archiving to be done + # (change requires restart) +#archive_command = '' # command to use to archive a logfile segment +#archive_timeout = 0 # force a logfile segment switch after this + # number of seconds; 0 disables + + +#------------------------------------------------------------------------------ +# QUERY TUNING +#------------------------------------------------------------------------------ + +# - Planner Method Configuration - + +#enable_bitmapscan = on +#enable_hashagg = on +#enable_hashjoin = on +#enable_indexscan = on +#enable_mergejoin = on +#enable_nestloop = on +#enable_seqscan = on +#enable_sort = on +#enable_tidscan = on + +# - Planner Cost Constants - + +#seq_page_cost = 1.0 # measured on an arbitrary scale +#random_page_cost = 4.0 # same scale as above +#cpu_tuple_cost = 0.01 # same scale as above +#cpu_index_tuple_cost = 0.005 # same scale as above +#cpu_operator_cost = 0.0025 # same scale as above +#effective_cache_size = 128MB + +# - Genetic Query Optimizer - + +#geqo = on +#geqo_threshold = 12 +#geqo_effort = 5 # range 1-10 +#geqo_pool_size = 0 # selects default based on effort +#geqo_generations = 0 # selects default based on effort +#geqo_selection_bias = 2.0 # range 1.5-2.0 + +# - Other Planner Options - + +#default_statistics_target = 100 # range 1-10000 +#constraint_exclusion = partition # on, off, or partition +#cursor_tuple_fraction = 0.1 # range 0.0-1.0 +#from_collapse_limit = 8 +#join_collapse_limit = 8 # 1 disables collapsing of explicit + # JOIN clauses + + +#------------------------------------------------------------------------------ +# ERROR REPORTING AND LOGGING +#------------------------------------------------------------------------------ + +# - Where to Log - + +#log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog and eventlog, + # depending on platform. csvlog + # requires logging_collector to be on. + +# This is used when logging to stderr: +logging_collector = on # Enable capturing of stderr and csvlog + # into log files. Required to be on for + # csvlogs. + # (change requires restart) + +# These are only used if logging_collector is on: +log_directory = 'pg_log' # directory where log files are written, + # can be absolute or relative to PGDATA +log_filename = 'postgresql-%a.log' # log file name pattern, + # can include strftime() escapes +log_truncate_on_rotation = on # If on, an existing log file of the + # same name as the new log file will be + # truncated rather than appended to. + # But such truncation only occurs on + # time-driven rotation, not on restarts + # or size-driven rotation. Default is + # off, meaning append to existing files + # in all cases. +log_rotation_age = 1d # Automatic rotation of logfiles will + # happen after that time. 0 disables. +log_rotation_size = 0 # Automatic rotation of logfiles will + # happen after that much log output. + # 0 disables. + +# These are relevant when logging to syslog: +#syslog_facility = 'LOCAL0' +#syslog_ident = 'postgres' + +#silent_mode = off # Run server silently. + # DO NOT USE without syslog or + # logging_collector + # (change requires restart) + + +# - When to Log - + +#client_min_messages = notice # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # log + # notice + # warning + # error + +#log_min_messages = warning # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # info + # notice + # warning + # error + # log + # fatal + # panic + +#log_error_verbosity = default # terse, default, or verbose messages + +#log_min_error_statement = error # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # info + # notice + # warning + # error + # log + # fatal + # panic (effectively off) + +#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements + # and their durations, > 0 logs only + # statements running at least this number + # of milliseconds + + +# - What to Log - + +#debug_print_parse = off +#debug_print_rewritten = off +#debug_print_plan = off +#debug_pretty_print = on +#log_checkpoints = off +#log_connections = off +#log_disconnections = off +#log_duration = off +#log_hostname = off +#log_line_prefix = '' # special values: + # %u = user name + # %d = database name + # %r = remote host and port + # %h = remote host + # %p = process ID + # %t = timestamp without milliseconds + # %m = timestamp with milliseconds + # %i = command tag + # %c = session ID + # %l = session line number + # %s = session start timestamp + # %v = virtual transaction ID + # %x = transaction ID (0 if none) + # %q = stop here in non-session + # processes + # %% = '%' + # e.g. '<%u%%%d> ' +#log_lock_waits = off # log lock waits >= deadlock_timeout +#log_statement = 'none' # none, ddl, mod, all +#log_temp_files = -1 # log temporary files equal or larger + # than the specified size in kilobytes; + # -1 disables, 0 logs all temp files +#log_timezone = unknown # actually, defaults to TZ environment + # setting + + +#------------------------------------------------------------------------------ +# RUNTIME STATISTICS +#------------------------------------------------------------------------------ + +# - Query/Index Statistics Collector - + +#track_activities = on +#track_counts = on +#track_functions = none # none, pl, all +#track_activity_query_size = 1024 +#update_process_title = on +#stats_temp_directory = 'pg_stat_tmp' + + +# - Statistics Monitoring - + +#log_parser_stats = off +#log_planner_stats = off +#log_executor_stats = off +#log_statement_stats = off + + +#------------------------------------------------------------------------------ +# AUTOVACUUM PARAMETERS +#------------------------------------------------------------------------------ + +#autovacuum = on # Enable autovacuum subprocess? 'on' + # requires track_counts to also be on. +#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and + # their durations, > 0 logs only + # actions running at least this number + # of milliseconds. +#autovacuum_max_workers = 3 # max number of autovacuum subprocesses +#autovacuum_naptime = 1min # time between autovacuum runs +#autovacuum_vacuum_threshold = 50 # min number of row updates before + # vacuum +#autovacuum_analyze_threshold = 50 # min number of row updates before + # analyze +#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum +#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze +#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum + # (change requires restart) +#autovacuum_vacuum_cost_delay = 20ms # default vacuum cost delay for + # autovacuum, in milliseconds; + # -1 means use vacuum_cost_delay +#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for + # autovacuum, -1 means use + # vacuum_cost_limit + + +#------------------------------------------------------------------------------ +# CLIENT CONNECTION DEFAULTS +#------------------------------------------------------------------------------ + +# - Statement Behavior - + +#search_path = '"$user",public' # schema names +#default_tablespace = '' # a tablespace name, '' uses the default +#temp_tablespaces = '' # a list of tablespace names, '' uses + # only default tablespace +#check_function_bodies = on +#default_transaction_isolation = 'read committed' +#default_transaction_read_only = off +#session_replication_role = 'origin' +#statement_timeout = 0 # in milliseconds, 0 is disabled +#vacuum_freeze_min_age = 50000000 +#vacuum_freeze_table_age = 150000000 +#xmlbinary = 'base64' +#xmloption = 'content' + +# - Locale and Formatting - + +datestyle = 'iso, mdy' +#intervalstyle = 'postgres' +#timezone = unknown # actually, defaults to TZ environment + # setting +#timezone_abbreviations = 'Default' # Select the set of available time zone + # abbreviations. Currently, there are + # Default + # Australia + # India + # You can create your own file in + # share/timezonesets/. +#extra_float_digits = 0 # min -15, max 2 +#client_encoding = sql_ascii # actually, defaults to database + # encoding + +# These settings are initialized by initdb, but they can be changed. +lc_messages = 'en_US.UTF-8' # locale for system error message + # strings +lc_monetary = 'en_US.UTF-8' # locale for monetary formatting +lc_numeric = 'en_US.UTF-8' # locale for number formatting +lc_time = 'en_US.UTF-8' # locale for time formatting + +# default configuration for text search +default_text_search_config = 'pg_catalog.english' + +# - Other Defaults - + +#dynamic_library_path = '$libdir' +#local_preload_libraries = '' + + +#------------------------------------------------------------------------------ +# LOCK MANAGEMENT +#------------------------------------------------------------------------------ + +#deadlock_timeout = 1s +#max_locks_per_transaction = 64 # min 10 + # (change requires restart) +# Note: Each lock table slot uses ~270 bytes of shared memory, and there are +# max_locks_per_transaction * (max_connections + max_prepared_transactions) +# lock table slots. + + +#------------------------------------------------------------------------------ +# VERSION/PLATFORM COMPATIBILITY +#------------------------------------------------------------------------------ + +# - Previous PostgreSQL Versions - + +#add_missing_from = off +#array_nulls = on +#backslash_quote = safe_encoding # on, off, or safe_encoding +#default_with_oids = off +#escape_string_warning = on +#regex_flavor = advanced # advanced, extended, or basic +#sql_inheritance = on +#standard_conforming_strings = off +#synchronize_seqscans = on + +# - Other Platforms and Clients - + +#transform_null_equals = off + + +#------------------------------------------------------------------------------ +# CUSTOMIZED OPTIONS +#------------------------------------------------------------------------------ + +#custom_variable_classes = '' # list of custom variable class names + +ssl = on diff --git a/recipes/deltacloud_recipe/manifests/aggregator.pp b/recipes/deltacloud_recipe/manifests/aggregator.pp index 2be247c..b86b0e0 100644 --- a/recipes/deltacloud_recipe/manifests/aggregator.pp +++ b/recipes/deltacloud_recipe/manifests/aggregator.pp @@ -42,9 +42,37 @@ class deltacloud::aggregator inherits deltacloud { # Right now we configure and start postgres, at some point I want # to make the db that gets setup configurable include postgres::server - file { "/var/lib/pgsql/data/pg_hba.conf": - source => "puppet:///modules/deltacloud_recipe/pg_hba.conf", - require => Exec["pginitdb"] } + if $enable_security { + openssl::certificate{"/var/lib/pgsql/data/server": + user => 'postgres', + group => 'postgres', + require => Exec["pginitdb"], + notify => Service['postgresql']} + # since we're self signing for now, use the same certificate for the root + file { "/var/lib/pgsql/data/root.crt": + require => Openssl::Certificate["/var/lib/pgsql/data/server"], + source => "/var/lib/pgsql/data/server.crt", + owner => 'postgres', + group => 'postgres', + notify => Service['postgresql'] } + file { "/var/lib/pgsql/data/pg_hba.conf": + source => "puppet:///modules/deltacloud_recipe/pg_hba-ssl.conf", + require => Exec["pginitdb"], + owner => 'postgres', + group => 'postgres', + notify => Service['postgresql']} + file { "/var/lib/pgsql/data/postgresql.conf": + source => "puppet:///modules/deltacloud_recipe/postgresql.conf", + require => Exec["pginitdb"], + owner => 'postgres', + group => 'postgres', + notify => Service['postgresql']} + } else { + file { "/var/lib/pgsql/data/pg_hba.conf": + source => "puppet:///modules/deltacloud_recipe/pg_hba.conf", + require => Exec["pginitdb"], + notify => Service['postgresql']} + } postgres::user{"dcloud": password => "v23zj59an", roles => "CREATEDB", diff --git a/recipes/deltacloud_recipe/manifests/deltacloud.pp b/recipes/deltacloud_recipe/manifests/deltacloud.pp index e892df5..a39d2dc 100644 --- a/recipes/deltacloud_recipe/manifests/deltacloud.pp +++ b/recipes/deltacloud_recipe/manifests/deltacloud.pp @@ -6,12 +6,19 @@ import "postgres" import "rails" import "selinux" import "ntp" +import "openssl" import "aggregator" import "core" import "iwhd" import "image-factory" +if $deltacloud_enable_security == "true" or $deltacloud_enable_security == "1" { + $enable_security = true +} else { + $enable_security = false +} + # Base deltacloud class class deltacloud { # Setup repos which to pull deltacloud components diff --git a/recipes/openssl/manifests/init.pp b/recipes/openssl/manifests/init.pp new file mode 100644 index 0000000..8249feb --- /dev/null +++ b/recipes/openssl/manifests/init.pp @@ -0,0 +1,34 @@ +class openssl { + package { "openssl": + ensure => installed + } +} + +define openssl::key($user='root', $group='root'){ + exec{"create_${name}_key": + command => "/usr/bin/openssl genrsa -des3 -passout pass:foobar -out ${name}.key 1024" + } + exec{"remove_${name}_key_password": + command => "/usr/bin/openssl rsa -passin pass:foobar -in ${name}.key -out ${name}.key", + require => Exec["create_${name}_key"] + } + exec{"chmod_${name}.key": + command => "/bin/chmod 400 ${name}.key", + require => Exec["remove_${name}_key_password"] + } + exec{"chown_${name}.key": + command => "/bin/chown ${user}.${group} ${name}.key", + require => Exec["remove_${name}_key_password"] + } +} + +define openssl::certificate($user='root', $group='root'){ + openssl::key{$name: + user => $user, + group => $group + } + exec{"create_${name}_certificate": + command => "/usr/bin/openssl req -new -key ${name}.key -days 3650 -out ${name}.crt -x509 -subj '/'", + require => Exec["remove_${name}_key_password"] + } +} -- 1.7.2.3

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel