[PATCH] doc: identify the license whose terms are in COPYING
by Jim Meyering
There was no mention in COPYING that this is the text of the
Apache License, Version 2.0.
* COPYING: Identify the license in this file.
Use simple ASCII double quotes, not UTF-8 ones.
---
Joe, please apply this to your audrey git clone.
FYI, to anyone else.
This is part of feedback for the aeolus-configserver review request.
http://bugzilla.redhat.com/756179
Part of the reviewer's task is to verify that the license used matches
the one listed in the spec file. That was not trivial.
Without the above, I had to "know" that this is the Apache license,
download something official-looking from the web and plow through
the diffs induced by formatting and the use of non-ASCII quotes.
If your project has a similar COPYING file that does not identify itself
or that uses those pesky UTF-8 quotes, please adjust accordingly.
COPYING | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/COPYING b/COPYING
index 59de275..35907a1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,38 +1,44 @@
+Apache License
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
-“License” shall mean the terms and conditions for use, reproduction,
+"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
-“Licensor” shall mean the copyright owner or entity authorized by the
+"Licensor" shall mean the copyright owner or entity authorized by the
copyright owner that is granting the License.
-“Legal Entity” shall mean the union of the acting entity and all other
+"Legal Entity" shall mean the union of the acting entity and all other
entities that control, are controlled by, or are under common control with
-that entity. For the purposes of this definition, “control” means (i) the
+that entity. For the purposes of this definition, "control" means (i) the
power, direct or indirect, to cause the direction or management of such
entity, whether by contract or otherwise, or (ii) ownership of fifty percent
(50%) or more of the outstanding shares, or (iii) beneficial ownership
of such entity.
-“You” (or “Your”) shall mean an individual or Legal Entity exercising permissions
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
granted by this License.
-“Source” form shall mean the preferred form for making modifications, including
+"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.
-“Object” form shall mean any form resulting from mechanical transformation
+"Object" form shall mean any form resulting from mechanical transformation
or translation of a Source form, including but not limited to compiled
object code, generated documentation, and conversions to other media types.
-“Work” shall mean the work of authorship, whether in Source or Object form,
+"Work" shall mean the work of authorship, whether in Source or Object form,
made available under the License, as indicated by a copyright notice that
is included in or attached to the work (an example is provided in the Appendix
below).
-“Derivative Works” shall mean any work, whether in Source or Object form,
+"Derivative Works" shall mean any work, whether in Source or Object form,
that is based on (or derived from) the Work and for which the editorial
revisions, annotations, elaborations, or other modifications represent,
as a whole, an original work of authorship. For the purposes of this License,
@@ -40,20 +46,20 @@ Derivative Works shall not include works that remain separable from, or
merely link (or bind by name) to the interfaces of, the Work and Derivative
Works thereof.
-“Contribution” shall mean any work of authorship, including the original
+"Contribution" shall mean any work of authorship, including the original
version of the Work and any modifications or additions to that Work or
Derivative Works thereof, that is intentionally submitted to Licensor for
inclusion in the Work by the copyright owner or by an individual or Legal
Entity authorized to submit on behalf of the copyright owner. For the purposes
-of this definition, “submitted” means any form of electronic, verbal, or
+of this definition, "submitted" means any form of electronic, verbal, or
written communication sent to the Licensor or its representatives, including
but not limited to communication on electronic mailing lists, source code
control systems, and issue tracking systems that are managed by, or on
behalf of, the Licensor for the purpose of discussing and improving the
Work, but excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as “Not a Contribution.”
+designated in writing by the copyright owner as "Not a Contribution."
-“Contributor” shall mean Licensor and any individual or Legal Entity on
+"Contributor" shall mean Licensor and any individual or Legal Entity on
behalf of whom a Contribution has been received by Licensor and subsequently
incorporated within the Work.
@@ -90,7 +96,7 @@ that You changed the files; and
You distribute, all copyright, patent, trademark, and attribution notices
from the Source form of the Work, excluding those notices that do not pertain
to any part of the Derivative Works; and
-4. If the Work includes a “NOTICE” text file as part of its distribution,
+4. If the Work includes a "NOTICE" text file as part of its distribution,
then any Derivative Works that You distribute must include a readable copy
of the attribution notices contained within such NOTICE file, excluding
those notices that do not pertain to any part of the Derivative Works,
@@ -123,7 +129,7 @@ the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable
law or agreed to in writing, Licensor provides the Work (and each Contributor
-provides its Contributions) on an “AS IS” BASIS, WITHOUT WARRANTIES OR
+provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied, including, without limitation,
any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY,
or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining
@@ -150,6 +156,3 @@ responsibility, not on behalf of any other Contributor, and only if You
agree to indemnify, defend, and hold each Contributor harmless for any
liability incurred by, or claims asserted against, such Contributor by
reason of your accepting any such warranty or additional liability.
-
-
-
--
1.7.8.rc3.31.g017d1
12 years, 3 months
Submitted two hackfest proposals to FUDCon around Aeolus
by Mo Morsi
As you can read on my blog [1], I've submitted two proposals around
developing Aeolus tooling to FUDCon Blacksburg, coming up this upcoming
January. These usually take some time to prepare so I'm planning on
doing some work on this front come this upcoming December. But if all
goes as planned (and if the proposals are accepted) it'll be a good way
to get people familiar w/ the Aeolus components, and how to use them to
deploy, monitor, and migrate instances on the cloud from Fedora.
Take care!
-Mo
[1] http://mo.morsi.org/blog/node/351
12 years, 3 months
[PATCH conductor] Fix pagginate on launch_from_catalog site
by jzigmund@redhat.com
From: Jozef Zigmund <jzigmund(a)redhat.com>
---
.../deployments/launch_from_catalog.html.haml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/deployments/launch_from_catalog.html.haml b/src/app/views/deployments/launch_from_catalog.html.haml
index 1f9afb8..7f99d89 100644
--- a/src/app/views/deployments/launch_from_catalog.html.haml
+++ b/src/app/views/deployments/launch_from_catalog.html.haml
@@ -40,5 +40,5 @@
%td= link_to deployable.xml_filename, catalog_catalog_entry_path(deployable.catalogs.first, deployable.catalog_entries.first.id, :deployable_xml => true)
.align-center
- %div= will_paginate @catalog_entries
+ %div= will_paginate @deployables
%div= link_to t('cancel'), root_path, :class => 'button pill', :id => 'edit_button'
--
1.7.7.3
12 years, 3 months
[PATCH conductor] Fixes pool family detail, pools tab. Adds generic table instead of pool_families one
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/app/controllers/pool_families_controller.rb | 17 ++++++++++-
src/app/views/pool_families/_pools.html.haml | 37 +++++++---------------
src/app/views/pool_families/show.html.haml | 1 +
src/app/views/providers/edit.html.haml | 1 +
4 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/src/app/controllers/pool_families_controller.rb b/src/app/controllers/pool_families_controller.rb
index e1e7e07..a03d960 100644
--- a/src/app/controllers/pool_families_controller.rb
+++ b/src/app/controllers/pool_families_controller.rb
@@ -79,7 +79,6 @@ class PoolFamiliesController < ApplicationController
require_privilege(Privilege::VIEW, @pool_family)
load_pool_family_tabs
-
respond_to do |format|
format.html
format.js do
@@ -229,5 +228,21 @@ class PoolFamiliesController < ApplicationController
details_tab_name = params[:details_tab].blank? ? 'pools' : params[:details_tab]
@details_tab = @tabs.find {|t| t[:id] == details_tab_name} || @tabs.first[:name].downcase
@view = @details_tab[:view]
+
+ if @view == 'pools'
+ @pools_header = [
+ {:name => t("pool_families.index.pool_name"), :sortable => false},
+ {:name => t("pool_families.index.deployments"), :class => 'center', :sortable => false},
+ {:name => t("pool_families.index.total_instancies"), :class => 'center', :sortable => false},
+ {:name => t("pool_families.index.pending_instances"), :class => 'center', :sortable => false},
+ {:name => t("pool_families.index.failed_instances"), :class => 'center', :sortable => false},
+ {:name => t("pool_families.index.quota_used"), :class => 'center', :sortable => false},
+ {:name => t("pool_families.index.active_instances"), :class => 'center', :sortable => false},
+ {:name => t("pool_families.index.available_instances"), :class => 'center', :sortable => false},
+ {:name => t("pool_families.index.catalog"), :sortable => false},
+ {:name => '', :sortable => false}
+ ]
+ end
+
end
end
diff --git a/src/app/views/pool_families/_pools.html.haml b/src/app/views/pool_families/_pools.html.haml
index 948ccfd..50a8c00 100644
--- a/src/app/views/pool_families/_pools.html.haml
+++ b/src/app/views/pool_families/_pools.html.haml
@@ -1,25 +1,12 @@
-%table.pool_families
- - unless @pool_family.pools.blank?
- %tr
- %th= t("pool_families.index.pool_name")
- %th= t("pool_families.index.deployments")
- %th= t("pool_families.index.total_instancies")
- %th= t("pool_families.index.pending_instances")
- %th= t("pool_families.index.failed_instances")
- %th= t("pool_families.index.quota_used")
- %th= t("pool_families.index.active_instances")
- %th= t("pool_families.index.available_instances")
- %th= t("pool_families.index.catalog")
- %th
- - @pool_family.pools.each do |pool|
- %tr
- %td= link_to pool.name, pool
- %td= pool.deployments.count
- %td= pool.statistics[:total_instances]
- %td= pool.statistics[:instances_pending]
- %td= pool.statistics[:instances_failed]
- %td= pool.statistics[:quota_percent]
- %td= pool.statistics[:used_quota]
- %td= pool.statistics[:available_quota].nil? ? raw('∞') : pool.statistics[:available_quota]
- %td= link_to pool.catalogs.first.name, catalog_path(pool.catalogs.first) if pool.catalogs.any?
- %td= link_to t(:edit), edit_pool_path(pool), :class => 'rounded-link'
+= filter_table(@pools_header, @pool_family.pools) do |pool|
+ %tr{:class => cycle('nostripe','stripe')}
+ %td= link_to pool.name, pool
+ %td{:class => 'center'}= pool.deployments.count
+ %td{:class => 'center'}= pool.statistics[:total_instances]
+ %td{:class => 'center'}= pool.statistics[:instances_pending]
+ %td{:class => 'center'}= pool.statistics[:instances_failed]
+ %td{:class => 'center'}= pool.statistics[:quota_percent]
+ %td{:class => 'center'}= pool.statistics[:used_quota]
+ %td{:class => 'center'}= pool.statistics[:available_quota].nil? ? raw('∞') : pool.statistics[:available_quota]
+ %td= link_to pool.catalogs.first.name, catalog_path(pool.catalogs.first) if pool.catalogs.any?
+ %td= link_to t(:edit), edit_pool_path(pool), :class => 'rounded-link'
diff --git a/src/app/views/pool_families/show.html.haml b/src/app/views/pool_families/show.html.haml
index 8287e13..40fd972 100644
--- a/src/app/views/pool_families/show.html.haml
+++ b/src/app/views/pool_families/show.html.haml
@@ -17,5 +17,6 @@
= tab[:name]
-if tab[:count]
%span.label.badge.count.dark=tab[:count]
+ .clear
.content#tab
= render :partial => @view
diff --git a/src/app/views/providers/edit.html.haml b/src/app/views/providers/edit.html.haml
index f43931f..671aace 100644
--- a/src/app/views/providers/edit.html.haml
+++ b/src/app/views/providers/edit.html.haml
@@ -42,5 +42,6 @@
= link_to tab[:name], edit_provider_path(@provider, :details_tab => tab[:id], :only_tab => true), :id => "details_#{tab[:id]}", :class => "#{'active' if @details_tab[:id] == tab[:id]} show"
-if tab[:count]
%span.label.badge.count.dark=tab[:count]
+ .clear
.content#tab
= render :partial => @view
--
1.7.7.3
12 years, 3 months
[PATCH conductor] BZ744713 - changed font styles for catalog images
by Tomas Hrcka
---
src/app/stylesheets/custom.scss | 22 ++++++++++++++++++++++
src/app/views/pools/_images.html.haml | 31 +++++++++++++++----------------
2 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss
index 986f6f0..44112f5 100644
--- a/src/app/stylesheets/custom.scss
+++ b/src/app/stylesheets/custom.scss
@@ -345,4 +345,26 @@ section.admin-content-section.image-upload-overview {
padding-top: 2em;
margin: auto;
}
+}
+
+.catalog_deployments_and_images{
+ color: #606060;
+ position: relative;
+ h1{
+ font-size: 16px;
+ }
+ h2{
+ font-size: 12px;
+ padding-left: 10px;
+ padding-top: 10px;
+ }
+ h3{
+ font-size: 12px;
+ padding-left: 10px;
+ }
+ ul li{
+ padding-left: 10px;
+ padding-top:5px;
+ list-style-type: none;
+ }
}
\ No newline at end of file
diff --git a/src/app/views/pools/_images.html.haml b/src/app/views/pools/_images.html.haml
index d51d52e..7c30233 100644
--- a/src/app/views/pools/_images.html.haml
+++ b/src/app/views/pools/_images.html.haml
@@ -6,21 +6,20 @@
=flash[:error]
-else
- @map.each_pair do |catalog, deployables|
- %h1{:style => 'font-size: 18pt;'}
- = catalog.name
- = t('.catalog')
+ %div.catalog_deployments_and_images
+ %h1
+ = catalog.name
+ = t('.catalog')
+ - deployables.each_pair do |deployable, images|
+ %h2
+ = deployable.name
+ = t('.deployable')
- - deployables.each_pair do |deployable, images|
- %h2{:style => 'font-size: 16pt;'}
- = deployable.name
- = t('.deployable')
+ - images.each_pair do |image, provider_images|
+ %h3
+ = t('.image')
+ = "#{image.name} (#{image.uuid})"
- - images.each_pair do |image, provider_images|
- %h3{:style => 'font-size: 14pt;'}
- = t('.image')
- = "#{image.name} (#{image.uuid})"
-
- %ul
- - provider_images.each do |provider_image|
- %li
- = t('.pushed', :uuid => provider_image.uuid, :provider => provider_image.provider_name)
+ %ul
+ - provider_images.each do |provider_image|
+ %li= t('.pushed', :uuid => provider_image.uuid, :provider => provider_image.provider_name)
--
1.7.6.4
12 years, 3 months
[PATCH conductor] Launch deployment from the Deployable Details page
by Tomas Sedovic
From: Tomas Sedovic <tomas(a)sedovic.cz>
https://www.aeolusproject.org/redmine/issues/2856
---
src/app/views/catalog_entries/show.html.haml | 2 +-
src/features/catalog_entries.feature | 7 +++++++
src/features/support/paths.rb | 6 ++++++
3 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/app/views/catalog_entries/show.html.haml b/src/app/views/catalog_entries/show.html.haml
index 4df3f7c..5162796 100644
--- a/src/app/views/catalog_entries/show.html.haml
+++ b/src/app/views/catalog_entries/show.html.haml
@@ -6,7 +6,7 @@
= button_to t('catalog_entries.show.delete'), catalog_catalog_entry_path((a)catalog_entry.catalog, @catalog_entry), :method => 'delete', :confirm => "#{t'catalog_entries.show.confirm_delete'}", :class => 'button danger', :id => 'delete'
= link_to t('catalog_entries.show.edit'), edit_catalog_catalog_entry_path((a)catalog_entry.catalog, @catalog_entry), :class => 'button', :id => 'edit_button'
- = link_to t('deployments.overview.launch'), '#'
+ = link_to t('deployments.overview.launch'), launch_new_deployments_path(:deployable_id => @catalog_entry.deployable.id, :pool_id => @catalog_entry.catalog.pool), :id => :launch_deployment
%section.admin-content-section.deployable
%section.image
diff --git a/src/features/catalog_entries.feature b/src/features/catalog_entries.feature
index f6d9914..187122e 100644
--- a/src/features/catalog_entries.feature
+++ b/src/features/catalog_entries.feature
@@ -42,6 +42,13 @@ Feature: Manage Catalog Entries
And I should see "Catalogs"
And I should see "Roles"
+ Scenario: Launch a deployment
+ Given there is a "default" catalog
+ And a catalog entry "testdepl" exists
+ And I am on testdepl's catalog entry page
+ When I follow "launch_deployment"
+ Then I should be on the launch new deployments page
+
Scenario: Delete deployables
Given there is a "default" catalog
And a catalog entry "testdepl1" exists for "default" catalog
diff --git a/src/features/support/paths.rb b/src/features/support/paths.rb
index 4137456..31d073b 100644
--- a/src/features/support/paths.rb
+++ b/src/features/support/paths.rb
@@ -26,6 +26,12 @@ module NavigationHelpers
when /^(.*)'s realm page$/i
realm_path(FrontendRealm.find_by_name($1))
+ when /^(.*)'s catalog entry page$/i
+ deployable = Deployable.find_by_name($1)
+ catalog_entry = deployable.catalog_entries.first
+ catalog = catalog_entry.catalog
+ catalog_catalog_entry_path(catalog, catalog_entry)
+
when /the account page/
account_path
--
1.7.6.4
12 years, 3 months
don't found aeolus-images
by Julio Alberto Carrillo
Hi,
i don't find aeolus-images, in the wiki explain use aeolus-image, but in
package aeolus-all 0.7 don't exist.
where i find information about this change?
Thanks
Julio
12 years, 3 months