[PATCH Audrey] Fix for bz 781459
by Greg Blomquist
This fix is for aeolus-configserver-setup. It runs ssh-keygen in an unconfined
security context during the puppet run process.
As it turns out, in RHEL6.3 ssh-keygen will run unconfined. So, this patch is
is a stop-gap until that happens. However, it should still work in RHEL6.3, so
it should not have to be reverted.
I'll push this to github on Monday when I can coordinate building this and
getting it out to the various repos as well.
12 years, 4 months
cannot create EC2 new account
by Berezovski, Vladimir
I cannot add EC2 account within conductor although I sure that all data provided to the for is valid and correct .
Aeolus was configured with ec2 profile only .
But , in the /var/log/deltacloud-core/mock.log I see the following :
I, [2012-01-15T18:42:26.943052 #9201] INFO -- : New Aws::Ec2 using per_thread-connection mode
I, [2012-01-15T18:42:26.947662 #9201] INFO -- : Opening new HTTPS connection to ec2.us-east-1.amazonaws.com:443
W, [2012-01-15T18:42:28.361622 #9201] WARN -- : ##### Aws::Ec2 returned an error: 400 Bad Request
<?xml version="1.0" encoding="UTF-8"?>
<Response><Errors><Error><Code>RequestExpired</Code><Message>Request has expired. Timestamp date is 2012-01-15T16:42:26.000Z</Message></Error></Errors><RequestID>b482ff43-a42d-4843-a71a-5cfb0f1e02d4</RequestID></Response> #####
W, [2012-01-15T18:42:28.361866 #9201] WARN -- : ##### Aws::Ec2 request: ec2.us-east-1.amazonaws.com:443/?AWSAccessKeyId=AKIAIAUQNQARFUINQIEA&Action=DescribeAvailabilityZones&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-01-15T16%3A42%3A26.000Z&Version=2010-08-31&Signature=CM27zq0BRXxnvZSnI5aX9gRTE0zD7zfpfgiyyubNHJU%3D ####
thin server (localhost:3002) [deltacloud-mock][9201]: 127.0.0.1 - - [15/Jan/2012 18:42:28] "GET /api?force_auth=1 HTTP/1.1" 401 21 1.4235
Is this info reliable regarding my ec2 account possible problem ?
/Vlad .
________________________________
This message is confidential and intended only for the addressee. If you have received this message in error, please immediately notify the postmaster(a)nds.com and delete it from your system as well as any copies. The content of e-mails as well as traffic data may be monitored by NDS for employment and security purposes.
To protect the environment please do not print this e-mail unless necessary.
An NDS Group Limited company. www.nds.com
12 years, 4 months
[PATCH conductor] Fix our JavaScript code to load under IE
by Tomas Sedovic
From: Tomas Sedovic <tomas(a)sedovic.cz>
IE7's JS parser has a few syntax restrictions that other browsers don't have.
This caused our JS to be invalid under IE.
Trailing coma in the object definition:
{
one: 1,
two: 2,
three: 3,
}
This works in Chrome and Firefox (and presumably elsewhere though I didn't test
that) but not in IE7.
There we have to drop the last coma:
{
one: 1,
two: 2,
three: 3
}
The other issue we've had is using an unquoted `class` key in objects:
Reasonable browsers:
{ class: 'a jolly old string', five: 6 }
Under IE7, this is broken and we must be using this instead:
{ 'class': 'a jolly old string', five: 6 }
I'm sure there are additional surprises waiting to trip us in the future.
---
src/public/javascripts/application.js | 2 +-
src/public/javascripts/backbone/models.js | 6 +++---
src/public/javascripts/backbone/routers.js | 8 ++++----
src/public/javascripts/backbone/views.js | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js
index 84fd443..88833b3 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -217,7 +217,7 @@ $.extend(Conductor, {
var $checkbox = $scope.find(checkboxSelector + '[value="' + id + '"]');
$checkbox.prop('checked', true);
});
- },
+ }
});
diff --git a/src/public/javascripts/backbone/models.js b/src/public/javascripts/backbone/models.js
index d576feb..a89cb6b 100644
--- a/src/public/javascripts/backbone/models.js
+++ b/src/public/javascripts/backbone/models.js
@@ -2,7 +2,7 @@ Conductor.Models = Conductor.Models || {}
Conductor.Models.Pool = Backbone.Model.extend({
- urlRoot: Conductor.prefixedPath('/pools'),
+ urlRoot: Conductor.prefixedPath('/pools')
});
Conductor.Models.Pools = Backbone.Collection.extend({
@@ -15,7 +15,7 @@ Conductor.Models.Pools = Backbone.Collection.extend({
});
Conductor.Models.Instance = Backbone.Model.extend({
- urlRoot: Conductor.prefixedPath('/instances'),
+ urlRoot: Conductor.prefixedPath('/instances')
});
Conductor.Models.Instances = Backbone.Collection.extend({
@@ -33,7 +33,7 @@ Conductor.Models.Deployment = Backbone.Model.extend({
initialize: function() {
this.instances = new Conductor.Models.Instances();
this.instances.url = this.urlRoot + '/' + this.id + '/instances';
- },
+ }
});
diff --git a/src/public/javascripts/backbone/routers.js b/src/public/javascripts/backbone/routers.js
index d7606b7..ed896d6 100644
--- a/src/public/javascripts/backbone/routers.js
+++ b/src/public/javascripts/backbone/routers.js
@@ -5,7 +5,7 @@ Conductor.Routers.Pools = Backbone.Router.extend({
routes: {
'': 'index',
'pools:query': 'index',
- 'pools/:id': 'show',
+ 'pools/:id': 'show'
},
index: function() {
@@ -53,14 +53,14 @@ Conductor.Routers.Pools = Backbone.Router.extend({
pool.fetch({ success: function() { view.render(); } })
}, Conductor.AJAX_REFRESH_INTERVAL);
- },
+ }
});
Conductor.Routers.Deployments = Backbone.Router.extend({
routes: {
'deployments': 'index',
- 'deployments/:id': 'show',
+ 'deployments/:id': 'show'
},
index: function() {
@@ -83,5 +83,5 @@ Conductor.Routers.Deployments = Backbone.Router.extend({
deployment.change();
} })
}, Conductor.AJAX_REFRESH_INTERVAL);
- },
+ }
});
diff --git a/src/public/javascripts/backbone/views.js b/src/public/javascripts/backbone/views.js
index 9ec53e5..97f678d 100644
--- a/src/public/javascripts/backbone/views.js
+++ b/src/public/javascripts/backbone/views.js
@@ -106,13 +106,13 @@ Conductor.Views.PoolsIndex = Backbone.View.extend({
});
for(var i = 0; i < poolDeployments.length; i += cardsPerRow) {
var $row = this.make('ul',
- {class: 'deployment-array small'},
+ {'class': 'deployment-array small'},
$template.tmpl(poolDeployments.slice(i, i + cardsPerRow)));
$rows.append($row);
}
}
}
- },
+ }
});
Conductor.Views.PoolsShow = Backbone.View.extend({
@@ -148,12 +148,12 @@ Conductor.Views.PoolsShow = Backbone.View.extend({
var cardsPerRow = 5;
for(var i = 0; i < deployments.length; i += cardsPerRow) {
var $row = this.make('ul',
- {class: 'deployment-array large'},
+ {'class': 'deployment-array large'},
$template.tmpl(deployments.slice(i, i + cardsPerRow)));
$cards.append($row);
}
}
- },
+ }
});
@@ -176,6 +176,6 @@ Conductor.Views.DeploymentsShow = Backbone.View.extend({
$instances.empty();
$('#instanceTemplate').tmpl(this.collection.toJSON()).appendTo($instances);
- },
+ }
});
--
1.7.6.5
12 years, 4 months
[PATCH conductor] Fix the horizontal lists under IE
by Tomas Sedovic
From: Tomas Sedovic <tomas(a)sedovic.cz>
We use a horizontal layout of <li> elements for scoreboard, tabs, etc. These
are done using the `inline-block` value of the `display` property which IE 7
doesn't support.
This changes them to floats for IE, fixing the most glaring issues with the
layout.
---
src/public/stylesheets/layout_ie.css | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/public/stylesheets/layout_ie.css b/src/public/stylesheets/layout_ie.css
index e69de29..3f9b01e 100644
--- a/src/public/stylesheets/layout_ie.css
+++ b/src/public/stylesheets/layout_ie.css
@@ -0,0 +1,11 @@
+#scoreboard li {
+ float: left;
+}
+
+ul.groups li {
+ float: left;
+}
+
+nav.faceted ul li {
+ float: left;
+}
--
1.7.6.5
12 years, 4 months
[PATCH] Fix spelling error in aeolus-restart-services
by James Laska
When running aeolus-restart-services, the text associated with service
shutdown and status was incorrectly spelled. This patch fixes the
spelling error by not trying to translate the desired action.
---
bin/aeolus-restart-services | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/aeolus-restart-services b/bin/aeolus-restart-services
index 6c44295..553a70e 100755
--- a/bin/aeolus-restart-services
+++ b/bin/aeolus-restart-services
@@ -32,8 +32,8 @@ services = %w(mongod iwhd postgresql httpd qpidd deltacloud-core libvirtd aeolus
def perform(action, svcs)
action = action.to_s
svcs.map do |script|
- puts "\n#{action.capitalize}ing #{script} ..."
cmd = "service #{script} #{action}"
+ puts "\n# #{cmd} ..."
out = `#{cmd}`
if $?.to_i == 0
puts " \e[1;32mSuccess:\e[0m #{out.strip}"
--
1.7.7.5
12 years, 4 months
[PATCH] Change default screenshot_dir to avoid writing to /
by James Laska
The current default screenshot_dir value of '.' results in screenshots
being written to the root directory.
> OzException: No disk activity in 300 seconds, failing. Check screenshot
> at /client-a14da48d-ef38-485a-afb7-56f69597d553-1326467720.58.png for
> more detail
This patch changes the default to '/tmp/oz-screenshots' and creates the
directory if needed while saving a screenshot.
---
man/oz-cleanup-cache.1 | 2 +-
man/oz-customize.1 | 2 +-
man/oz-install.1 | 2 +-
oz.cfg | 2 +-
oz/Guest.py | 7 +++++++
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/man/oz-cleanup-cache.1 b/man/oz-cleanup-cache.1
index 37640a4..0e1d314 100644
--- a/man/oz-cleanup-cache.1
+++ b/man/oz-cleanup-cache.1
@@ -41,7 +41,7 @@ The configuration file should have the following form:
[paths]
output_dir = /var/lib/libvirt/images
data_dir = /var/lib/oz
-screenshot_dir = .
+screenshot_dir = /tmp/oz-screenshots
[libvirt]
uri = qemu:///system
diff --git a/man/oz-customize.1 b/man/oz-customize.1
index 658eeb2..f43d2dc 100644
--- a/man/oz-customize.1
+++ b/man/oz-customize.1
@@ -53,7 +53,7 @@ The configuration file should have the following form:
[paths]
output_dir = /var/lib/libvirt/images
data_dir = /var/lib/oz
-screenshot_dir = .
+screenshot_dir = /tmp/oz-screenshots
[libvirt]
uri = qemu:///system
diff --git a/man/oz-install.1 b/man/oz-install.1
index 8834b18..64661c4 100644
--- a/man/oz-install.1
+++ b/man/oz-install.1
@@ -108,7 +108,7 @@ The configuration file should have the following form:
[paths]
output_dir = /var/lib/libvirt/images
data_dir = /var/lib/oz
-screenshot_dir = .
+screenshot_dir = /tmp/oz-screenshots
[libvirt]
uri = qemu:///system
diff --git a/oz.cfg b/oz.cfg
index 313e170..5bbbcfd 100644
--- a/oz.cfg
+++ b/oz.cfg
@@ -1,7 +1,7 @@
[paths]
output_dir = /var/lib/libvirt/images
data_dir = /var/lib/oz
-screenshot_dir = .
+screenshot_dir = /tmp/oz-screenshots
[libvirt]
uri = qemu:///system
diff --git a/oz/Guest.py b/oz/Guest.py
index 1858645..33d2631 100644
--- a/oz/Guest.py
+++ b/oz/Guest.py
@@ -790,6 +790,13 @@ class Guest(object):
vnc = "localhost:%s" % (int(port) - 5900)
try:
+ if not os.path.isdir(self.screenshot_dir):
+ self.mkdir_p(self.screenshot_dir)
+ except OSError, e:
+ self.log.error("Failed create screenshot directory - %s" % e)
+ return None
+
+ try:
oz.ozutil.subprocess_check_output(['gvnccapture', vnc, screenshot])
return screenshot
except:
--
1.7.7.5
12 years, 4 months
[PATCH] BZ 781450 - return 401 code for unauthenticated JSON requests
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
---
src/app/controllers/application_controller.rb | 2 +-
src/spec/controllers/pools_controller_spec.rb | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb
index d6890f8..4685517 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -189,7 +189,7 @@ class ApplicationController < ActionController::Base
redirect_to login_url
end
format.xml { head :unauthorized }
- format.json { render :json => "You must be logged in to access this page" }
+ format.json { head :unauthorized }
end
end
diff --git a/src/spec/controllers/pools_controller_spec.rb b/src/spec/controllers/pools_controller_spec.rb
index 2ccbe1a..25770b1 100644
--- a/src/spec/controllers/pools_controller_spec.rb
+++ b/src/spec/controllers/pools_controller_spec.rb
@@ -88,6 +88,18 @@ describe PoolsController do
end.should change(Pool, :count).by(-2)
end
+ context "unauthenticated JSON responses " do
+ before do
+ accept_json
+ mock_warden(nil)
+ end
+
+ it "should return 401" do
+ get :index
+ response.response_code.should == 401
+ end
+ end
+
context "JSON format responses for " do
before do
accept_json
--
1.7.7.5
12 years, 4 months
Fwd: oVirt test day is coming - Jan 16th
by Justin Clift
Anyone feel like trying out Aeolus + oVirt for this?
... or just general oVirt testing on the day, the more the merrier. :)
Regards and best wishes,
Justin Clift
Begin forwarded message:
> From: Moran Goldboim <mgoldboi(a)redhat.com>
> Subject: oVirt test day is coming - Jan 16th
> Date: 12 January 2012 12:35:55 AM AEDT
> To: users(a)ovirt.org, arch(a)ovirt.org, announce(a)ovirt.org
> Reply-To: devel(a)ovirt.org
>
> Looking forward to ovirt first release on Jan 31th.
> we would like all to participate in oVirt test day on the 16Th. This would be an opportunity to exercise a oVirt for the upcoming release. Each Test Day brings something unique and you're encouraged to join and share your ideas, tests, and results.
> all needed information is available in http://www.ovirt.org/wiki/Testing/OvirtTestDay
> please review it, subscribe and have fun with it.
>
> Moran.
> _______________________________________________
> Announce mailing list
> Announce(a)ovirt.org
> http://lists.ovirt.org/mailman/listinfo/announce
--
Aeolus Community Manager
http://www.aeolusproject.org
12 years, 4 months