[PATCH conductor] Corrects new lines after credentials
by Petr Blaho
From: Petr Blaho <pblaho(a)redhat.com>
for Provider Account in XML template
https://www.aeolusproject.org/redmine/issues/3420
---
.../views/provider_accounts/_credentials.xml.haml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/app/views/provider_accounts/_credentials.xml.haml b/src/app/views/provider_accounts/_credentials.xml.haml
index 0103e6c..1d40187 100644
--- a/src/app/views/provider_accounts/_credentials.xml.haml
+++ b/src/app/views/provider_accounts/_credentials.xml.haml
@@ -1,3 +1,2 @@
-creds_label_hash.each do |h|
- =content_tag(h[:label]) do
- =h[:value]
+ =content_tag(h[:label], h[:value])
--
1.7.7.6
11 years, 9 months
[PATCH] Added delayed_job to check and restart services scripts
by Tomas Hrcka
---
bin/aeolus-check-services | 2 +-
bin/aeolus-restart-services | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/aeolus-check-services b/bin/aeolus-check-services
index 584aa58..27013c2 100755
--- a/bin/aeolus-check-services
+++ b/bin/aeolus-check-services
@@ -27,7 +27,7 @@ To restart aeolus services please use aeolus-restart-services.
end
# ordered as in rc.d
-init_scripts=%w(mongod iwhd postgresql httpd deltacloud-core libvirtd aeolus-conductor conductor-dbomatic imagefactory ntpd)
+init_scripts=%w(mongod iwhd postgresql httpd deltacloud-core libvirtd aeolus-conductor conductor-delayed_job conductor-dbomatic imagefactory ntpd)
init_scripts.each do |script|
puts "\nChecking #{script} ..."
diff --git a/bin/aeolus-restart-services b/bin/aeolus-restart-services
index 35a68d4..c74d32b 100755
--- a/bin/aeolus-restart-services
+++ b/bin/aeolus-restart-services
@@ -27,7 +27,7 @@ To show status of aeolus services please use aeolus-check-services.
end
# ordered as in rc.d
-services = %w(mongod iwhd postgresql httpd deltacloud-core libvirtd aeolus-conductor conductor-dbomatic imagefactory ntpd)
+services = %w(mongod iwhd postgresql httpd deltacloud-core libvirtd aeolus-conductor conductor-delayed_job conductor-dbomatic imagefactory ntpd)
def perform(action, svcs)
action = action.to_s
--
1.7.10.4
11 years, 9 months
[PATCH conductor] Fix aeolus user home directory on upgrade
by John Eckersberg
Previously the aeolus user's home directory was set to /var/aeolus.
This was changed to /usr/share/aeolus-conductor in commit 923f894.
However this only catches new installations; if the aeolus user
previously existed (e.g. upgrade) then the home directory would not be
updated. This catches that case and ensures that old installations
using the old home directory are updated.
---
aeolus-conductor.spec.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index 6186651..15ace33 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -164,6 +164,10 @@ getent passwd aeolus >/dev/null || \
/usr/sbin/useradd -u 180 -g aeolus -c "aeolus" \
-s /sbin/nologin -r -d /usr/share/aeolus-conductor aeolus 2> /dev/null || :
+# Previously ~aeolus was set to /var/aeolus
+# If this is an upgrade scenario, fix the home directory
+test ~aeolus == /usr/share/aeolus-conductor || usermod --home /usr/share/aeolus-conductor aeolus
+
%install
%{__mkdir} -p %{buildroot}
%{__mkdir} -p %{buildroot}%{app_root}
--
1.7.10.2
11 years, 9 months
Workflow for Conductor
by Andy Goldstein
Hi all,
First off, sorry for not replying to the posts from before - I just now joined this mailing list. I wanted to propose an idea for a way to implement workflow/approvals for launching new instances. I know there is currently a proposal along these lines (https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Launch_request...). Looking at that, I see the suggestion is to build all the approval directly into Conductor. What I'm thinking about instead is sending out a message (e.g. Qpid, HornetQ, ActiveMQ) with the launch request information. Conductor wouldn't be responsible for managing the workflow other than keeping track of PENDING_APPROVAL deployments. Instead, the workflow would be managed by an external third-party system. I suppose Conductor could supply a default/minimal approval UI, but the real power is in making the workflow extensible. Imagine a large enterprise IT department that hooks up the workflow notifications to a business rules engine for more advanced approval logic.
(As an aside, a similar approach could be used for events such as instance started, instance stopped, etc. Other external systems could consume these events to provide services like billing/chargebacks that wouldn't necessarily need to be features of Aeolus.)
What do you all think?
Andy
11 years, 9 months
[PATCH conductor 0/11] RM3392, 3394, converge-ui, login layout rev3
by Jirka Tomasek
RM3392, RM3394 This patchset updates the converge-ui used by Conductor
to latest commit, brings new stylesheets, images, javascript libs from
it. Patchset also makes Conductor to use converge-ui Login layout.
git-send-email won't allow me to send the patchset so I added the
patches as attachment.
(rev3: necessary aeolus-conductor.spec.in changes)
Jirka
11 years, 9 months
[PATCH conductor 1/3] Set 500 status code for internal server error pages
by Scott Seago
We had a custom handler for internal server errors, but they
were still coming through with 200 Success http status. This prevented
me from writing a test case to verify a recent fix, and it allowed at
least one old no-longer-valid test case for user creation to continue
passing even though it exhibited failure.
---
src/app/controllers/application_controller.rb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb
index d5da863..477b7f4 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -70,7 +70,8 @@ class ApplicationController < ActionController::Base
def handle_general_error(error)
handle_error(:error => error, :status => :internal_server_error,
- :title => t('application_controller.internal_server_error'))
+ :title => t('application_controller.internal_server_error'),
+ :status => 500)
end
def handle_error(hash)
@@ -93,7 +94,8 @@ class ApplicationController < ActionController::Base
else
flash.now[:error] = msg
render :template => 'layouts/error', :layout => 'application',
- :locals => {:title => title, :errmsg => ''}
+ :locals => {:title => title, :errmsg => ''},
+ :status => status
end
end
--
1.7.6.5
11 years, 9 months
Not yet possible to remove failed deployments?
by Justin Clift
Hi all,
Having real troubles here removing failed deployments using Aeolus 0.10.4,
on Fedora 16.
In my setup, there are a number of multi-instance Wordpress deployments
(1 x MySQL server, 1 x Apache server). Sometimes while trying things out
a deployment barfs instead of launching ok. (various reasons)
In theory, I should be able to select said deployments and hit the "Delete
Selected" button, with that working.
Instead, this error message pops up:
"The deployments Wordpress-test3, wordpress-test10, and wordpress-test11
could not be deleted."
Any ideas if I'm doing something wrong, or if it's definitely something
that's busted and needs fixing pronto? (can BZ it, but asking first)
Screenshot attached. ;)
Regards and best wishes,
Justin Clift
--
Aeolus Community Manager
http://www.aeolusproject.org
11 years, 9 months
[PATCH conductor]condutor extended with hwp functionality
by Samridh
This patch set modfies the routes which now maps /conductor/api/hardware_profiles to /conductor/hardware_profiles.
This is required for cli hwp functionality. This can be removed once all the api related functionality is moved to the controllers.
11 years, 9 months
Etherpad just went offline again. :(
by Justin Clift
Hi all,
Does anyone remember what Matt needed to do the other day, to get
the Etherpad working again after it went offline?
Was just starting to update some stuff when it barfed.
Service Temporarily Unavailable
Ugh. :(
(maybe we should look for a more stable etherpad version?)
+ Justin
--
Aeolus Community Manager
http://www.aeolusproject.org
11 years, 9 months