[PATCH] Enable close button in new notification UI
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/app/views/layouts/_new_notification.haml | 2 +-
src/public/javascripts/application.js | 7 +++++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/app/views/layouts/_new_notification.haml b/src/app/views/layouts/_new_notification.haml
index 3cc2b68..8e7fbbd 100644
--- a/src/app/views/layouts/_new_notification.haml
+++ b/src/app/views/layouts/_new_notification.haml
@@ -1,5 +1,5 @@
#flash-hud
- %a.control{:href => '#'} Close
+ = link_to "Close","#", :class => "control"
-if flash[:success]
.notice.flash-group
.flash-subset
diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js
index 3ec73b3..601871f 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -121,6 +121,12 @@ var Conductor = {
}
}
});
+ },
+
+ closeNotification: function() {
+ $('.control').click(function() {
+ $('#flash-hud').slideUp(100).fadeOut(100);
+ });
}
};
@@ -215,4 +221,5 @@ $(document).ready(function () {
Conductor.enhanceDetailsTabs();
Conductor.bind_pretty_toggle();
Conductor.multiDestroyValidation();
+ Conductor.closeNotification();
});
--
1.7.4.2
12 years, 10 months
[PATCH aeolus 1/2] Added RestClient resource/config
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
.../image_factory/aeolus-image/config/cli.yaml | 7 +++++++
.../image_factory/aeolus-image/lib/base_command.rb | 12 ++++++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 services/image_factory/aeolus-image/config/cli.yaml
diff --git a/services/image_factory/aeolus-image/config/cli.yaml b/services/image_factory/aeolus-image/config/cli.yaml
new file mode 100644
index 0000000..b83862e
--- /dev/null
+++ b/services/image_factory/aeolus-image/config/cli.yaml
@@ -0,0 +1,7 @@
+imagefactory:
+ url: http://localhost:9090
+
+conductor:
+ url: http://localhost:3000/conductor
+ username: admin
+ password: password
\ No newline at end of file
diff --git a/services/image_factory/aeolus-image/lib/base_command.rb b/services/image_factory/aeolus-image/lib/base_command.rb
index 4d4fa42..ae07644 100644
--- a/services/image_factory/aeolus-image/lib/base_command.rb
+++ b/services/image_factory/aeolus-image/lib/base_command.rb
@@ -1,11 +1,16 @@
+require 'yaml'
+require 'restclient'
+
module Aeolus
module Image
#This will house some methods that multiple Command classes need to use.
class BaseCommand
attr_accessor :options
+
def initialize(opts={}, logger=nil)
logger(logger)
@options = opts
+ @config = YAML::load( File.open( "config/cli.yaml" ) )
end
protected
@@ -19,6 +24,13 @@ module Aeolus
return @logger
end
+ def imagefactory
+ RestClient::Resource.new(@config['imagefactory']['url'])
+ end
+
+ def conductor
+ RestClient::Resource.new(@config['conductor']['url'], :user => @config['conductor']['username'], :password => @config['conductor']['password'])
+ end
end
end
end
--
1.7.4
12 years, 10 months
New UI for Hardware Profiles
by Tomas Hrcka
needs to be applied on jtomasek's patch (New UI elements for Administration section part1, you can use also NACKed patch)
12 years, 10 months
New UI for Provider Account views
by jzigmund＠redhat.com
Patch needs to be applied on jtomasek's patch (New UI elements for Administration section part1, you can use also NACKed patch)
12 years, 10 months
New UI for Pool family views
by jzigmund＠redhat.com
Patch needs to be applied on jtomasek's patch (New UI elements for Administration section part1, you can use also NACKed patch)
12 years, 10 months
Deployable XML
by Scott Seago
So between Mark's earlier writeup and
http://www.aeolusproject.org/page/Audrey_Overview I've come up with some
initial ideas around what to expect in a Deployable definition XML file.
The first iteration of this (which is all we'll support in the context
of this sprint) will not support parameters, return values, or services
(i.e. all of the audrey-oriented configuration bits). For this first
iteration, a deployable simply has a name, a description, and a list of
embedded assemblies, each of which includes a name, a hardware profile,
and an image (or image build) reference:
<deployable name="Redmine">
<description>Redmine is a web-based project management
application</description>
<assemblies>
<assembly name="frontend" hwp="small">
<image id="11abf870-894c-4336-bc9f-37904c394924">
</image>
</assembly>
<assembly name="backend" hwp="medium">
<image id="11abf870-894c-4336-bc9f-37904c394924" build="be2a8e6">
</image>
</assembly>
</assemblies>
</deployable>
The next step will be to build in support for the audrey config bits --
which brings in parameters, services, and return values. Here's an
example of that -- this is a lot more preliminary, as I'm still not
entirely clear on the interactions of the various levels of params, etc,
but what follows may at least be a starting point for discussion:
<deployable name="Redmine">
<description>Redmine is a web-based project management
application</description>
<assemblies>
<assembly name="frontend" hwp="small">
<image id="11abf870-894c-4336-bc9f-37904c394924">
<parameter type="string" name="redmine_admin">
<value>#{admin_user}</value>
</parameter>
<return name="http_port"/>
</image>
<services>
<service name="service1">
<scripts>
<script href="...."></script>
<script>
<contents><![CDATA[
#!/bin/bash
...
]]</contents>
</script>
</scripts>
<parameter type="string" name="redmine_admin">
<value>#{admin_user}</value>
</parameter>
<return name="http_port"/>
</service>
</services>
</assembly>
<assembly name="frontend" hwp="medium">
<image id="11abf870-894c-4336-bc9f-37904c394924" version="be2a8e6">
...
</image>
</assembly>
</assemblies>
<parameter type="string" name="admin_user">
<description>Administrator's username</description>
<value>admin</value>
</parameter>
<return name="url">
<description>URL of the Redmine project management system</description>
<value>http://#{frontend.ip_address}:#{frontend.http_port}/</value>
</return>
</deployable>
12 years, 10 months
[PATCH] Fix unowned python sitedir directory
by Steven Dake
Signed-off-by: Steven Dake <sdake(a)redhat.com>
---
oz.spec.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/oz.spec.in b/oz.spec.in
index 0c5a243..ed62114 100644
--- a/oz.spec.in
+++ b/oz.spec.in
@@ -78,6 +78,7 @@ fi
%dir %attr(0755, root, root) %{_localstatedir}/lib/oz/floppies/
%dir %attr(0755, root, root) %{_localstatedir}/lib/oz/icicletmp/
%dir %attr(0755, root, root) %{_localstatedir}/lib/oz/jeos
+%dir %attr(0755, root, root) %{python_sitelib}/oz
%{python_sitelib}/oz/*
%{_bindir}/oz-install
%{_bindir}/oz-generate-icicle
--
1.7.4.4
12 years, 11 months
[PATCH] Correct %files section of imagefactory.spec.in
by Steven Dake
Added imgfac.1.gz to rpm
Added COPYING to rpm
Added version.txt to rpm
Fixed unowned dirs
Set proper config setting for config file
Signed-off-by: Steven Dake <sdake(a)redhat.com>
---
MANIFEST.in | 2 +-
imagefactory.spec.in | 17 ++++++++++++++---
setup.py | 2 +-
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
index 72f0efc..1ee119c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include cert-ec2.pem imagefactory.conf scripts/imagefactory
+include COPYING Documentation/man/imgfac.1 cert-ec2.pem imagefactory.conf scripts/imagefactory
diff --git a/imagefactory.spec.in b/imagefactory.spec.in
index b71bbf6..d672ca1 100644
--- a/imagefactory.spec.in
+++ b/imagefactory.spec.in
@@ -37,13 +37,24 @@ for the requested target.
python setup.py build
%install
-python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+%{__rm} -rf $RPM_BUILD_ROOT
+python setup.py install -O1 --root=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f INSTALLED_FILES
-%defattr(-,root,root)
+%files
+%defattr(-,root,root,-)
+%doc COPYING version.txt
+%{_initrddir}/imagefactory
+%config(noreplace) %{_sysconfdir}/imagefactory.conf
+%dir %attr(0755, root, root) %{_sysconfdir}/pki/imagefactory/
+%{_sysconfdir}/pki/imagefactory/cert-ec2.pem
+%dir %attr(0755, root, root) %{python_sitelib}/imagefactory/
+%{python_sitelib}/imagefactory/*
+%{python_sitelib}/imagefactory-*.egg-info
+%{_bindir}/imgfac.py
+%{_mandir}/man1/*
%changelog
* Mon Apr 04 2011 Chris Lalancette <clalance(a)redhat.com> - 0.1.6-1
diff --git a/setup.py b/setup.py
index f73ed8e..b54b5d5 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ try:
except Exception, e:
raise RuntimeError("ERROR: version.txt could not be found. Run 'git describe > version.txt' to get the correct version info.")
-datafiles=[('/etc', ['imagefactory.conf']), ('/etc/pki/imagefactory', ['cert-ec2.pem']), ('/etc/rc.d/init.d', ['scripts/imagefactory']), ('', ['version.txt'])]
+datafiles=[('share/man/man1', ['Documentation/man/imgfac.1']), ('/etc', ['imagefactory.conf']), ('/etc/pki/imagefactory', ['cert-ec2.pem']), ('/etc/rc.d/init.d', ['scripts/imagefactory'])]
class sdist(_sdist):
""" custom sdist command to prepare imagefactory.spec file """
--
1.7.4.4
12 years, 11 months
Sanitize filenames used in Condor
by Matt Wagner
We found an issue where we were generating job names with slashes in them, and thus trying to use those as filenames. This is a patch to ensure that Condormatic doesn't write files with invalid names. (It's slightly more restrictive than it needs to be, but I'd rather err on that side.)
12 years, 11 months
