[PATCH 0/2] Config Server feature in conductor
by Greg Blomquist
These patches add back in the config server (reverted for 0.3.0) and adds the
notion of deployables with configuration data.
The notable changes are:
* config server model
- provider account now has an (optional) one-to-one relationship with a
config server
* update instance model to include instance config XML property
* expanded deployable XML format to support configuration
* updated instance matching logic to require a config server in an account if
the instance has configurations
* added matching logic to select provider accounts for a group of instances
* added launching logic to launch all instances of a deployable in a single
provider account
* add user_data to condormatic
What's remaining:
* cucumber tests
* more rspec tests
* use relaxNG to validate the XML format for deployable.xml
* UI that drives collection of configuration parameters in conductor
* probably a lot more...
12 years, 8 months
Several small conductor patches
by James Laska
Greetings,
While trying to come up to speed with using conductor and configure from git, I
found that a few small changes were needed to get packages built properly. The
first change involves adjusting the format of the %{release} tag. The
packaging guidelines [1] recommend moving %{?dist} to the end of the release
string, not the start. The second change adds aeolus-configure-image to the
%files. This resolves rpmbuild complaints about installed, but unpackaged
files. I'm not sure if that's the correct location, but it resolved the build
issue for me.
Thoughts/comments/concerns encouraged.
Thanks,
James
[1] https://fedoraproject.org/wiki/Packaging:DistTag
12 years, 8 months
[PATCH 0/2]: Minor unittest fixes
by Chris Lalancette
This is a couple of small patches to fix the imagefactory unittests. With
these in place, I am able to successfully run the unittests to completion.
12 years, 8 months
Removed create bucket
by Jan Provazník
I sent this patch earlier but there were some concerns if
bucket creation is required or not. After running e2e test
(+deleting S3 buckets) I'm sure we don't need this code.
12 years, 8 months
[PATCH aggregator] Added utils package with aeolus-check-services (originally util/check_services)
by Maros Zatko
From: Maros Zatko <mzatko(a)redhat.com>
---
Makefile | 2 +-
aeolus-conductor.spec.in | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 6810a8b..538d3e4 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ dist:
sed -e 's/@VERSION@/$(VERSION)/' aeolus-all.spec.in > aeolus-all.spec
sed -e 's/@VERSION@/$(VERSION)/' aeolus-conductor.spec.in > aeolus-conductor.spec
mkdir -p dist/aeolus-conductor-$(VERSION)
- cp -a aeolus-conductor.spec AUTHORS conf COPYING Makefile src \
+ cp -a aeolus-conductor.spec AUTHORS conf COPYING Makefile src util \
dist/aeolus-conductor-$(VERSION)
tar -C dist -zcvf aeolus-conductor-$(VERSION).tar.gz aeolus-conductor-$(VERSION)
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index 664e966..6c054fd 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -64,6 +64,16 @@ Requires(preun): initscripts
%description daemons
The configuration and daemons necessary to run and proxy the Aeolus Conductor.
+%package utils
+Summary: Aeolus Conductor utilities
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+Requires: ruby >= 1.8.1
+Requires: ruby(abi) = 1.8
+
+%description utils
+Utility to check if daemons are running.
+
%package doc
Summary: Aeolus Conductor documentation
Group: Documentation
@@ -185,6 +195,11 @@ done
%{__mkdir} -p %{buildroot}%{app_root}/dbomatic
%{__cp} src/dbomatic/dbomatic %{buildroot}%{app_root}/dbomatic
+# copy utils to visible place
+%{__mkdir} -p %{buildroot}/usr/bin
+pwd
+%{__cp} util/check_services %{buildroot}/usr/bin/aeolus-check-services
+
# move documentation to the correct place
%{__cp} src/doc/* %{buildroot}/%{doc_root}
@@ -279,6 +294,9 @@ fi
%attr(-, aeolus, aeolus) %{_localstatedir}/log/%{name}
%doc AUTHORS COPYING
+%files utils
+/usr/bin/aeolus-check-services
+
%files doc
%{doc_root}
%doc AUTHORS COPYING
@@ -289,6 +307,9 @@ fi
%{app_root}/spec
%changelog
+* Fri Aug 12 2011 Maros Zatko <mzatko(a)redhat.com> - 0.4.0-1
+- Added script for listing running services
+
* Thu Jul 21 2011 Mo Morsi <mmorsi(a)redhat.com> - 0.3.0-2
- update Source0 checkout instructions
--
1.7.6
12 years, 8 months
[PATCH conductor] Redmine 2102 - Disable stylesheet compilation in production environment
by Richard Su
---
src/config/environments/production.rb | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/config/environments/production.rb b/src/config/environments/production.rb
index ecc0196..3bb1785 100644
--- a/src/config/environments/production.rb
+++ b/src/config/environments/production.rb
@@ -66,3 +66,6 @@ Conductor::Application.configure do
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
end
+
+# Disable stylesheet updates on production
+Compass.configuration.sass_options = { :never_update => true }
--
1.7.4.4
12 years, 8 months
[PATCH conductor] Update dbomatic for the new Nokogiri interface
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
The Nokogiri that's in Fedora 15 has a different interface to its
`start_element` SAX method.
The `attributes` argument is a list of tuples where each tuple contains the
`name` and `value` of an attribute. Previously, it was a flat array of
strings.
This patch makes it work both for Nokogiri 1.4.x and 1.5.x.
---
src/dbomatic/dbomatic | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/dbomatic/dbomatic b/src/dbomatic/dbomatic
index 013be84..7e5f511 100755
--- a/src/dbomatic/dbomatic
+++ b/src/dbomatic/dbomatic
@@ -105,7 +105,20 @@ class CondorEventLog < Nokogiri::XML::SAX::Document
# Store the name of the event log attribute we're looking at
def start_element(element, attributes)
- @tag = attributes[1] if element == "a"
+ # NOTE: this code is written to work both with Nokogiri 1.4.x and 1.5.x
+ # As soon as we stop supporting 1.4.x, we should change this to:
+ # @tag = attributes.first[1] if element == "a"
+ # and remove the rest.
+
+ return unless element == "a"
+
+ # Nokogiri 1.5.x passes attributes as [['name1', 'val1'], ['name2,'val2']]
+ if(attributes.length >= 1 and attributes.first.class == Array and
+ attributes.first.length == 2)
+ @tag = attributes.first[1]
+ else # Nokogiri 1.4.x uses a flat array
+ @tag = attributes[1]
+ end
end
# Store the value of the event log attribute we're looking at
--
1.7.6
12 years, 8 months
[PATCH] Unescape HTML when appending 'provider_credentials'
by James Laska
Attempting to push images to ec2 was failing due to an unexpected
provider_credentials format. Seems the credentials were escaped (< >)
which caused subsequent XPATH searches to fail. The suggested addition of
'.html_safe' comes from Matt Wagner. I have tested the fix and it appears to
resolve the issue.
Signed-off-by: James Laska <jlaska(a)redhat.com>
---
src/app/views/provider_accounts/_list.xml.haml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/provider_accounts/_list.xml.haml b/src/app/views/provider_accounts/_list.xml.haml
index fd0673b..f271154 100644
--- a/src/app/views/provider_accounts/_list.xml.haml
+++ b/src/app/views/provider_accounts/_list.xml.haml
@@ -5,4 +5,4 @@
%name= account.name
%provider= account.provider.name
%provider_type= account.provider.provider_type.codename
- = account.build_credentials.root.xpath('/provider_credentials').to_s
+ = account.build_credentials.root.xpath('/provider_credentials').to_s.html_safe
--
1.7.6
12 years, 8 months
[PATCH conductor] Fix realm.feature
by jzigmund@redhat.com
From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/app/views/realms/_form.haml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/app/views/realms/_form.haml b/src/app/views/realms/_form.haml
index 684aa1a..d3812fa 100644
--- a/src/app/views/realms/_form.haml
+++ b/src/app/views/realms/_form.haml
@@ -1,4 +1,6 @@
-= form.error_messages
+- if @realm.errors.any?
+ - @realm.errors.full_messages.each do |err|
+ = err
%fieldset
= form.label :name, 'Realm Name'
= form.text_field :name, :title => 'realm_name', :value => @realm.name, :class => 'em long'
--
1.7.6
12 years, 8 months