[PATCH aeolus-cli] Bug 796781: Handle environment param in cli call for import
by Scott Seago
https://bugzilla.redhat.com/show_bug.cgi?id=796781
---
lib/aeolus_cli/command/config_parser.rb | 11 +++++++----
lib/aeolus_cli/command/import_command.rb | 5 +++--
man/aeolus-image-import.1 | 8 +++++++-
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/lib/aeolus_cli/command/config_parser.rb b/lib/aeolus_cli/command/config_parser.rb
index 1401870..de9689a 100644
--- a/lib/aeolus_cli/command/config_parser.rb
+++ b/lib/aeolus_cli/command/config_parser.rb
@@ -151,7 +151,7 @@ module Aeolus
opts.on('-T', '--target TARGET1,TARGET2', Array, 'provider type (ec2, rackspace, rhevm, etc)') do |name|
@options[:target] = name
end
- opts.on('-E', '--environment ENVIRONMENT', 'Limit image list to environment') do |environment|
+ opts.on('-E', '--environment ENVIRONMENT', 'environment to build for') do |environment|
@options[:environment] = environment
end
opts.on( '-h', '--help', 'Get usage information for this command')
@@ -233,13 +233,16 @@ module Aeolus
opts.on('-A', '--account NAME,NAME', Array, 'name of specific account to import to') do |name|
@options[:provider_account] = name
end
+ opts.on('-E', '--environment ENVIRONMENT', 'environment to import into') do |environment|
+ @options[:environment] = environment
+ end
opts.on( '-h', '--help', 'Get usage information for this command')
opts.separator ""
opts.separator "Examples:"
- opts.separator "aeolus-image import --account my-ec2 --id $ami_id # import an AMI from the specified provider"
- opts.separator "aeolus-image import --account my-ec2 --id $ami_id --description '<image><name>My Image</name></image>' # import an AMI from the specified provider"
- opts.separator "aeolus-image import --account my-ec2 --id $ami_id --description <path_to_xml_file> # import an AMI from the specified provider"
+ opts.separator "aeolus-image import --account my-ec2 --id $ami_id --environment default # import an AMI from the specified provider"
+ opts.separator "aeolus-image import --account my-ec2 --id $ami_id --environment default --description '<image><name>My Image</name></image>' # import an AMI from the specified provider"
+ opts.separator "aeolus-image import --account my-ec2 --id $ami_id --environment default --description <path_to_xml_file> # import an AMI from the specified provider"
opts.separator ""
opts.separator "RHEV:"
opts.separator "Enter the template id for the provider image id. The template id can be found through the RHEV REST API."
diff --git a/lib/aeolus_cli/command/import_command.rb b/lib/aeolus_cli/command/import_command.rb
index c53d749..63ee873 100644
--- a/lib/aeolus_cli/command/import_command.rb
+++ b/lib/aeolus_cli/command/import_command.rb
@@ -34,7 +34,8 @@ module Aeolus
image = Aeolus::CLI::Image.new({:target_identifier => @options[:id],
:image_descriptor => @options[:description],
- :provider_account_name => @options[:provider_account].first})
+ :provider_account_name => @options[:provider_account].first,
+ :environment => @options[:environment]})
image.save!
headers = ActiveSupport::OrderedHash.new
@@ -68,7 +69,7 @@ module Aeolus
raise ArgumentError, "params should not contain nil"
end
- required_keys = [:id, :provider_account]
+ required_keys = [:id, :provider_account, :environment]
optional_keys = [:description]
isect = params.keys & required_keys
diff --git a/man/aeolus-image-import.1 b/man/aeolus-image-import.1
index 33a7653..8772798 100644
--- a/man/aeolus-image-import.1
+++ b/man/aeolus-image-import.1
@@ -2,7 +2,7 @@
.SH NAME
aeolus-image import \- command for importing existing provider images into aeolus
.SH SYNOPSIS
-.B aeolus-image import [\-h|--help] [\-u|--username] [\-w|--password] [\-A|--account [account-name]] [\--id [provider-image-id]] [--description [path-to-file|xml string]] [\-d|--daemon]
+.B aeolus-image import [\-h|--help] [\-u|--username] [\-w|--password] [\-A|--account [account-name]] [\--id [provider-image-id]] [\-E|--environment] [--description [path-to-file|xml string]] [\-d|--daemon]
.SH DESCRIPTION
aeolus-image import allows users to import pre-existing images that exist in cloud provders for example AMI from EC2, into aeolus.
.SH OPTIONS
@@ -19,6 +19,9 @@ The provider account name as it exists in Conductor from where the importing ima
\--id <provider-image-id>
The providers ID given to the importing image
.TP
+\-E, --environment
+Limit image list to environment
+.TP
\--description <path-to-xml-description|xml string>
A user defined description to associate with the importing image
.TP
@@ -33,17 +36,20 @@ Import the AMI ami-1234567 from the provider account my-ec2 into aeolus
.B aeolus-image import
\--account my-ec2
\--id ami-1234567
+\--environment default
.TP
Import the AMI ami-1234567 from the provider account my-ec2 into aeolus with a given xml description
.B aeolus-image import
\--account my-ec2
\--id ami-1234567
+\--environment default
\--description '<image><name>myAMI</name></image>'
.TP
Import the AMI ami-1234567 from the provider account my-ec2 into aeolus providing a path to the description XML file
.B aeolus-image import
\--account my-ec2
\--id ami-1234567
+\--environment default
\--description /foo/bar/description.xml
.SH RHEV
.TP
--
1.7.6.4
12 years, 1 month
[PATCH] BZ 789833 strip login/username whitespace
by Tzu-Mainn Chen
---
src/app/models/user.rb | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/app/models/user.rb b/src/app/models/user.rb
index 9902464..c2822ea 100644
--- a/src/app/models/user.rb
+++ b/src/app/models/user.rb
@@ -66,6 +66,8 @@ class User < ActiveRecord::Base
belongs_to :quota, :autosave => true, :dependent => :destroy
accepts_nested_attributes_for :quota
+ before_validation :strip_whitespace
+
validates_presence_of :quota
validates_length_of :first_name, :maximum => 255, :allow_blank => true
validates_length_of :last_name, :maximum => 255, :allow_blank => true
@@ -90,6 +92,7 @@ class User < ActiveRecord::Base
end
def self.authenticate(username, password, ipaddress)
+ username = username.strip unless username.nil?
return unless u = User.find_by_login(username)
# FIXME: this is because of tests - encrypted password is submitted,
# don't know how to get unencrypted version (from factorygirl)
@@ -154,4 +157,7 @@ class User < ActiveRecord::Base
raise I18n.t('users.errors.has_running_instances', :login => login) if deployments.any?{ |deployment| deployment.any_instance_running? }
end
+ def strip_whitespace
+ self.login = self.login.strip unless self.login.nil?
+ end
end
--
1.7.6.5
12 years, 1 month
[PATCH aeolus-image-rubygem] Bug 796783: fixes lingering errors w/ image import
by Scott Seago
https://bugzilla.redhat.com/show_bug.cgi?id=796783
---
lib/aeolus_image/import.rb | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/aeolus_image/import.rb b/lib/aeolus_image/import.rb
index fe0ce22..2e5a9d2 100644
--- a/lib/aeolus_image/import.rb
+++ b/lib/aeolus_image/import.rb
@@ -14,7 +14,7 @@
module Aeolus
module Image
- def self.import(provider_name, deltacloud_driver, image_id, account_id, xml=nil)
+ def self.import(provider_name, deltacloud_driver, image_id, account_id, environment, xml=nil)
xml ||= "<image><name>#{image_id}</name></image>"
image = Factory::Image.new(
:target_name => deltacloud_driver,
@@ -25,7 +25,8 @@ module Aeolus
image.save!
# Set the provider_account_id on the image
iwhd_image = Warehouse::Image.find(image.id)
- # Set the account on the provider image
+ iwhd_image.set_attr("environment", environment)
+ # Set the account on the provider image
# This assumes (as is currently correct) that there will only be one provider image for imported images
pimg = iwhd_image.provider_images.first
pimg.set_attr('provider_account_identifier', account_id)
--
1.7.6.4
12 years, 1 month
[PATCH aeolus-conductor] BZ#796247 Update Credentials Check to use new DC Client Errors
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/models/provider_account.rb | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/app/models/provider_account.rb b/src/app/models/provider_account.rb
index eff59f9..e53b4c6 100644
--- a/src/app/models/provider_account.rb
+++ b/src/app/models/provider_account.rb
@@ -87,10 +87,12 @@ class ProviderAccount < ActiveRecord::Base
def validate_credentials
begin
- unless valid_credentials?
- errors.add(:base, I18N.t('provider_accounts.errors.invalid_credentials'))
- end
- rescue
+ valid_credentials?
+ rescue DeltaCloud::HTTPError::Unauthorized => ue
+ logger.debug("Unauthorized Error Rasied by Deltacloud: #{ue.inspect}")
+ errors.add(:base, I18n.t('provider_accounts.errors.invalid_credentials'))
+ rescue => e
+ logger.error("Error validating credentials: #{e.inspect}")
errors.add(:base, I18n.t('provider_accounts.errors.exception_while_validating'))
end
end
--
1.7.6.4
12 years, 1 month
[PATCH conductor] BZ#790819 Add better labels to X-Deltacloud-Provider field
by Tomas Sedovic
From: Tomas Sedovic <tomas(a)sedovic.cz>
https://bugzilla.redhat.com/show_bug.cgi?id=790819
With the javascript on, the X-Deltacloud-Provider field is now labeled
according to the selected provider type. If it's not used at all, the field is
hidden.
When the JS is off, we display a little legend below the text field to help
users figure out what to put in.
---
src/app/controllers/providers_controller.rb | 15 ++++++++++++++-
src/app/stylesheets/layout.scss | 17 +++++++++++++++++
src/app/views/providers/_form.html.haml | 24 ++++++++++++++++++++----
src/config/locales/en.yml | 13 +++++++++----
4 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb
index 0819b99..eb4c7b0 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -46,6 +46,7 @@ class ProvidersController < ApplicationController
require_privilege(Privilege::CREATE, Provider)
@provider = Provider.new
@provider.url = Provider::DEFAULT_DELTACLOUD_URL
+ @provider.provider_type = ProviderType.find_by_deltacloud_driver('ec2')
@title = t("providers.new.new_provider")
end
@@ -237,7 +238,19 @@ class ProvidersController < ApplicationController
end
def load_providers_types
- @provider_types = ProviderType.where(:name => ["Mock","Amazon EC2","RHEV-M","VMware vSphere"]).collect {|provider_type| [provider_type.name,provider_type.id]}
+ available_providers = ["Mock","Amazon EC2","RHEV-M","VMware vSphere"]
+ provider_types = ProviderType.where(:name => available_providers).map do |type|
+ begin
+ label = I18n.translate!("providers.form.x_deltacloud_provider.#{type.deltacloud_driver}")
+ rescue
+ end
+
+ { :id => type.id,
+ :label => label,
+ :name => type.name }
+ end
+ @labeled_provider_types = provider_types.select {|type| type[:label]}
+ @provider_type_options = provider_types.map {|type| [type[:name], type[:id]]}
end
def load_provider_tabs
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index f433d4c..b067b2e 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -1811,6 +1811,23 @@ div.lefted.new-catalog-entry-from-image{
min-height: 32px;
}
}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+New/Edit Provider Form
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#x-deltacloud-provider-legend {
+
+ dl {
+ margin-left: 190px;
+ }
+
+ dt {
+ margin-top: 1em;
+ font-weight: bold;
+ }
+}
+
+
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
User Card
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/src/app/views/providers/_form.html.haml b/src/app/views/providers/_form.html.haml
index e66f64a..e0afdb1 100644
--- a/src/app/views/providers/_form.html.haml
+++ b/src/app/views/providers/_form.html.haml
@@ -8,8 +8,24 @@
= form.label :url, t('providers.form.provider_url')
= form.text_field :url, :title => t('providers.form.provider_url'), :value => @provider.url, :class => 'long'
%p
- = form.label :provider_type, t('providers.form.provider_type')
- = form.select(:provider_type_id, @provider_types, :prompt => t('providers.form.select_type_of_provider'))
+ = form.label :provider_type_id, t('providers.form.provider_type')
+ = form.select(:provider_type_id, @provider_type_options, :prompt => t('providers.form.select_type_of_provider'))
%p
- = form.label :url, t('providers.form.x_deltacloud_provider')
- = form.text_field :deltacloud_provider, :title => t('providers.form.x_deltacloud_provider'), :value => @provider.deltacloud_provider, :class => 'long'
+ = form.label :deltacloud_provider, t('providers.form.x_deltacloud_provider.generic')
+ = form.text_field :deltacloud_provider, :title => t('providers.form.x_deltacloud_provider.generic'), :value => @provider.deltacloud_provider, :class => 'long'
+ %div#x-deltacloud-provider-legend.clearfix
+ %label= t('providers.form.x_deltacloud_provider_legend')
+ %dl
+ - @labeled_provider_types.each do |type|
+ %dt= type[:name]
+ %dd{ :class => type[:id] }= type[:label]
+:javascript
+ function updateXDeltacloudProviderLabel() {
+ var selected_id = $('#provider_provider_type_id option:selected').val();
+ var label = $('#x-deltacloud-provider-legend .' + selected_id).text();
+ $('label[for=provider_deltacloud_provider]').text(label);
+ $('#provider_deltacloud_provider').toggle(label.length !== 0);
+ }
+ $('#provider_provider_type_id').change(updateXDeltacloudProviderLabel);
+ updateXDeltacloudProviderLabel();
+ $('#x-deltacloud-provider-legend').hide();
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index b7e3057..6f34867 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -1002,10 +1002,15 @@ en:
enable_configure_providers: "To enable and configure provider, click the slide switch in the upper-right-hand corner of this window."
provider_unavailable: "The provider %{name} is currently not available."
form:
- x_deltacloud_provider: "X-Deltacloud-Provider:"
- provider_name: "Provider Name:"
- provider_url: "Provider URL:"
- provider_type: "Provider Type:"
+ x_deltacloud_provider_legend: Legend for X-Deltacloud-Provider
+ x_deltacloud_provider:
+ generic: X-Deltacloud-Provider
+ ec2: EC2 Region
+ rhevm: RHEV-M API_PROVIDER
+ vsphere: vSphere API hostname
+ provider_name: Provider Name
+ provider_url: Provider URL
+ provider_type: Provider Type
select_type_of_provider: Select type of provider
caution_alt_text: Caution
enter_correct_url_msg: Please enter a correct URL format.
--
1.7.6.5
12 years, 1 month
[PATCH conductor] BZ789853 added rescue connection timeout
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/app/controllers/images_controller.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/controllers/images_controller.rb b/src/app/controllers/images_controller.rb
index 0c6b350..8c42074 100644
--- a/src/app/controllers/images_controller.rb
+++ b/src/app/controllers/images_controller.rb
@@ -213,7 +213,7 @@ class ImagesController < ApplicationController
url = params[:image_url]
begin
xml_source = RestClient.get(url, :accept => :xml)
- rescue RestClient::Exception, SocketError, URI::InvalidURIError, Errno::ECONNREFUSED
+ rescue RestClient::Exception, SocketError, URI::InvalidURIError, Errno::ECONNREFUSED, Errno::ETIMEDOUT
flash.now[:error] = t('images.flash.error.invalid_url')
render :new and return
end
--
1.7.7.6
12 years, 1 month
[PATCH conductor] Fold aeolus-all spec into conductor spec
by John Eckersberg
This simplifies things a bit and will make transitioning to tito
easier
---
Makefile | 4 +-
aeolus-all.spec.in | 287 ----------------------------------------------
aeolus-conductor.spec.in | 29 +++++
3 files changed, 30 insertions(+), 290 deletions(-)
delete mode 100644 aeolus-all.spec.in
diff --git a/Makefile b/Makefile
index 496f4dd..dc118b0 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@ endif
dist:
sed -e "s|@VERSION@|$(VERSION)|;s|^\(Release:[^%]*\)|\1$(EXTRA_RELEASE)|" aeolus-conductor.spec.in > aeolus-conductor.spec
- sed -e "s|@VERSION@|$(VERSION)|;s|^\(Release:[^%]*\)|\1$(EXTRA_RELEASE)|" aeolus-all.spec.in > aeolus-all.spec
mkdir -p dist/aeolus-conductor-$(VERSION)
cp -a aeolus-conductor.spec AUTHORS conf COPYING Makefile src \
@@ -52,7 +51,6 @@ dist:
rpms: dist
rpmbuild $(RPM_FLAGS) -ta aeolus-conductor-$(VERSION).tar.gz
- rpmbuild $(RPM_FLAGS) -ba aeolus-all.spec
srpms: dist
rpmbuild $(RPM_FLAGS) -ts aeolus-conductor-$(VERSION).tar.gz
@@ -67,6 +65,6 @@ genlangs:
cd src && rake updatepo && rake makemo
clean:
- rm -rf dist aeolus-conductor-$(VERSION).tar.gz aeolus-all.spec aeolus-conductor.spec
+ rm -rf dist aeolus-conductor-$(VERSION).tar.gz aeolus-conductor.spec
.PHONY: dist rpms publish srpms genlangs
diff --git a/aeolus-all.spec.in b/aeolus-all.spec.in
deleted file mode 100644
index caaeaf9..0000000
--- a/aeolus-all.spec.in
+++ /dev/null
@@ -1,287 +0,0 @@
-Name: aeolus-all
-Version: @VERSION@
-Release: 0%{?dist}
-Summary: A meta-package to pull in all components for Aeolus
-
-Group: Applications/Internet
-License: GPLv2+
-URL: http://aeolusproject.org
-
-Requires: aeolus-conductor-daemons = %{version}-%{release}
-Requires: aeolus-conductor-doc = %{version}-%{release}
-Requires: iwhd
-Requires: aeolus-configure
-Requires: imagefactory
-Requires: imagefactory-jeosconf-ec2-fedora
-Requires: imagefactory-jeosconf-ec2-rhel
-Requires: qpid-cpp-server
-Requires: rubygem(aeolus-image)
-Requires: rubygem(aeolus-cli)
-Requires: mongodb-server
-Requires: mod_ssl
-Requires: deltacloud-core
-Requires: deltacloud-core-ec2
-Requires: deltacloud-core-rhevm
-Requires: deltacloud-core-vsphere
-Requires: ntp
-Requires: rsyslog-relp
-
-BuildArch: noarch
-
-%description
-This is the aeolus meta-package. If you want to install aeolus and all of its
-dependencies on a single machine, you should install this package and then
-run aeolus-configure to configure everything.
-
-%files
-
-%post
-
-%changelog
-* Mon Jan 09 2012 Steve Linabery <slinaber(a)redhat.com> - 0.8.0-2
-- 18ba534 Merge branch 'master' of github.com:aeolusproject/conductor
-- 0a37767 API - Added template checking when creating an image
-- 33d63a3 -change method of ensuring poolIds are unique, removed hard tab
-- 4aa3fce updated deployment index refresh to categorize deployments by pool
-- a2885b4 added pool ID to div identifier
-- 0a020e7 Support for multiple accounts per provider.
-- 6fa3ce3 Backbone will always use preset_filter value if present
-- 5e068fe Bump release
-- a18865d Update changelog entries
-- 9c027cd Fix autoupdate with table filters
-- 15c740b Adding 'No catalog' label when no catalog available for the deployable when creating image
-- 0c98f1b Use a lambda to delay the evaluation of Provider in conjunction with scope
-- d2a37e2 Reference lib/image by full path
-- 342c552 Display a specific error message for image import with a blank ID
-- a7ae8ec Add missing style to image import form
-- 90826d7 Rename Catalog Entries to Deployables in the UI
-- 55b28c5 update pools count with applying filters in pools table (bz770620)
-- 5adcc24 Autoupdating pretty view fixed on Pools#index for multiline array of deployments
-- 61934bc Fixing new deployable form
-- fdd00ab Fixing failing rspec tests
-- dd1d2db Localise instance count indicator in pretty view
-- eea7d11 Fix the uptime format
-- a627c74 BZ#755933 Last login,Last login IP fields empty.
-- 46ac73e Added architecture check
-- 7b24128 Removed duplicit vcr definition for aeolus-image
-- df5f048 BZ 769635, added scope enabled to Provider and ProviderAccount
-- 1853d01 Error displayed after provider destroy fails
-- 810714c Redirect to catalog detail after catalog entry is created succesfully
-- be4735d Fixing the date format in Deployment's json representation
-- 188c848 Table striping fixed for autoupdating on the table view of pools#index
-- fc0c339 Fixing autoupdating issues
-- d23ed06 Fixed error rendering for AJAX requests
-- 4c43e02 Fixing the permission partial
-- f5d8de1 Error message fixed for creating new deployable without providing url for the xml
-- d7d7a29 Deployable XML parsing switched to strict mode
-- fe236fc BZ#766163 Add reboot_multiple to grid view of instances,controller method and localization.
-- 0bae59e fix user dropdown in masthead
-
-* Wed Jan 04 2012 Steve Linabery <slinaber(a)redhat.com> - 0.8.0-1
-- d98cb57 Verify image exists before importing it from provider
-- 314c90e Allow creating deployables from imported images
-- b1e8993 Add realm selection to Deployment Overview
-- b94664f Added support to DeployablesController to handle deployables without catalog
-- 8d446e2 Fixing return_path in permissions#set_permission_object
-- 4297b08 Change version of aeolus-image gem to 0.3.0
-- 43440b1 Fixing jQuery template on deployments#show
-- 9762232 Fixing autoupdate on deployments#show
-- f1e6529 Prevent launching invalid deployments
-- 77b349b Removed edit pool family button from pool families table (bz768154)
-- a362758 Fix catalog dropdown when no catalog exist, bz769279
-- cb5bf9b BZ 768089: Add model and UI for provider account priority
-- e47d1a4 BZ 768089: spec test for provider account priority (revised)
-- a3164ca BZ 768089: Refactor provider account matching to facilitate stubbing (revised)
-- 93f464c Drop pretty/filter toggle from deployment details
-- c3b896d Rake task to insert ldap users.
-- 6512cb9 BZ 760901 - removed line touching unused lock file
-- 02dfa3f fix for bz #765901: fix pools_in_use calculation
-- 4f380bf new catalog entry from image, catalog select javascript
-- 5be3de8 error messages in flash hud
-- 3173e62 Replace description xml with name image import
-- 77014ab Add a View Template XML option to Image Details
-- 8668a57 BZ 767214 Removed the New Pool button from _section_header in pools controller
-- 879c6eb catalog entries checkbox in header to enable select all listed catalog entries, catalog entries new_from_image i18n fix
-- b062bc3 Fix message on launch from catalog
-- 53ccabe pool_family_id param added to new_pool_path
-- d5e79ff Deployable forms styling
-- ab67147 Image import uses lib/image.rb class
-- 0525111 Images#show properly detects ProviderAccount for imported image
-- f0dea6c Fix failing RSpec tests
-- a30691a images#show only shows the relevant provider for imported images
-- 74143b3 API import (used by aeolus-cli) requires Provider Account now.
-- c633f4c Image import is now linked to Provider Account, not just Provider
-- 203b032 Log any errors encountered during image import
-- 05f5067 Rescues a possible exception when creating a ProviderImage
-- 04254b9 Hides build and upload buttons for imported images
-- 72d9bf9 Image import uses new Image.import method
-- b4019c2 fix afterdestroy callback for instance
-- 003398f Fixed sort column
-- 93d196a Fix deployable xml link on the launch overview page
-- 415bddb Autoupdating deployments list on Pools#index
-- 17c333b Show pool enabled/disabled status in Environments
-- a211d72 added deployable name to create_from_image, BZ767109
-- 725ad8f buildpush ui icons and styling
-- d59142d Fix the pool families tests
-- a20c7fd Add Images tab to the Pool Family details page
-- 57afb0c Add "New Image" button to the images list
-- 53548d1 Remove User Treatment from User form BZ767189
-- 93d99a8 Fixed tests after removing warehouse models
-- cd330fb Fixed deployable link
-- c9c271a Removed warehouse models
-- bf22438 Removed some methods from warehouse models
-- 02d8dea Removed provider_images_for_image_list from image model
-- 245fa3e Fix for bz #765907: change permissions tab label from 'Users' to 'Role Assignments'
-- 057bf3b Fix missing translation on Import image button
-- 4438a1a BZ#753917 Added target to API Build Output
-- 926e1ac BZ#753917 Updated API to return Provider/Account on Push
-- 547e1a5 Fixing jQuery template on deployments#show
-- cf8cf19 Fixup for #761134
-- 01e9383 Fixing recognize_path calls when the path contains prefix
-- c784c3a Require a template file on the upload page
-- cd06da9 Style Image Details' header buttons
-- e15298b Don't display 'Download key' if there is not instance key
-- 1b4af97 Fixup for bz761096
-- 3ef5ea4 Quick Fix, destroy method is not called for ec2 and Mock instances, or if instance is in CREATE_FAILED state
-- 34db60c new administer section navigation icons
-- b196025 BUG-2751 - Delete instance on provider side when deleted in conductor
-- ea32f34 rootpw param in template XML changed is now required
-- 72fc9ac deployable details icons
-- 859c1c1 fix launch deployable test
-- 0978d61 deployable details Images part
-- cec00a2 fixed bug with updating deployable xml
-- c6dfc66 deployable details page styles, deployable details image section errors
-- f31b995 Use names correctly on template upload
-- 138d64d Input validation for new deployable from image
-- 243d454 Fixing deployment card on Pools#index
-- f11f6de Fix for bug #766038
-- ef2c43d fix for BZ #761509: User quota and other stats
-- 4c20a16 Allow changing deployment name on the Overview page
-- c02a0c4 BZ761132 fix broken translations for template xml
-- 32517e0 Fix flash message in images_controller#edit_xml
-- 13f897e Disabling Add button if no available catalog exists
-- ec56568 Condition added to XML validation in Deployable
-- 4f813b4 Fixed deprecation warning in pool_families#edit
-- 87cd77e Remove "load definition from XML" option from launch new deployment page
-- a6ea1ef Replaced new_catalog_entry_path with new_deployable_path to work with new controller structure
-- acd1159 Fixed a wrong regex on grep
-- a37aaf5 Added rake task to verify the status of licenses in the project
-- b7b467f Fixed list of catalog entries on deployables show page
-- bc11e96 deployable detail styles and fixes through biuldpush ui
-- 2c9a31d pool families list fix
-- f23ac0c RM 2879 - Secondary method for creating provider accounts using a provider name instead of an id
-- b24e67f BZ#754956 Return appropriate error code when parent not found
-- 971aaf2 List of users added to permissions page
-- ad124c6 Clean up Permission-related flash messages
-- 972777f Add Build & Push to Deployable Details
-- 978a43a Deploaybles and catalog_entries cleanups
-- 03f7931 Redmine #2254: Always compile scss in dev enviroment.
-- 122e55a Change sql statement to use rails helpers.
-- 869c8a6 Fix this migration so it also works on sqlite.
-- 077a18a Moving from GPL to ASL
-- 3bd07b2 Add relp dependency to metapackage.
-- 79e6dc9 bump version in Makefile and reset release
-- 9fe1011 Add changelog and bump release on specfile for 0.7.0 RC
-
-* Thu Dec 1 2011 Steve Linabery <slinaber(a)redhat.com> - 0.7.0-1
-- 4178a0a Adds functionality to delete deployment configurations from config server
-- cce4c7e Added pagination to events on instance detail page
-- bf3868b Clean up minor unneeded test output.
-- a9c520d Fixing aeolus-conductor.spec.in
-- 0e2b2d4 format_value is more cautious with calling .split
-- f35d2d7 Redmine #2515: Write and test actual logging behavior.
-- 9a4be2b Redmine #2514: Write and test transformation of api data into correct log format.
-- 3c1cc5c RM #2822: Add way to retrieve full list of attributes for validation.
-- 2723e13 Comments out EventSpec for now
-- d5f05a3 Rescue possibly-risky calls when creating a CDDR
-- fc2cafa Fixing message for user creation
-- 0167f7d Adding required fields indicator for user form
-- c5c1b98 remove repeating sql statements in rails.log
-- c239f6c Added build timestamp to image list view
-- 32f5ea0 Updated images controller to use TemplateXML
-- 1f447f4 Created TemplateXML model
-- d86537c Correct bad call left after rubygem refactor
-- af0ab18 Display the details for each image on the Deployable Details page
-- 81a2c60 Event.rb uses full path to lib/aeolus/event
-- 9df721a Fix for creating new Deployable page
-- ad13160 Allow Deployable XML files to contain in-line configurations
-- 42597dd Registering/deregistering multiple catalogs to deployment Renaming CatalogEntriesController to DeployablesController
-- 35d6fef catalogs dropdown in Create new catalog entry from template, new catalog_entry form styling
-- 79d5ab7 Buildpush layout
-- fcc950a obscured launch parameter if it is password
-- b0ed5b9 Update Image show UI
-- c44778d Return provider cleanup content via API
-- 2e3ead5 Updated Gemfile.lock for aeolus-image 0.2.0
-- 7e068e9 Permissions page for deployables.
-- a5ff27c Fixes failing test introduced by previous commit.
-- 1aecfb4 Deployment flash error is no longer mashed together.
-- 11b82d9 extracted apply_filters and apply_preset_filters methods to common_filter_methods module
-- 01ab731 Cucumber tests for search and filters
-- dd41e62 Added filter method, updated filters and search through the application
-- ba22842 Added filters and search to tables through application
-- 9016b1f Fixes bugs and warnings exposed by tests
-- 4b78e5d Adds tests for Events
-- 60e6245 lib/aeolus/event code is included in RPM and called for Events
-- b86f1fd DBomatic does not write events; after-save hooks already handle this
-- bd26168 InstanceObserver includes :status_code, :change_hash parameters to Event
-- 3317495 Event model calls Event API after_create
-- de655cf Define start_time and end_time for Deployment
-- 8fc332f Remove secret_token.rb from conductor rpm - v2
-- e36fa46 internationalize api error messages
-- ae2cdf6 Fix pagginate on launch_from_catalog site
-- a4b892b Image import GUI
-- cecbf26 Fixes pool family detail, pools tab. Adds generic table instead of pool_families one
-- 24fa151 BZ744713 - changed font styles for catalog images
-- 99eda06 BZ#755933 Last login, Last login IP fields empty
-- 5e1b27a Launch deployment from the Deployable Details page
-- 8c8ae24 Correct bad call in Api::TargetImagesController
-- 5d4d456 Updated API for new aeolus-image-rubygem changes
-- 7da907f added reraising of BuildNotFound exception
-- d2b1de1 changed return text to xml, add targets to import params
-- f0d2b77 added reraising of ProviderImageNotFound expection
-- 838179e API::ProviderImages spec, mock in #create + minor fixes
-- ecacfa4 API::Images spec, minor xml fixes
-- e3e193b API::Builds spec, minor return expectations fixes
-- 2707489 API::TargetImages spec, #destroy
-- b983da4 API::ProviderImages spec, #create #destroy
-- 9f2c3e8 API::ImagesController spec, #create #destroy
-- 9ee78b8 API::BuildsController spec #create #destroy
-- 7b904f4 Display the backend provider image ID when deleted
-- 6c7802e UI - create catalog entry from an image
-- 2b43395 Removed unused rescue block when creating a template
-- 56a2d9f Fix broken the Catalog Entries Cucumber feature
-- eeac165 Add the skeleton for the Deployable Details page
-- 131887d Add the name of belonging provider in provder_account#new/edit form
-- 304c42b Change dropdown of catalogs to the name of belonging catalog in catalog_entry#new/edit form
-- 6decf95 spec and cucumber changes for catalog_entry/deployable refactoring
-- 1671422 view and controller changes for catalog_entry/deployable refactoring
-- ff83dda Refactored catalog_entry model into catalog_entry and deployable models.
-- 77dce31 Implementing pretty view for instances
-- 4823c2b Changed aeolus user to 180:180 per bz 754274
-- 0301070 dbomatic only writes instance events if they have changed
-- 279331f Added options for creating catalog entry via upload XML or url to XML
-- 0e7a2f9 Added tabs to catalog_entries#new form
-- d88865d Fix tests after removing URL of catalog entry from launch form
-- 4705924 Remove URL of catalog entry from launch UI
-- bd41e3a Fixed specs and cukes after the change in catalog entries.
-- 28e8fb8 Changes for catalog entry new/edit form.
-- 39632a8 Added migration, that deletes URL attribute from catalog_entries and adds 2 column(xml, and xml_filename)
-- 8e6f8dc Save template in warehouse
-- d207889 Improved tests performance
-- 65c7a75 Comments failing Image test
-- 63903e6 Bump version number following imminent release of 0.6.0 from the 0.6.x branch
-- 3a8a4d3 Updates ProviderType to use Rails 3 syntax
-- f2f751b Add screens for template import
-- 6f0b310 Fix spec so rpm builds.
-- 690eb08 Task #2710 reboot of instance
-- 62d2b4d Add initial 2 events to be sent.
-- a6c4081 Initial Event API implementation.
-- 57c4066 Added image detail page
-- 78b505b Added images index view
-- 6534ce1 Added empty images controller
-
-* Thu Jul 21 2011 Mo Morsi <mmorsi(a)redhat.com> - 0.3.0-2
-- Updates to conform to Fedora guidelines
-
-* Mon Apr 04 2011 Chris Lalancette <clalance(a)redhat.com> - 0.3.0-1
-- Initial build
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index e6a2659..2a851e0 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -94,6 +94,33 @@ Requires: rubygem(launchy)
%description devel
Tests and other development tools for the Aeolus Conductor.
+%package -n aeolus-all
+Summary: A meta-package to pull in all components for Aeolus
+Group: Applications/Internet
+Requires: aeolus-conductor-daemons = %{version}-%{release}
+Requires: aeolus-conductor-doc = %{version}-%{release}
+Requires: iwhd
+Requires: aeolus-configure
+Requires: imagefactory
+Requires: imagefactory-jeosconf-ec2-fedora
+Requires: imagefactory-jeosconf-ec2-rhel
+Requires: qpid-cpp-server
+Requires: rubygem(aeolus-image)
+Requires: rubygem(aeolus-cli)
+Requires: mongodb-server
+Requires: mod_ssl
+Requires: deltacloud-core
+Requires: deltacloud-core-ec2
+Requires: deltacloud-core-rhevm
+Requires: deltacloud-core-vsphere
+Requires: ntp
+Requires: rsyslog-relp
+
+%description -n aeolus-all
+This is the aeolus meta-package. If you want to install aeolus and all of its
+dependencies on a single machine, you should install this package and then
+run aeolus-configure to configure everything.
+
%prep
%setup -q
@@ -321,6 +348,8 @@ fi
%{app_root}/script
%{app_root}/spec
+%files -n aeolus-all
+
%changelog
* Mon Jan 09 2012 Steve Linabery <slinaber(a)redhat.com> - 0.8.0-2
- 18ba534 Merge branch 'master' of github.com:aeolusproject/conductor
--
1.7.7.6
12 years, 1 month