[PATCH imagefactory-console] Fix spec to reflect correct ordering of extra_release and dist strings
by steve linabery
To match Fedora package naming guidelines.
---
rubygem-imagefactory-console.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rubygem-imagefactory-console.spec b/rubygem-imagefactory-console.spec
index 733bd94..df7694c 100644
--- a/rubygem-imagefactory-console.spec
+++ b/rubygem-imagefactory-console.spec
@@ -7,7 +7,7 @@
Summary: QMF Console for Aeolus Image Factory
Name: rubygem-%{gemname}
Version: 0.5.0
-Release: 4%{?dist}%{?extra_release}
+Release: 4%{?extra_release}%{?dist}
Group: Development/Languages
License: GPLv2+ or Ruby
URL: http://aeolusproject.org
--
1.7.4.4
12 years, 8 months
[PATCH aeolus-image] Fix spec to reflect correct ordering of extra_release and dist strings
by steve linabery
To match Fedora package naming guidelines.
---
rubygem-aeolus-image.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rubygem-aeolus-image.spec b/rubygem-aeolus-image.spec
index d782765..733a836 100644
--- a/rubygem-aeolus-image.spec
+++ b/rubygem-aeolus-image.spec
@@ -7,7 +7,7 @@
Summary: Command-line interface for working with the Aeolus cloud suite
Name: rubygem-aeolus-image
Version: 0.1.0
-Release: 3%{?dist}%{?extra_release}
+Release: 3%{?extra_release}%{?dist}
Group: Development/Languages
License: GPLv2+ or Ruby
URL: http://aeolusproject.org
--
1.7.4.4
12 years, 8 months
CDL format documentation
by Lukas Zapletal
Hello,
I have started designing katello interface that will return katello
templates in CDL format and would like to ask for more information about
CDL.
I am particularly interested in all the tags that can appear in the XML
document. Also all possible values that are currently accepted is a must
for me - e.g. os tag (which operating system and version combinations
are supported atm).
I already found few exampled which gave me pretty nice overview how it
looks like:
<template>
<name>f13 jeos</name>
<os name="fedora" version="13"/>
<description>Fedora 13</description>
<repos>
<repo>http://repo.oddthesis.org/cirras/packages/fedora/13/RPMS/noarch/</repo>
</repos>
<packages>
<packagegroup>core</packagegroup>
<package><name>bash</name></package>
<package><name>kernel</name></package>
<package><name>grub</name></package>
</packages>
</template>
Let me describe current template in Katello. We associate template with
environment first, then users are able to add content to it (only using
CLI atm - no support in the UI):
- products (= 1 or more repositories)
- package (no package group support yet)
- erratum
- parameter
- foreman host group (not done yet - puppet classes definitions)
- parameters (for puppet classes)
Looking on the example above I have a nice match here:
CDL vs Katello
name = template name
description = description
os = product info
repos = products
packages = packages
package group = n/a
I guess we have all required information to build image template from
Katello, skipping package groups (we can add them later).
Opinions?
--
Later,
Lukas Zapletal | E32E400A
RHN Satellite Engineering
Red Hat Czech s.r.o. Brno
12 years, 8 months
[PATCH conductor] Keep instance key dld link on Backbone refresh
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
---
src/app/models/instance.rb | 5 +++++
src/app/views/deployments/_pretty_view_show.haml | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index 5b69717..b682c06 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
@@ -361,11 +361,16 @@ class Instance < ActiveRecord::Base
{:include => :hardware_profile}
}
+ def instance_key_path
+ Rails.application.routes.url_helpers.key_instance_path(self) if instance_key
+ end
+
def as_json(options={})
super(options).merge({
:owner => owner.name,
:provider => provider_account ? provider_account.provider.name : '',
:href => Rails.application.routes.url_helpers.instance_path(id),
+ :instance_key_path => instance_key_path,
})
end
diff --git a/src/app/views/deployments/_pretty_view_show.haml b/src/app/views/deployments/_pretty_view_show.haml
index c849622..4f7fe6a 100644
--- a/src/app/views/deployments/_pretty_view_show.haml
+++ b/src/app/views/deployments/_pretty_view_show.haml
@@ -11,9 +11,9 @@
%li
State:
= instance.state
- - if instance.instance_key
+ - if instance.instance_key_path
%li
- = link_to("Download key", key_instance_path(instance))
+ = link_to("Download key", instance.instance_key_path)
:javascript
Conductor.setupPrettyFilterURL(
@@ -26,5 +26,8 @@
<ul>
<li>IP Address: ${public_addresses}</li>
<li>State: ${state}</li>
+ {{if instance_key_path}}
+ <li><a href="${instance_key_path}">Download key</a></li>
+ {{/if}}
</ul>
</li>
--
1.7.6
12 years, 8 months
Piece on RESTful API Design
by Geert Jansen
Hi,
i wanted to do this for a long time, and finally got it it. See the link
below for an essay on RESTful API design, based on lessons learnt from
rhevm-api project:
http://readthedocs.org/docs/restful-api-design/en/latest/
From the intro: "This is essay is an attempt to put down my thoughts on
how to design a real-world yet beautiful RESTful API." It goes into such
topics as JSON vs XML, why not XMLSchema, creating CLIs, and more.
Mark, it also contains a worked out version of your idea to use forms
for describing inputs.
Feedback is welcome!
Regards,
Geert
12 years, 8 months
provider account fix
by Jan Provazník
Even with html_safe provider account xml output was wrong - there were whitespaces
in x509 certificate and imagefactory failed with error:
Traceback (most recent call last):
File "/usr/bin/euca-bundle-vol", line 492, in <module>
main()
File "/usr/bin/euca-bundle-vol", line 467, in main
ancestor_ami_ids,
File "/usr/lib/python2.7/site-packages/euca2ools/__init__.py", line 994, in generate_manifest
user_pub_key = X509.load_cert(cert_path).get_pubkey().get_rsa()
File "/usr/lib64/python2.7/site-packages/M2Crypto/X509.py", line 611, in load_cert
return load_cert_bio(bio)
File "/usr/lib64/python2.7/site-packages/M2Crypto/X509.py", line 639, in load_cert_bio
raise X509Error(Err.get_error())
This patch is quite dirty, I'm sure there is a nice way how to tweak rails' 'to_xml' method or
use xml builder template but I didn't find a way how to use it properly.
12 years, 8 months
[PATCH imagefactory] small fix to rackspace credentials
by Mo Morsi
---
imgfac/builders/Fedora_rackspace_Builder.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/imgfac/builders/Fedora_rackspace_Builder.py b/imgfac/builders/Fedora_rackspace_Builder.py
index b2a29eb..93bfcf9 100644
--- a/imgfac/builders/Fedora_rackspace_Builder.py
+++ b/imgfac/builders/Fedora_rackspace_Builder.py
@@ -106,7 +106,7 @@ class Fedora_rackspace_Builder(BaseBuilder):
doc = libxml2.parseDoc(credentials)
rack_username = doc.xpathEval("//provider_credentials/rackspace_credentials/username")[0].content
- rack_access_key = doc.xpathEval("//provider_credentials/rackspace_credentials/access_key")[0].content
+ rack_access_key = doc.xpathEval("//provider_credentials/rackspace_credentials/password")[0].content
cloudservers = CloudServers(rack_username, rack_access_key)
cloudservers.authenticate()
--
1.7.4.4
12 years, 8 months
[PATCH conductor] Add BuildRequires for compass and compass-960 plugin.
by steve linabery
---
aeolus-conductor.spec.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index 8c5686f..c171472 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -45,6 +45,9 @@ Requires: ruby-postgres
# and is accessible in the init script
Requires: curl
+BuildRequires: rubygem(compass) >= 0.10.2
+BuildRequires: rubygem(compass-960-plugin)
+
BuildArch: noarch
%description
--
1.7.4.4
12 years, 8 months
[PATCH conductor] Registration service spec Fix
by Tomas Hrcka
---
src/spec/services/registration_service_spec.rb | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/spec/services/registration_service_spec.rb b/src/spec/services/registration_service_spec.rb
index 17d0cf2..d3627f8 100644
--- a/src/spec/services/registration_service_spec.rb
+++ b/src/spec/services/registration_service_spec.rb
@@ -42,11 +42,8 @@ describe RegistrationService do
describe "with quota" do
it "passed via nested attributes to user model" do
- user_attributes = Factory.attributes_for(:user)
- user_attributes[:quota_attributes] = {}
- user_attributes[:quota_attributes][:maximum_running_instances] = 2
- user_attributes[:quota_attributes][:maximum_total_instances] = 5
- user = User.new(user_attributes)
+ user = Factory.build(:user)
+ user.quota = Quota.new(:maximum_running_instances => 2, :maximum_total_instances => 5)
registration_process = RegistrationService.new(user)
lambda do
--
1.7.6
12 years, 8 months
[PATCH configure] aeolus-cleanup - Correct path to aeolus.pp
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
---
bin/aeolus-cleanup | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/aeolus-cleanup b/bin/aeolus-cleanup
index 8e3abcd..23a7b95 100644
--- a/bin/aeolus-cleanup
+++ b/bin/aeolus-cleanup
@@ -35,7 +35,7 @@ PUPPET_NODE='cleanup'
export FACTER_AEOLUS_ENABLE_HTTPS=true
export FACTER_AEOLUS_ENABLE_SECURITY=false
-puppet /usr/share/aeolus-configure/aeolus.pp \
+puppet /usr/share/aeolus-configure/modules/aeolus/aeolus.pp \
--modulepath=/usr/share/aeolus-configure/modules/ \
--external_nodes "/usr/sbin/aeolus-node $PUPPET_NODE" --node_terminus exec \
--logdest=/var/log/aeolus-configure/aeolus-cleanup.log \
--
1.7.6
12 years, 8 months
