New aeolus-image push syntax
by Matt Wagner
Hi all,
I'm not the author of this change, and honestly don't even know the
whole story behind why it changed. But since this is causing a lot of
confusion:
The syntax to push an image with aeolus-image has changed. Here is
the new syntax:
$ aeolus-image push --provider ec2-us-east-1 --account matt_ec2 \
--image 6ae8421f-9ab2-4925-8f8d-ab165862b137 \
--build bf2c3ef3-2d67-455c-9c19-0d9a6bb9bdbb \
--targetimage 193564a1-dd0d-4543-b182-d78d482010de
I have documented this on the
https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Launching_Inst...
page as well.
-- Matt
12 years, 5 months
Deleting aeolus 0.2.0 release directory
by steve linabery
Hello aeolus community,
In preparation for the upcoming community release 0.5.0 of aeolus, I am removing the old 0.2.0 directory.
I have archived it; on the off-chance that anyone needs anything from that directory, please contact me directly and I can point you at the archive.
Cheers,
Steve|eggs
12 years, 5 months
[PATCH configure 0/1] Moves OAuth configuration into oauth.json
by Matt Wagner
After talking a bit to Mo, we decided it might make more sense if we wrote out an oauth.json file that aeolus-configure could parse. This does two things:
- Developers can just run the rake task and have a configuration file generated locally. (They will still need to configure iwhd and Factory to *use* this configuration on their own.)
- The file is only generated if it's missing, which means that it won't get overwritten. This allows aeolus-configure to simply take the keys from this file and use them to configure other components.
This is related to https://bugzilla.redhat.com/show_bug.cgi?id=749254 though it doesn't directly solve it. There's another half of this which needs to be done in aeolus-configure. Right now, we write a config file that doesn't correspond to what iwhd and Factory use, so this will actually break things until the aeolus-configure part is implemented. But I want to get someone to look this over and confirm that this is a good strategy overall.
-- Matt
12 years, 5 months
[PATCH configure] Remove RHEV-M specific conf.js iwhd configuration file
by Richard Su
The default iwhd configuration file now works with RHEV-M.
This makes the RHEV-M specific config file unnecessary.
---
recipes/aeolus/manifests/profiles/rhevm.pp | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp
index 93d8bad..39680f2 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -18,11 +18,6 @@ class aeolus::profiles::rhevm {
mode => 755,
require => Package['aeolus-conductor-daemons'] }
- file {"/etc/iwhd/conf.js":
- content => template("aeolus/iwhd-conf.js"),
- mode => 755,
- require => Package['aeolus-conductor-daemons'] }
-
file {"$rhevm_nfs_mount_point":
ensure => 'directory'}
@@ -33,14 +28,6 @@ class aeolus::profiles::rhevm {
options => "rw",
require => File["$rhevm_nfs_mount_point"]}
- # give iwhd a restart to pick up new configuration files
- # in the event iwhd had already initialized at /var/lib/iwhd
- exec { "/sbin/service iwhd restart":
- require => [Service['iwhd'],
- Mount["$rhevm_nfs_mount_point"],
- File["/etc/imagefactory/rhevm.json"],
- File["/etc/iwhd/conf.js"]]}
-
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
--
1.7.6.4
12 years, 5 months
[PATCH conductor] Display the real quota value in Launch Overview
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
The launch overview page shows how much of the total quota would the
deployment cost.
Previously the value was hard-coded, now it's computed properly.
---
src/app/controllers/deployments_controller.rb | 8 ++++++++
src/app/models/quota.rb | 6 +++---
src/app/views/deployments/_overview.html.haml | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/app/controllers/deployments_controller.rb b/src/app/controllers/deployments_controller.rb
index e101386..6362e95 100644
--- a/src/app/controllers/deployments_controller.rb
+++ b/src/app/controllers/deployments_controller.rb
@@ -72,6 +72,7 @@ class DeploymentsController < ApplicationController
if @services.empty? or @services.all? {|s, a| s.parameters.empty?}
# we can skip the launch-time parameters screen
check_assemblies_for_errors
+ @additional_quota = count_additional_quota(@deployment)
render 'overview' and return
end
end
@@ -88,6 +89,8 @@ class DeploymentsController < ApplicationController
respond_to do |format|
if @deployment.accessible_and_valid_deployable_xml?(@deployable_url)
check_assemblies_for_errors
+ @additional_quota = count_additional_quota(@deployment)
+
format.html
format.js { render :partial => 'overview' }
format.json { render :json => @deployment }
@@ -341,6 +344,11 @@ class DeploymentsController < ApplicationController
)
end
+ def count_additional_quota(deployment)
+ assembly_count = deployment.deployable_xml.assemblies.count
+ @additional_quota = deployment.pool.quota.percentage_used(assembly_count)
+ end
+
def load_deployment
@deployment = Deployment.find(params[:id])
@pool = @deployment.pool
diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb
index 883eb64..72fecd1 100644
--- a/src/app/models/quota.rb
+++ b/src/app/models/quota.rb
@@ -142,13 +142,13 @@ class Quota < ActiveRecord::Base
return quota_resources
end
- def percentage_used
- if Quota.no_limit(maximum_running_instances) || running_instances == 0
+ def percentage_used(count=running_instances)
+ if Quota.no_limit(maximum_running_instances) || count == 0
return 0
elsif maximum_running_instances == 0
return 100
else
- percentage_used = (running_instances.to_f / maximum_running_instances.to_f) * 100
+ percentage_used = (count.to_f / maximum_running_instances.to_f) * 100
return percentage_used
end
end
diff --git a/src/app/views/deployments/_overview.html.haml b/src/app/views/deployments/_overview.html.haml
index 83ce81d..724df3b 100644
--- a/src/app/views/deployments/_overview.html.haml
+++ b/src/app/views/deployments/_overview.html.haml
@@ -16,7 +16,7 @@
%section.content-section.deployable_details
%header.confirmation
%h2= t('.header', :deployment => @deployment.name, :pool => @pool.name)
- %p= t('.confirmation', :deployment => @deployment.name, :pool => @pool.name, :quota => 10)
+ %p= t('.confirmation', :deployment => @deployment.name, :pool => @pool.name, :quota => number_to_percentage(@additional_quota, :precision => 0))
.content
%h3= t '.description'
--
1.7.6.4
12 years, 5 months
Redmine backlog
by Mike Orazi
Hello,
A number of folks have raised concerns about the state of the general
aeolus conductor & configure backlogs. It has been quite a while since
anyone has groomed the backlog or the unassigned stories and it is very
difficult to see where we currently stand.
I'll start clearing things out at 1PM EST if no one raises an objection
before and then start filling in stories that we know are needed to get
the project to a compelling 1.0.
Thanks in advance,
Mike
12 years, 5 months
