Create man files for aeolus-image REVISED
by Martyn Taylor
Changes address comments from rwsu:
The changelog entries in rubygem-aeolus-cli.spec needs to be listed most
recent first. "make rpms" complains about that.
"man aeolus-image list"
1. I think some clarification is needed on how image, target image, and
provider image are different
2. spelling correction for "available" in last 3 examples, and -g option
3. examples 2 and 3 have lower cases for "id" in one and caps in other,
we should make them consistent one way or the other
"man aeolus-image build"
1. I think the second example should use build instead of list
2. It is unclear in what circumstances one would want to rebuild an image.
3. Like aeolus-image -h, should we also include a note to indicate
options that have not been implemented? Or omit them from man page.
--image is listed but not supported.
"man aeolus-image push"
1. The example should use push instead of list
12 years, 9 months
[PATCH conductor] Rename default_pool to Default
by jzigmund@redhat.com
---
.../migrate/20110714095141_rename_default_pool.rb | 13 +++++++++++++
src/db/seeds.rb | 4 ++--
src/features/deployment.feature | 2 +-
src/features/pool.feature | 6 +++---
src/features/step_definitions/pool_steps.rb | 4 ++--
src/spec/services/registration_service_spec.rb | 2 +-
6 files changed, 22 insertions(+), 9 deletions(-)
create mode 100644 src/db/migrate/20110714095141_rename_default_pool.rb
diff --git a/src/db/migrate/20110714095141_rename_default_pool.rb b/src/db/migrate/20110714095141_rename_default_pool.rb
new file mode 100644
index 0000000..7a6228e
--- /dev/null
+++ b/src/db/migrate/20110714095141_rename_default_pool.rb
@@ -0,0 +1,13 @@
+class RenameDefaultPool < ActiveRecord::Migration
+ def self.up
+ if pool = Pool.find_by_name("default_pool")
+ pool.update_attribute(:name,"Default")
+ end
+ end
+
+ def self.down
+ if pool = Pool.find_by_name("Default")
+ pool.update_attribute(:name,"default_pool")
+ end
+ end
+end
diff --git a/src/db/seeds.rb b/src/db/seeds.rb
index adf51c0..eb9219d 100644
--- a/src/db/seeds.rb
+++ b/src/db/seeds.rb
@@ -2,7 +2,7 @@
PoolFamily.create!(:name => "default", :description => "default pool family", :quota => Quota.create)
# Default Pool
-Pool.create!(:name => "default_pool", :quota => Quota.create, :pool_family => PoolFamily.find_by_name('default'), :enabled => true)
+Pool.create!(:name => "Default", :quota => Quota.create, :pool_family => PoolFamily.find_by_name('default'), :enabled => true)
# Create default roles
@@ -99,7 +99,7 @@ MetadataObject.set("default_pool_family", PoolFamily.find_by_name('default'))
default_quota = Quota.create
-default_pool = Pool.find_by_name("default_pool")
+default_pool = Pool.find_by_name("Default")
default_role = Role.find_by_name("Pool User")
default_suggested_deployable_role = Role.find_by_name("SuggestedDeployable Global User")
default_pool_global_user_role = Role.find_by_name("Pool Global User")
diff --git a/src/features/deployment.feature b/src/features/deployment.feature
index 9c72262..5845287 100644
--- a/src/features/deployment.feature
+++ b/src/features/deployment.feature
@@ -160,7 +160,7 @@ Feature: Manage Deployments
And I follow "Properties"
Then I should see the following:
| Property Name | Value |
- | Pool | default_pool |
+ | Pool | Default |
| Owner | John testuser |
| Name | testdeployment |
diff --git a/src/features/pool.feature b/src/features/pool.feature
index 9215efc..9be0c38 100644
--- a/src/features/pool.feature
+++ b/src/features/pool.feature
@@ -96,13 +96,13 @@ Feature: Manage Pools
Scenario: Cannot delete default_pool
Given I am on the pools page
When I follow link with ID "filter_view"
- And I check "default_pool" pool
+ And I check "Default" pool
And I press "Destroy"
Then I should see "The default pool cannot be deleted"
- And I should see "default_pool"
+ And I should see "Default"
Scenario: Cannot delete default_pool by renaming it
- Given I renamed default_pool to pool_default
+ Given I renamed Default to pool_default
And I am on the pools page
When I follow link with ID "filter_view"
And I check "pool_default" pool
diff --git a/src/features/step_definitions/pool_steps.rb b/src/features/step_definitions/pool_steps.rb
index d1bb0cb..e9035b6 100644
--- a/src/features/step_definitions/pool_steps.rb
+++ b/src/features/step_definitions/pool_steps.rb
@@ -65,8 +65,8 @@ Given /^the "([^\"]*)" Pool has a quota with following capacities:$/ do |name,ta
@pool.save
end
-Given /^I renamed default_pool to pool_default$/ do
- p = Pool.find_by_name("default_pool")
+Given /^I renamed Default to pool_default$/ do
+ p = Pool.find_by_name("Default")
p.name = "pool_default"
p.save
end
diff --git a/src/spec/services/registration_service_spec.rb b/src/spec/services/registration_service_spec.rb
index 7edb7b7..222d028 100644
--- a/src/spec/services/registration_service_spec.rb
+++ b/src/spec/services/registration_service_spec.rb
@@ -30,7 +30,7 @@ describe RegistrationService do
@pools = Pool.list_for_user(@user, Privilege::CREATE, :target_type => Instance)
@pools.length.should == 1
- @pools[0].name.should == "default_pool"
+ @pools[0].name.should == "Default"
@user.quota.maximum_running_instances.should == @quota.maximum_running_instances
@user.quota.maximum_total_instances.should == @quota.maximum_total_instances
--
1.7.4.4
12 years, 9 months
[PATCH configure] BZ 718354 - remove factory connector from conductor.pp
by Richard Su
---
recipes/aeolus/manifests/conductor.pp | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp
index 4687d32..b86e0ee 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -7,10 +7,6 @@ class aeolus::conductor inherits aeolus {
'aeolus-conductor-daemons']:
ensure => 'installed'}
- # to be renamed to aeolus-connector
- package {'rubygem-image_factory_connector':
- ensure => 'installed'}
-
file {"/var/lib/aeolus-conductor":
ensure => directory,
owner => 'aeolus',
@@ -44,13 +40,6 @@ class aeolus::conductor inherits aeolus {
Rails::Migrate::Db[migrate_aeolus_database],
Service['condor', 'httpd']] }
- service{ 'aeolus-connector':
- ensure => 'running',
- enable => true,
- hasstatus => true,
- require => [Package['rubygem-image_factory_connector'],
- Service[qpidd]]}
-
### Initialize and start the aeolus database
# Right now we configure and start postgres, at some point I want
# to make the db that gets setup configurable
@@ -147,7 +136,7 @@ class aeolus::conductor inherits aeolus {
}
### Setup sshd for deltacloud
- package { "openssh-server": ensure => installed }
+ package { "openssh-server": ensure => installed }
service{"sshd":
require => Package["openssh-server"],
ensure => 'running',
@@ -210,8 +199,7 @@ class aeolus::conductor::disabled {
'conductor-delayed_job'] }
service { ['aeolus-conductor',
'conductor-dbomatic',
- 'conductor-delayed_job',
- 'aeolus-connector']:
+ 'conductor-delayed_job']:
ensure => 'stopped',
enable => false,
hasstatus => true }
@@ -295,4 +283,3 @@ define aeolus::conductor::hwp($memory='', $cpu='', $storage='', $architecture=''
require => Service['aeolus-conductor']
}
}
-
--
1.7.4.4
12 years, 9 months
Add RSpec test for provider account quota
by Matt Wagner
It bothered me that there wasn't already a test in place to catch this. This test ended up requiring a mildly insane amount of setup, but it does the trick. The feature that this tests has already been pushed (7c7a56636 - "instance.provider_account is set in condormatic..."), so this test should pass out of the box assuming you've got that commit.
-- Matt
12 years, 9 months
[PATCH conductor] redirect to realm show after create
by Tomas Hrcka
---
src/app/controllers/realms_controller.rb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/controllers/realms_controller.rb b/src/app/controllers/realms_controller.rb
index bdc6ba9..29124a4 100644
--- a/src/app/controllers/realms_controller.rb
+++ b/src/app/controllers/realms_controller.rb
@@ -45,11 +45,11 @@ class RealmsController < ApplicationController
@realm = FrontendRealm.new(params[:frontend_realm])
if @realm.save
flash[:notice] = "Realm was added."
- redirect_to realms_path and return
+ redirect_to realm_path(@realm)
+ else
+ load_backend_realms
+ render :new
end
-
- load_backend_realms
- render :new
end
def destroy
--
1.7.4.4
12 years, 9 months
[PATCH conductor] Remove some searching remnants.
by Chris Lalancette
As pointed out by Jan, there were some places in the
code that still referenced "search". We didn't hit
these lines of code in testing because search didn't
actually work, but we may as well remove them until
we come up with a proper search strategy.
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
.../controllers/hardware_profiles_controller.rb | 12 +-----------
src/app/controllers/instances_controller.rb | 7 +------
src/app/controllers/pool_families_controller.rb | 11 +----------
src/app/controllers/pools_controller.rb | 8 ++++----
.../controllers/provider_accounts_controller.rb | 10 +---------
src/app/controllers/providers_controller.rb | 8 +-------
src/app/controllers/roles_controller.rb | 11 +----------
src/app/controllers/users_controller.rb | 11 +----------
src/app/models/deployment.rb | 11 +++--------
src/app/models/instance.rb | 11 +++--------
src/app/models/pool.rb | 11 +++--------
11 files changed, 20 insertions(+), 91 deletions(-)
diff --git a/src/app/controllers/hardware_profiles_controller.rb b/src/app/controllers/hardware_profiles_controller.rb
index 6aed9a5..c7f3818 100644
--- a/src/app/controllers/hardware_profiles_controller.rb
+++ b/src/app/controllers/hardware_profiles_controller.rb
@@ -21,17 +21,7 @@ class HardwareProfilesController < ApplicationController
render :partial => 'matching_provider_hardware_profiles' and return
end
format.html do
- @search_term = params[:q]
- if @search_term.blank?
- load_hardware_profiles
- return
- end
-
- search = HardwareProfile.search do
- keywords(params[:q])
- with(:frontend, true)
- end
- @hardware_profiles = search.results
+ load_hardware_profiles
end
end
end
diff --git a/src/app/controllers/instances_controller.rb b/src/app/controllers/instances_controller.rb
index 3914401..c64380e 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -5,13 +5,8 @@ class InstancesController < ApplicationController
def index
@params = params
- @search_term = params[:q]
save_breadcrumb(instances_path(:viewstate => viewstate_id))
- if @search_term.blank?
- load_instances
- else
- @instances = Instance.search { keywords(params[:q]) }.results
- end
+ load_instances
respond_to do |format|
format.js { render :partial => 'list' }
diff --git a/src/app/controllers/pool_families_controller.rb b/src/app/controllers/pool_families_controller.rb
index a38b9a4..cd60ff0 100644
--- a/src/app/controllers/pool_families_controller.rb
+++ b/src/app/controllers/pool_families_controller.rb
@@ -11,16 +11,7 @@ class PoolFamiliesController < ApplicationController
def index
clear_breadcrumbs
save_breadcrumb(pool_families_path)
- @search_term = params[:q]
- if @search_term.blank?
- load_pool_families
- return
- end
-
- search = PoolFamily.search() do
- keywords(params[:q])
- end
- @pool_families = search.results
+ load_pool_families
end
def new
diff --git a/src/app/controllers/pools_controller.rb b/src/app/controllers/pools_controller.rb
index 95a245b..745eb5b 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -30,18 +30,18 @@ class PoolsController < ApplicationController
@details_tab = @tabs.find {|t| t[:id] == details_tab_name} || @tabs.first[:name].downcase
case @details_tab[:id]
when 'pools'
- @pools = Pool.list_or_search(params[:q], params[:order_field],params[:order_dir])
+ @pools = Pool.list(params[:order_field],params[:order_dir])
when 'instances'
- @instances = Instance.list_or_search(params[:q], params[:order_field],params[:order_dir])
+ @instances = Instance.list(params[:order_field],params[:order_dir])
@hide_stopped = @viewstate && @viewstate.state['hide_stopped'] == 'true'
if @hide_stopped
@instances.delete_if { |i| i.state == Instance::STATE_STOPPED }
end
when 'deployments'
- @deployments = Deployment.list_or_search(params[:q], params[:order_field],params[:order_dir])
+ @deployments = Deployment.list(params[:order_field],params[:order_dir])
end
else
- @pools = Pool.list_or_search(params[:q], params[:order_field],params[:order_dir])
+ @pools = Pool.list(params[:order_field],params[:order_dir])
end
statistics
respond_to do |format|
diff --git a/src/app/controllers/provider_accounts_controller.rb b/src/app/controllers/provider_accounts_controller.rb
index ea32d74..63523b4 100644
--- a/src/app/controllers/provider_accounts_controller.rb
+++ b/src/app/controllers/provider_accounts_controller.rb
@@ -10,15 +10,7 @@ class ProviderAccountsController < ApplicationController
def index
clear_breadcrumbs
save_breadcrumb(provider_accounts_path)
- # TODO: this is temporary solution how to combine search and permissions
- # filtering
- @search_term = params[:q]
- unless @search_term.blank?
- search = ProviderAccount.search do
- keywords(params[:q])
- end
- @accounts &= search.results
- end
+ load_accounts
respond_to do |format|
format.html
diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb
index 510f310..3c33ce9 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -10,13 +10,7 @@ class ProvidersController < ApplicationController
clear_breadcrumbs
save_breadcrumb(providers_path)
@params = params
- @search_term = params[:q]
-
- if @search_term.blank?
- load_providers
- else
- @providers = Provider.search { keywords(params[:q]) }.results
- end
+ load_providers
respond_to do |format|
format.html
diff --git a/src/app/controllers/roles_controller.rb b/src/app/controllers/roles_controller.rb
index 15a4815..853fdcd 100644
--- a/src/app/controllers/roles_controller.rb
+++ b/src/app/controllers/roles_controller.rb
@@ -10,16 +10,7 @@ class RolesController < ApplicationController
def index
clear_breadcrumbs
save_breadcrumb(roles_path)
- @search_term = params[:q]
- if @search_term.blank?
- load_roles
- return
- end
-
- search = Role.search() do
- keywords(params[:q])
- end
- @roles = search.results
+ load_roles
end
def new
diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb
index 1050ec1..40c0dda 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -12,16 +12,7 @@ class UsersController < ApplicationController
save_breadcrumb(users_path)
@params = params
load_headers
- @search_term = params[:q]
- if @search_term.blank?
- load_users
- return
- end
-
- search = User.search do
- keywords(params[:q])
- end
- @users = search.results
+ load_users
end
def new
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 43d76b6..fe6e194 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -150,14 +150,9 @@ class Deployment < ActiveRecord::Base
status
end
- def self.list_or_search(query,order_field,order_dir)
- if query.blank?
- deployments = Deployment.all(:include => :owner,
- :order => (order_field || 'name') +' '+ (order_dir || 'asc'))
- else
- deployments = search() { keywords(query) }.results
- end
- deployments
+ def self.list(order_field, order_dir)
+ Deployment.all(:include => :owner,
+ :order => (order_field || 'name') +' '+ (order_dir || 'asc'))
end
def accessible_and_valid_deployable_xml?(url)
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index 1afe159..f16b79d 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
@@ -284,14 +284,9 @@ class Instance < ActiveRecord::Base
(state == STATE_CREATE_FAILED) or (state == STATE_STOPPED and not restartable?)
end
- def self.list_or_search(query,order_field,order_dir)
- if query.blank?
- instances = Instance.all(:include => [ :owner ],
- :order => (order_field || 'name') +' '+ (order_dir || 'asc'))
- else
- instances = search() { keywords(query) }.results
- end
- instances
+ def self.list(order_field, order_dir)
+ Instance.all(:include => [ :owner ],
+ :order => (order_field || 'name') +' '+ (order_dir || 'asc'))
end
def matches
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index 5662110..6776a19 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -91,14 +91,9 @@ class Pool < ActiveRecord::Base
#end
end
- def self.list_or_search(query,order_field,order_dir)
- if query.blank?
- pools = Pool.all(:include => [ :quota, :pool_family ],
- :order => (order_field || 'name') +' '+ (order_dir || 'asc'))
- else
- pools = search() { keywords(query) }.results
- end
- pools
+ def self.list(order_field, order_dir)
+ Pool.all(:include => [ :quota, :pool_family ],
+ :order => (order_field || 'name') +' '+ (order_dir || 'asc'))
end
end
--
1.7.4.4
12 years, 9 months
Instance can_create and can_start APIs
by Mark McLoughlin
Hey,
I just noticed that both can_create and can_start appear to be unused
now
Anyone know of a reason for not removing them?
Cheers,
Mark.
12 years, 9 months
[PATCH conductor] Cleans up deployment launch form (BZ#720426)
by kkeiter@redhat.com
From: Kenneth Keiter <kkeiter(a)redhat.com>
---
src/app/stylesheets/layout.scss | 18 ++++++-
src/app/views/deployments/_launch_new.haml | 62 +++++++++++++++---------
src/features/deployment.feature | 4 +-
src/public/images/header_icon_deployments.png | Bin 0 -> 626 bytes
4 files changed, 56 insertions(+), 28 deletions(-)
create mode 100644 src/public/images/header_icon_deployments.png
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index d8e8315..b005fcc 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 Wed Jun 29 20:41:07 -0700 2011
+Compiled on Wed Jul 13 21:46:02 -0700 2011
########################################################################### */
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -653,7 +653,7 @@ strong, em, b, i{ font-family: $font-family-em; }
#primary-container{
position: relative;
min-height: 100%;
- margin-bottom: -40px;
+ display: block;
}
/* Content */
@@ -1464,6 +1464,14 @@ div#content .page-header{
padding: 6px 7px 7px 54px;
}
+ h1 span{
+ color: #666;
+ }
+
+ h1.no-icon{
+ padding: 7px;
+ }
+
h1.pools{
background: transparent url('../../images/header_icon_pools.png') no-repeat 8px center;
}
@@ -1507,6 +1515,10 @@ div#content .page-header{
background: transparent url('../../images/header_icon_deployables.png') no-repeat 8px center;
}
+ h1.deployments{
+ background: transparent url('../../images/header_icon_deployments.png') no-repeat 8px center;
+ }
+
h1.settings{
background: transparent url('../../images/header_icon_settings.png') no-repeat 8px center;
}
@@ -2519,7 +2531,7 @@ footer.standard{
height: 40px;
width: 100%;
font-size: 11px;
- clear:both;
+ clear: both;
div.container{
margin: 0 auto;
diff --git a/src/app/views/deployments/_launch_new.haml b/src/app/views/deployments/_launch_new.haml
index af7a456..3e24758 100644
--- a/src/app/views/deployments/_launch_new.haml
+++ b/src/app/views/deployments/_launch_new.haml
@@ -1,38 +1,47 @@
= if request.xhr?
= render :partial => '/layouts/new_notification'
%header.page-header
- %h1{:class => controller.controller_name}
- New Deployment in
- = @pool.name
+ %h1.deployments
+ New Deployment
+ %span= "to #{(a)pool.name.capitalize} Pool"
#obj_actions.button-container
= link_to 'Cancel', pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
.corner
%section.content-section.deployment
%header
- %h2
- Deployment Details
+ %h2 Deployment Details
.content
- - form_for :deployment, {:url => new_deployment_path, :method => :get} do
+ - form_for :deployment, {:url => new_deployment_path, :method => :get, :html => {:class => 'generic'}} do
= error_messages_for :deployment
= hidden_field :deployment, :pool_id
- %p
- What do you want to launch?
- %p
- Select the Deployable definition
- = select_tag :suggested_deployable_id, options_for_select([['other (enter below)', 'other']] + @suggested_deployables.map {|d| [d.name, d.id]}, params[:suggested_deployable_id])
- %p
- Or provide the URL of the Deployable definition
- = text_field_tag :deployable_url, params[:deployable_url]
- %p
- Name your deployment
- = text_field(:deployment, :name)
- %span.name_available
- %p
- Choose a realm
- = select :deployment, :frontend_realm_id, @realms.map{|r| [r.name, r.id]}, :include_blank => true
- = submit_tag 'Next', :class => 'button'
+ %fieldset
+ %p
+ %label{:for => 'deployment_name'}
+ Deployment Name
+ %span (uniquely identifies your deployment)
+ = text_field(:deployment, :name, :class => 'em long')
+ %span#name_avail_indicator
+
+ %fieldset
+ %p
+ %label{:for => 'suggested_deployable_id'} Deployable Definition
+ = select_tag :suggested_deployable_id, options_for_select([['Load definition from URL', 'other']] + @suggested_deployables.map {|d| [d.name, d.id]}, params[:suggested_deployable_id])
+ %p#deployable-url-section
+ %label{:for => 'deployable_url'}
+ Deployable URL
+ %span (must be a valid URL including http://)
+ = text_field_tag :deployable_url, params[:deployable_url], :class => 'long'
+
+ %fieldset
+ %p
+ %label{:for => 'frontend_realm_id'} Realm
+ = select :deployment, :frontend_realm_id, @realms.map{|r| [r.name, r.id]}, :include_blank => true
+
+ %fieldset.options
+ = submit_tag 'Next', :class => 'button'
+
:javascript
// FIXME: This has a theoretical race condition: if responses come back out of order, the value
@@ -40,10 +49,17 @@
// Might be nice to build something in application.js to guard against this, and that also
// introduces a ~250ms buffer so we don't do a lookup on every single keystroke...
$(document).ready(function () {
+ $('#suggested_deployable_id').change(function(){
+ if($(this).val() !== 'other'){
+ $('#deployable-url-section').hide();
+ }else{
+ $('#deployable-url-section').show();
+ }
+ });
$('#deployment_name').keyup(function(e) {
e.preventDefault();
$.get('#{check_name_deployments_path}', {name: $('#deployment_name').val() }, function(data) {
- $('.name_available').html(data == "false" ? "That name is already in use" : "Name available");
+ $('#name_avail_indicator').html(data == "false" ? "That name is already in use" : "Name available");
});
});
});
diff --git a/src/features/deployment.feature b/src/features/deployment.feature
index 9c72262..8886de4 100644
--- a/src/features/deployment.feature
+++ b/src/features/deployment.feature
@@ -30,7 +30,7 @@ Feature: Manage Deployments
And there is "front_hwp2" conductor hardware profile
When I am viewing the pool "mockpool"
And I follow "New Deployment"
- Then I should see "New Deployment in mockpool"
+ Then I should see "New Deployment"
When I fill in "deployable_url" with "http://localhost/deployables/deployable1.xml"
When I fill in "deployment_name" with "mynewdeployment"
When I press "Next"
@@ -144,7 +144,7 @@ Feature: Manage Deployments
Given a pool "mockpool" exists
When I am viewing the pool "mockpool"
And I follow "New Deployment"
- Then I should see "New Deployment in mockpool"
+ Then I should see "New Deployment"
When I fill in "deployable_url" with "http://invalid.deployable.url/"
And I fill in "deployment_name" with "mynewdeployment"
And I press "Next"
diff --git a/src/public/images/header_icon_deployments.png b/src/public/images/header_icon_deployments.png
new file mode 100644
index 0000000000000000000000000000000000000000..36fa110f0408ae42f12c33064b286799c15e17c1
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq001HY000{Z1^@s688Tg`00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy9FEKVR
zF)<9NV9Nji0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0n155
zK~zYIy_V5YgFq05KOEn&1F-^A0?8Jj9VAvDRuHVfbP&=(EMRA12PuJ6pj2=^aAZ#8
z0>=#b-+;Z{kALqLphv2jsOnu`+*lc7Fvf5*AT|NAsX!VH0RhOSbR`5NW@1-{g22SC
zgn&%yN(cx{=*n$ieB(;)3$UOw=hjg~ethv!6k&`ZQq>elFBDIJrE^^YNjtgClL1d1
zIlh2gL=IgAj4?z`l64P|t9KE}9f%F^I$+&SL{?r9C*e?_vn#5a0UrY(yfFVJtB4##
zWDd-M!-Zt-3EBrh04!B?)xH^Z1fJF7kn743cnp9!iAd61^nPnv4i&A(t}E?leY#gw
z_hj|Y5mikr&<pU;Dw?TkLU?-so(F^2nNX-|sj4dxDO*4>^|360&p?pWz65Y#k67yt
zwpgQ+EnL``gnAFXQNQ6f5T*js#bR;n1hGz(EeKbCfSfhofglac%-5Ry0tCQ4ux(lf
zU?=Tv1V{|zK1WJhY^YAud!{73Jph&OqZb0v#ILDs9-}z)H=sA+*o8ij)7XR~Rrx@Q
zYf=DvAIOIB{SH+H<eeb)D5h6{X$D&9-K-*Vr2aeGO#oEcyfa&eUu`A4BOeIP0RR91
M07*qoM6N<$f<@T$^Z)<=
literal 0
HcmV?d00001
--
1.7.4.1
12 years, 9 months
[PATCH conductor] Force footer to not overlap with content
by Mark McLoughlin
If you resize the browser window until the main content starts running
out of room, notice that the content overlaps with the footer.
Add a 40px empty div to the primary container to prevent the overlap,
copying a suggestion from here:
http://ryanfait.com/resources/footer-stick-to-bottom-of-page/
---
src/app/stylesheets/layout.scss | 6 ++++--
src/app/views/layouts/application.haml | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index d8e8315..24adc9c 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -663,7 +663,6 @@ $contentpadding: 7px;
div#content{
width: $width - (2 * $contentpadding);
margin: 0 auto;
- margin-bottom: 98px;
min-height: 200px;
-webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px;
background-color: #FAFAFA;
@@ -2512,11 +2511,14 @@ Page Footer -- v.0.0.1 [footer] (footer.scss)
/* Footer */
+footer.standard, .push{
+ height: 40px;
+}
+
footer.standard{
background: rgba(0, 0, 0, 0.20);
position: relative;
- height: 40px;
width: 100%;
font-size: 11px;
clear:both;
diff --git a/src/app/views/layouts/application.haml b/src/app/views/layouts/application.haml
index 443af7f..bdacde1 100644
--- a/src/app/views/layouts/application.haml
+++ b/src/app/views/layouts/application.haml
@@ -45,6 +45,9 @@
= yield
.clear
+ - # forces the footer to not overlap
+ .push
+
%footer.standard
.container
= image_tag('footer-rhlogo.png', :id => 'logo')
--
1.7.4.4
12 years, 9 months
Conductor DB configuration
by Simon Harris
Again, please for give my relative newbie-ness on the project. What, if any, is the rationale for having an aeolus username and password for the development and test databases? I've never had the need as PostgreSQL supports user roles such that the connections can generally be made using your local credentials. I presume I'm missing something, eg MySQL support or perhaps a desire for more strict local configuration on the part of some?
--
w: http://www.harukizaemon.com/
e: sharris(a)redhat.com
t: @haruki_zaemon
i: haruki_zaemon
12 years, 9 months