Change to aeolus-configure may require rescripting
by steve linabery
As of commit 9bffb2c, running `aeolus-configure` without arguments will no longer automatically create the default administrator user with un/pw admin/password.
This behaviour has been split out into a separate aeolus-configure profile, namely admin_configure, wherein the default un/pw values are admin/password.
To create an admin user, invoke `aeolus-configure -p admin`
If you have jenkins jobs or other scripts that rely on admin/password being present in your aeolus install, please adjust accordingly.
hth
s|e
11 years, 11 months
[PATCH conductor] BZ 817114 - don't send empty configuration to configserver
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
If an assambly doesn't define any configserver params, config for this
assembly is not sent to configserver.
https://bugzilla.redhat.com/show_bug.cgi?id=817114
---
src/app/util/config_server_util.rb | 4 ++++
src/app/util/taskomatic.rb | 4 +++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/app/util/config_server_util.rb b/src/app/util/config_server_util.rb
index 749f1cf..517b0dd 100644
--- a/src/app/util/config_server_util.rb
+++ b/src/app/util/config_server_util.rb
@@ -180,6 +180,10 @@ module ConfigServerUtil
@config_xml ||= to_xml
end
+ def empty?
+ provided_parameters.empty? && services.empty?
+ end
+
protected
def _xml
xml "<instance-config id='#{@uuid}' name='#{(a)assembly.name}' secret='#{(a)instance.secret}'>\n"
diff --git a/src/app/util/taskomatic.rb b/src/app/util/taskomatic.rb
index a7181dc..8ccdbd4 100644
--- a/src/app/util/taskomatic.rb
+++ b/src/app/util/taskomatic.rb
@@ -21,7 +21,9 @@ module Taskomatic
task.state = Task::STATE_PENDING
task.save!
- task.instance.add_instance_config!(config_server, config) if config_server
+ if config_server and config.present?
+ task.instance.add_instance_config!(config_server, config)
+ end
task.instance.provider_account = match.provider_account
task.instance.create_auth_key unless task.instance.instance_key
--
1.7.7.6
11 years, 11 months
[aeolus-incubator/image-management-engine] cc2851: Updated/Added generators
by jason.guiditta
Branch: refs/heads/master
Home: https://github.com/aeolus-incubator/image-management-engine
Commit: cc285102eb9d2333a0f4ee736d4e5b5733b43a74
https://github.com/aeolus-incubator/image-management-engine/commit/cc2851...
Author: Martyn Taylor <mtaylor(a)redhat.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/generators/image_management/image_management_generator.rb
R lib/generators/image_management/templates/create_base_images.rb
R lib/generators/image_management/templates/create_image_versions.rb
R lib/generators/image_management/templates/create_provider_images.rb
R lib/generators/image_management/templates/create_target_images.rb
R lib/generators/image_management/templates/create_templates.rb
A lib/generators/image_management/templates/intializers/image_management_engine.rb
A lib/generators/image_management/templates/migrations/create_base_images.rb
A lib/generators/image_management/templates/migrations/create_image_versions.rb
A lib/generators/image_management/templates/migrations/create_provider_images.rb
A lib/generators/image_management/templates/migrations/create_target_images.rb
A lib/generators/image_management/templates/migrations/create_templates.rb
A test/dummy/config/initializers/image_management_engine.rb
M test/dummy/db/migrate/20120326103723531757_create_target_images.rb
M test/dummy/db/schema.rb
Log Message:
-----------
Updated/Added generators
Commit: 6be53451e8e0841bb79122ec7bc62829e4161a79
https://github.com/aeolus-incubator/image-management-engine/commit/6be534...
Author: Martyn Taylor <mtaylor(a)redhat.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
A lib/image_factory/image_factory.rb
A lib/image_factory/model/base.rb
A lib/image_factory/model/provider_image.rb
A lib/image_factory/model/target_image.rb
M lib/image_management.rb
M spec/spec_helper.rb
Log Message:
-----------
Create Active Resource Lib for Factory Interaction
Commit: 963d01b3ba35559491f234ae2c0c4623c2c00717
https://github.com/aeolus-incubator/image-management-engine/commit/963d01...
Author: Martyn Taylor <mtaylor(a)redhat.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M Gemfile
M Gemfile.lock
A spec/factories/image_management/base_image.rb
A spec/factories/image_management/image_version.rb
A spec/factories/image_management/target_image.rb
A spec/factories/image_management/template.rb
M spec/spec_helper.rb
Log Message:
-----------
Created Initial Set of Factories
Commit: 91e024e46fef0646844bd543586af3fa8ad66cb2
https://github.com/aeolus-incubator/image-management-engine/commit/91e024...
Author: Martyn Taylor <mtaylor(a)redhat.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M app/models/image_management/target_image.rb
Log Message:
-----------
Added Factory Call on Before Save to TargetImage
Commit: 211e22d95f7d49e6246fa9ed64219b7b309fa123
https://github.com/aeolus-incubator/image-management-engine/commit/211e22...
Author: Martyn Taylor <mtaylor(a)redhat.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M spec/models/dummy/provider_type_spec.rb
M spec/models/image_version_spec.rb
M spec/models/provider_image_spec.rb
M spec/models/target_image_spec.rb
Log Message:
-----------
Updated Specs for ARes Factory Integration
Commit: 3140058fa669db71a81b5844cff5c8a7df3f3046
https://github.com/aeolus-incubator/image-management-engine/commit/314005...
Author: jguiditta <jason.guiditta(a)gmail.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M Gemfile
M Gemfile.lock
M app/models/image_management/target_image.rb
M lib/generators/image_management/image_management_generator.rb
R lib/generators/image_management/templates/create_base_images.rb
R lib/generators/image_management/templates/create_image_versions.rb
R lib/generators/image_management/templates/create_provider_images.rb
R lib/generators/image_management/templates/create_target_images.rb
R lib/generators/image_management/templates/create_templates.rb
A lib/generators/image_management/templates/intializers/image_management_engine.rb
A lib/generators/image_management/templates/migrations/create_base_images.rb
A lib/generators/image_management/templates/migrations/create_image_versions.rb
A lib/generators/image_management/templates/migrations/create_provider_images.rb
A lib/generators/image_management/templates/migrations/create_target_images.rb
A lib/generators/image_management/templates/migrations/create_templates.rb
A lib/image_factory/image_factory.rb
A lib/image_factory/model/base.rb
A lib/image_factory/model/provider_image.rb
A lib/image_factory/model/target_image.rb
M lib/image_management.rb
A spec/factories/image_management/base_image.rb
A spec/factories/image_management/image_version.rb
A spec/factories/image_management/target_image.rb
A spec/factories/image_management/template.rb
M spec/models/dummy/provider_type_spec.rb
M spec/models/image_version_spec.rb
M spec/models/provider_image_spec.rb
M spec/models/target_image_spec.rb
M spec/spec_helper.rb
A test/dummy/config/initializers/image_management_engine.rb
M test/dummy/db/migrate/20120326103723531757_create_target_images.rb
M test/dummy/db/schema.rb
Log Message:
-----------
Merge pull request #7 from mtaylor/initial_factory_integration
Initial factory integration
Compare: https://github.com/aeolus-incubator/image-management-engine/compare/6df63...
11 years, 11 months
[PATCH conductor] Bug 807745 add 'use provider accounts' to global image admin role
by Scott Seago
https://bugzilla.redhat.com/show_bug.cgi?id= 807745
Image admin role has been augmented to include view and use permissions
on provider accounts. This allows global image admins to import
images from any provider account.
To see the changes you need to run 'rake dc:upgrade' which performs the
necessary data upgrade to get the role modification. The upgrade is
currently implemented inline in the rake task -- the intent is
for this task to eventually run a set of upgrade scripts from a
dedicated 'upgrades' directory, but the infrastructure for that is not
yet set up.
---
src/db/seeds.rb | 3 ++-
src/lib/tasks/dc_tasks.rake | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/db/seeds.rb b/src/db/seeds.rb
index 71b4f62..529ad76 100644
--- a/src/db/seeds.rb
+++ b/src/db/seeds.rb
@@ -112,7 +112,8 @@ roles =
Quota => [VIEW]}],
"base.image.admin" => [false, {PoolFamily => [VIEW, USE],
Catalog => [VIEW,USE,MOD,CRE,VPRM,GPRM],
- Deployable => [VIEW,USE,MOD,CRE,VPRM,GPRM]}],
+ Deployable => [VIEW,USE,MOD,CRE,VPRM,GPRM],
+ ProviderAccount => [VIEW,USE]}],
"base.admin" => [false, {Provider => [VIEW,USE,MOD,CRE,VPRM,GPRM],
ProviderAccount => [VIEW,USE,MOD,CRE,VPRM,GPRM],
HardwareProfile => [VIEW, MOD,CRE,VPRM,GPRM],
diff --git a/src/lib/tasks/dc_tasks.rake b/src/lib/tasks/dc_tasks.rake
index 7c0a297..083e3e8 100644
--- a/src/lib/tasks/dc_tasks.rake
+++ b/src/lib/tasks/dc_tasks.rake
@@ -164,6 +164,22 @@ namespace :dc do
end
+ desc 'Data upgrade for conductor'
+ # this should eventually be pulled out into a separate "upgrade everything in here" directory
+ task :upgrade => :environment do
+ Role.transaction do
+ image_admin_role = Role.find_by_name("base.image.admin")
+ if image_admin_role and image_admin_role.privileges.
+ where(:target_type => "ProviderAccount").empty?
+ ["view", "use"].each do |action|
+ Privilege.create!(:role => image_admin_role,
+ :target_type => "ProviderAccount",
+ :action => action)
+ end
+ end
+ end
+ end
+
def get_account(provider_name, account_name)
unless provider = Provider.find_by_name(provider_name)
raise "There is no provider with '#{provider_name}' name"
--
1.7.6.5
11 years, 11 months
[PATCH aeolus-conductor] Fix files declaration for daemons subpkg
by steve linabery
aeolus-configure was throwing an error when trying to start the delayed_job
service because /usr/share/aeolus-conductor/script/delayed_job was not present.
It was being copied in with the devel subpackage, which most developers had installed,
so they weren't seeing this error.
---
aeolus-conductor.spec.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index e5fefa6..a40d517 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -401,6 +401,7 @@ fi
%attr(-, aeolus, aeolus) %{app_root}/log/delayed_job.log
%doc AUTHORS COPYING
%{_libdir}/../lib/tmpfiles.d/aeolus.conf
+%{app_root}/script/delayed_job
%files doc
%{doc_root}
--
1.7.6.5
11 years, 11 months