[PATCH conductor] bug 839474: extraneous group name text in edit form
by Scott Seago
https://bugzilla.redhat.com/show_bug.cgi?id=839474
Remove extra group name h2 text from haml.
---
src/app/views/user_groups/edit.html.haml | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/app/views/user_groups/edit.html.haml b/src/app/views/user_groups/edit.html.haml
index 62d4be9..f51bb04 100644
--- a/src/app/views/user_groups/edit.html.haml
+++ b/src/app/views/user_groups/edit.html.haml
@@ -9,6 +9,5 @@
%section.content-section.user_groups
.content
.align-center
- %h2.user_groups= @user_group.name
= form_for @user_group, :url => user_group_path(@user_group), :html => {:class => 'generic horizontal'} do |f|
= render :partial => "form", :locals => { :form => f }
--
1.7.11.4
11 years, 7 months
[PATCH] added mapping for Deltacloud instance state stopping to Instance::STATE_SHUTTING_DOWN
by Tomas Hrcka
---
src/app/util/taskomatic.rb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/app/util/taskomatic.rb b/src/app/util/taskomatic.rb
index 1708970..44f6707 100644
--- a/src/app/util/taskomatic.rb
+++ b/src/app/util/taskomatic.rb
@@ -116,6 +116,8 @@ module Taskomatic
return Instance::STATE_STOPPED
when 'SHUTTING_DOWN'
return Instance::STATE_SHUTTING_DOWN
+ when 'STOPPING'
+ return Instance::STATE_SHUTTING_DOWN
else
return Instance::STATE_PENDING
end
--
1.7.11.4
11 years, 7 months
Dbomatic minor change
by Tomas Hrcka
dbomatic iterates instances for one provider account ordered by id,
this patch orders them by updated_at attribute.
11 years, 7 months
[PATCH conductor] BZ 813147 - fixed validation message displayed for invalid XML
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
Also fixes assemblies method - if root node doesn't exist, empty
array is returned - w/o this an exception was raised in validation
process when checking cyclic references.
---
src/app/util/deployable_xml.rb | 1 +
src/config/locales/en.yml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/util/deployable_xml.rb b/src/app/util/deployable_xml.rb
index cb01cf5..e057771 100644
--- a/src/app/util/deployable_xml.rb
+++ b/src/app/util/deployable_xml.rb
@@ -257,6 +257,7 @@ class DeployableXML
end
def assemblies
+ return [] unless @root
@assemblies ||=
@root.xpath('/deployable/assemblies/assembly').collect do |assembly_node|
AssemblyXML.new(assembly_node)
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 0faa9db..d5da69f 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -842,8 +842,8 @@ en:
warning:
not_valid_or_reachable: "Deployable XML file is either invalid or no longer reachable at %{url}"
no_url_provided: "No URL provided for the Deployable XML file."
- not_valid: "The Deployable XML file contains syntax errors"
- not_valid_duplicate_assembly_names: "Deployable XML must contain unique Assembly names"
+ not_valid: "file contains syntax errors"
+ not_valid_duplicate_assembly_names: "must contain unique Assembly names"
not_valid_cyclic_reference: "Contains cyclic reference between following Assemblies or services: %{reference}"
not_valid_not_existing_assembly_reference: "Assembly %{from_assembly}, service %{from_service}, parameter %{from_param} references not existing Assembly %{to_assembly}"
not_valid_not_existing_service_reference: "Assembly %{from_assembly}, service %{from_service}, parameter %{from_param} references not existing Assembly %{to_assembly}, service %{to_service}"
--
1.7.11.4
11 years, 7 months
[PATCH conductor] BZ 842313 - fixed setting of deployment state when instance launch fails
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
If partial launch is enabled and all instances fails, the deployment
is marked as failed instead of running. Also if there is a failed instance
but rest of instances are running, the deployment is marked as incomplete.
---
src/app/models/deployment.rb | 4 +++-
src/spec/models/deployment_spec.rb | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 6e5e5d7..bbc3065 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -651,8 +651,10 @@ class Deployment < ActiveRecord::Base
def state_transition_from_pending(instance)
if instances.all? {|i| i.state == Instance::STATE_RUNNING}
self.state = STATE_RUNNING
+ elsif partial_launch and instances.all? {|i| i.failed?}
+ self.state = STATE_FAILED
elsif partial_launch and instances.all? {|i| i.failed_or_running?}
- self.state = STATE_RUNNING
+ self.state = STATE_INCOMPLETE
elsif !partial_launch and Instance::FAILED_STATES.include?(instance.state)
# TODO: now this is done in instance's after_update callback - as part
# of instance save transaction - this might be done on background by
diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb
index aa78f50..5178a83 100644
--- a/src/spec/models/deployment_spec.rb
+++ b/src/spec/models/deployment_spec.rb
@@ -456,6 +456,22 @@ describe Deployment do
@deployment.reload
@deployment.state.should == Deployment::STATE_PENDING
end
+
+ it "should set incomplete status if all instances are failed or running" do
+ @inst1.state = Instance::STATE_RUNNING
+ @inst1.save!
+ @inst2.state = Instance::STATE_CREATE_FAILED
+ @inst2.save!
+ @deployment.reload.state.should == Deployment::STATE_INCOMPLETE
+ end
+
+ it "should set failed status if all instances failed" do
+ @inst1.state = Instance::STATE_CREATE_FAILED
+ @inst1.save!
+ @inst2.state = Instance::STATE_CREATE_FAILED
+ @inst2.save!
+ @deployment.reload.state.should == Deployment::STATE_FAILED
+ end
end
end
--
1.7.11.4
11 years, 7 months
[PATCH aeolus-configure] Fix paths to /bin/su and /bin/sed
by steve linabery
Previous commit had these paths incorrect as /usr/bin/(su|sed)
---
recipes/aeolus/manifests/conductor.pp | 2 +-
recipes/postgres/manifests/user.pp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp
index 282d79c..f200526 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -104,7 +104,7 @@ class aeolus::conductor inherits aeolus {
notify => Service['postgresql']}
}
exec{ "pgauthuser":
- command => "/usr/bin/sed -i s/ident/md5/ /var/lib/pgsql/data/pg_hba.conf",
+ command => "/bin/sed -i s/ident/md5/ /var/lib/pgsql/data/pg_hba.conf",
onlyif => '/bin/grep -q ident /var/lib/pgsql/data/pg_hba.conf',
require => Exec["pginitdb"],
notify => Service["postgresql"]
diff --git a/recipes/postgres/manifests/user.pp b/recipes/postgres/manifests/user.pp
index e767e1d..ec3a66f 100644
--- a/recipes/postgres/manifests/user.pp
+++ b/recipes/postgres/manifests/user.pp
@@ -2,13 +2,13 @@ define postgres::user($ensure='created', $password="", $roles=""){
case $ensure {
'created': {
exec{"create_${name}_postgres_user":
- unless => "/usr/bin/test `/usr/bin/su postgres -c \"psql postgres postgres -P tuples_only -c \\\"select count(*) from pg_user where usename='${name}';\\\"\"` = \"1\"",
- command => "/usr/bin/su postgres -c \"/usr/bin/psql postgres postgres -c \
+ unless => "/usr/bin/test `/bin/su postgres -c \"/usr/bin/psql postgres postgres -P tuples_only -c \\\"select count(*) from pg_user where usename='${name}';\\\"\"` = \"1\"",
+ command => "/bin/su postgres -c \"/usr/bin/psql postgres postgres -c \
\\\"CREATE USER ${name} WITH PASSWORD '${password}' ${roles}\\\"\""}}
'dropped': {
exec{"drop_${name}_postgres_user":
- onlyif => "/usr/bin/test `/usr/bin/su postgres -c \"psql postgres postgres -P tuples_only -c \\\"select count(*) from pg_user where usename='${name}';\\\"\"` = \"1\"",
- command => "/usr/bin/su postgres -c \"/usr/bin/psql postgres postgres -c \
+ onlyif => "/usr/bin/test `/bin/su postgres -c \"/usr/bin/psql postgres postgres -P tuples_only -c \\\"select count(*) from pg_user where usename='${name}';\\\"\"` = \"1\"",
+ command => "/bin/su postgres -c \"/usr/bin/psql postgres postgres -c \
\\\"DROP USER ${name}\\\"\""}}
}
}
--
1.7.7.6
11 years, 7 months
[PATCH conductor] BZ808026 fix
by Brian McLaughlin
---
src/app/views/layouts/application.html.haml | 1 +
src/public/stylesheets/layout_ie8.css | 9 +++++++++
2 files changed, 10 insertions(+)
create mode 100644 src/public/stylesheets/layout_ie8.css
diff --git a/src/app/views/layouts/application.html.haml b/src/app/views/layouts/application.html.haml
index ba6b020..eb98aac 100644
--- a/src/app/views/layouts/application.html.haml
+++ b/src/app/views/layouts/application.html.haml
@@ -7,6 +7,7 @@
= stylesheet_link_tag 'jquery.ui-1.8.1/jquery-ui-1.8.1.custom.css'
/[if lt IE 9]
= javascript_include_tag 'http://html5shiv.googlecode.com/svn/trunk/html5.js'
+ = stylesheet_link_tag '/stylesheets/layout_ie8.css'
/[if lt IE 8]
= stylesheet_link_tag '/stylesheets/layout_ie7.css'
diff --git a/src/public/stylesheets/layout_ie8.css b/src/public/stylesheets/layout_ie8.css
new file mode 100644
index 0000000..ea0b6f9
--- /dev/null
+++ b/src/public/stylesheets/layout_ie8.css
@@ -0,0 +1,9 @@
+#maincontent section.maincontent .page-header .obj_actions {
+overflow:hidden;
+}
+#maincontent section.maincontent .page-header INPUT[type='submit'].on.provider_toggle {
+float:right;
+}
+#maincontent section.maincontent .page-header INPUT[type='submit'].off.provider_toggle {
+float:right;
+}
--
1.7.11.4
11 years, 7 months
Aeolus Community :Suggestions
by Nitesh Narayan
Hi,
Just got a random thought that it will be good and cheaper if we can make up stuffs like small soft toys aeolus balls.
I am also in a favour of getting some one aboard as a contributor for designing tshirts , posters etc .
It will be good if we can design a mascot whose soft toys we can give away as swag as usually it attracts many people (similar to openSUSE lizard) .
And one more things these are just few suggestions from my side . :)
Print only if its necessary
Regards
Nitesh Narayan Lal
Aeolus Contributor
11 years, 7 months
[PATCH conductor] bug 805134: Fix quota usage message on pools page.
by Scott Seago
https://bugzilla.redhat.com/show_bug.cgi?id=805134
Quota was showing up as 'x of y' where x is instances in use, and y was available instances.
This was incorrect, since "of y" implies that y is the total quota, not the free space.
---
src/app/views/pools/_scoreboard_show.html.haml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/views/pools/_scoreboard_show.html.haml b/src/app/views/pools/_scoreboard_show.html.haml
index 78c6dd5..334b4e8 100644
--- a/src/app/views/pools/_scoreboard_show.html.haml
+++ b/src/app/views/pools/_scoreboard_show.html.haml
@@ -29,5 +29,5 @@
%dd.fraction.instance
%span.part= @statistics[:used_quota]
%span.divider.label.small.caps of
- %span.total= @statistics[:available_quota] or '∞'.html_safe
+ %span.total= @pool.quota.maximum_running_instances or '∞'.html_safe
-# TODO: Implement alerts and updates
--
1.7.11.4
11 years, 7 months
The right way to do reference templates?
by Justin Clift
Hi Chris,
Trying to think of the "right way" to do reference templates,
for inclusion with the upstream releases.
i.e.
CentOS 6 base, with Apache httpd
CentOS 6 base, with PostgreSQL server
CentOS 6 base, with MySQL server
(etc)
Was initially thinking we could reserve some UUID address
space for them (ie. 00000000-0000-0000-0000-xxxxxxxxxxxx),
and then people could refer to those in any deployments
they create if they want.
But after testing this out a bit, not sure if it's practical.
After updating Oz to use a UUID embedded in a template file...
https://github.com/justinclift/oz/commit/811b4026a73f619d0a7ab1080afc666c...
(also needs the same xml bit added to Conductor template-rng.xml)
... it seems that first attempt targets the wrong level of
abstraction. Seems pretty much Oz-internal there (~ libvirt
level).
Before I go off and start thinking how to pass that uuid
value from Oz to Imagefactory... figured I ask if there's
a more obvious/better way to approach this whole thing?
Just in case the approach above sounds like it'd lead up
the garden path... ;)
+ Justin
--
Aeolus Community Manager
http://www.aeolusproject.org
11 years, 7 months
