[PATCH] Remove escaping from keypair.
by Ian Main
Keypair no longer needs to be escaped because it is on its own classad
line now.
Signed-off-by: Ian Main <imain(a)redhat.com>
---
src/app/util/condormatic.rb | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index a129d06..1de5c29 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -20,11 +20,6 @@
require 'nokogiri'
require 'socket'
-def escape(str)
- str = str.gsub('\\', '\\\\')
- str = str.gsub(' ', '\\ ')
-end
-
def condormatic_instance_create(task)
begin
@@ -251,7 +246,7 @@ def condormatic_classads_sync
pipe.puts "username=\"#{account.username}\""
pipe.puts "password=\"#{account.password}\""
pipe.puts "provider_account_id=\"#{account.id}\""
- pipe.puts "keypair=\"#{escape(account.instance_key.name)}\""
+ pipe.puts "keypair=\"#{account.instance_key.name}\""
rescue Exception => ex
Rails.logger.error "Error writing provider classad to condor."
Rails.logger.error ex.message
--
1.7.4
13 years, 1 month
Added Annotations: Please keep up to date!!
by Martyn Taylor
Gentlemen,
We've added model annotations to the project, basically adding annotations at the top of each model displaying information on the models fields. This makes dev a little easier and makes the models much more transparent.
The annotations *MUST to be kept up to date, so if anyone updates the schema in anyway please annotate accordingly.
You will need to install this gem: annotate-models - gem install annotate-models
To add/remove annotations, navigate to the root dir of the project and run:
annotate (to add)
annotate -d (to remove)
http://annotate-models.rubyforge.org/
Thanks
Martyn
13 years, 1 month
[PATCH configure] For RHEL, point to RHEL 6 repos
by Mo Morsi
slight reworking of morazi's original patch
---
recipes/deltacloud_recipe/manifests/deltacloud.pp | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/recipes/deltacloud_recipe/manifests/deltacloud.pp b/recipes/deltacloud_recipe/manifests/deltacloud.pp
index 4c6cdb6..bfb6183 100644
--- a/recipes/deltacloud_recipe/manifests/deltacloud.pp
+++ b/recipes/deltacloud_recipe/manifests/deltacloud.pp
@@ -28,20 +28,29 @@ if $aeolus_enable_packages == "true" or $aeolus_enable_packages == "1" {
# Base deltacloud class
class deltacloud {
+ # TODO: Don't hardcode these repos to RHEL-6
+ # The issue is that $releasever resolves to something like 6Server
+ # so we either need to have a repo per RHEL variant, or we need
+ # to have smarter logic here
+ $base_url_release = $operatingsystem ? { 'fedora' => "fedora-\$releasever",
+ 'redhat' => 'rhel-6' }
+ $pulp_base_url_release = $operatingsystem ? { 'fedora' => "fedora-13",
+ 'redhat' => 'rhel5' }
+
# Setup repos which to pull deltacloud components
yumrepo{"${name}_arch":
name => "${name}_arch",
descr => "${name}_arch",
- baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/$b...',
+ baseurl => "http://repos.fedorapeople.org/repos/aeolus/packages/${base_url_release}/\...",
enabled => 1, gpgcheck => 0}
yumrepo{"${name}_noarch":
name => "${name}_noarch",
descr => "${name}_noarch",
- baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/no...',
+ baseurl => "http://repos.fedorapeople.org/repos/aeolus/packages/${base_url_release}/n...",
enabled => 1, gpgcheck => 0}
yumrepo{"${name}_pulp":
name => "${name}_pulp",
descr => "${name}_pulp",
- baseurl => 'http://repos.fedorapeople.org/repos/pulp/pulp/fedora-13/$basearch/',
+ baseurl => "http://repos.fedorapeople.org/repos/pulp/pulp/${pulp_base_url_release}/\$...",
enabled => 1, gpgcheck => 0}
}
--
1.7.2.3
13 years, 1 month
aeolus .repo file on rhel6 deltacloud-configure
by James Labocki
I'm having an issue installing aeolus on rhel6-64 and was hoping someone could help.
It appears that when I execute `/usr/sbin/deltacloud-configure` it creates:
/etc/yum.repos.d/[deltacloud_arch|deltacloud_noarch|deltacloud_pulp].repo
The problem is that the contents of the .repo files point to the fedora release instead of rhel:
baseurl=http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$relea...
When I change it manually running `/usr/bin/deltacloud-configure` squashes my changes. What is the proper way to get this fixed? What manifest can I change?
-James
13 years, 1 month
Added annotation to models
by Martyn Taylor
So we discussed this presiously halfway through a sprint. Since it was going to cause conflicts with almost everyones patches, thought it to be best to get this in, at the end beginning of a sprint.
For more information please see mail sent to the list on: 21st Jan, subject: Conductor Model Annotation
Thanks
Martyn
13 years, 1 month
[PATCH configure] run 'rake dc:prepare_repos' during configure process
by Mo Morsi
---
recipes/deltacloud_recipe/manifests/aggregator.pp | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/recipes/deltacloud_recipe/manifests/aggregator.pp b/recipes/deltacloud_recipe/manifests/aggregator.pp
index 9c3e2ff..a8147be 100644
--- a/recipes/deltacloud_recipe/manifests/aggregator.pp
+++ b/recipes/deltacloud_recipe/manifests/aggregator.pp
@@ -100,6 +100,14 @@ class deltacloud::aggregator inherits deltacloud {
rails_env => "production",
require => Rails::Migrate::Db[migrate_deltacloud_database]}
+ ### Prepare the image package repositories
+ exec{"dc_prepare_repos":
+ cwd => '/usr/share/deltacloud-aggregator',
+ environment => "RAILS_ENV=production",
+ command => "/usr/bin/rake dc:prepare_repos",
+ logoutput => true,
+ require => Package['deltacloud-aggregator'] }
+
### Setup/start solr search service
file{"/etc/init.d/solr":
--
1.7.2.3
13 years, 1 month
[PATCH configure 1/1] For RHEL, point to RHEL 6 repos
by Mike Orazi
---
recipes/deltacloud_recipe/manifests/deltacloud.pp | 59 +++++++++++++++------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/recipes/deltacloud_recipe/manifests/deltacloud.pp b/recipes/deltacloud_recipe/manifests/deltacloud.pp
index 4c6cdb6..b7cd04a 100644
--- a/recipes/deltacloud_recipe/manifests/deltacloud.pp
+++ b/recipes/deltacloud_recipe/manifests/deltacloud.pp
@@ -28,20 +28,47 @@ if $aeolus_enable_packages == "true" or $aeolus_enable_packages == "1" {
# Base deltacloud class
class deltacloud {
- # Setup repos which to pull deltacloud components
- yumrepo{"${name}_arch":
- name => "${name}_arch",
- descr => "${name}_arch",
- baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/$b...',
- enabled => 1, gpgcheck => 0}
- yumrepo{"${name}_noarch":
- name => "${name}_noarch",
- descr => "${name}_noarch",
- baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/no...',
- enabled => 1, gpgcheck => 0}
- yumrepo{"${name}_pulp":
- name => "${name}_pulp",
- descr => "${name}_pulp",
- baseurl => 'http://repos.fedorapeople.org/repos/pulp/pulp/fedora-13/$basearch/',
- enabled => 1, gpgcheck => 0}
+ case $operatingsystem {
+ fedora: {
+ # Setup repos which to pull deltacloud components
+ yumrepo{"${name}_arch":
+ name => "${name}_arch",
+ descr => "${name}_arch",
+ baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/$b...',
+ enabled => 1, gpgcheck => 0}
+ yumrepo{"${name}_noarch":
+ name => "${name}_noarch",
+ descr => "${name}_noarch",
+ baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/no...',
+ enabled => 1, gpgcheck => 0}
+ yumrepo{"${name}_pulp":
+ name => "${name}_pulp",
+ descr => "${name}_pulp",
+ baseurl => 'http://repos.fedorapeople.org/repos/pulp/pulp/fedora-13/$basearch/',
+ enabled => 1, gpgcheck => 0}
+ }
+ # TODO: Don't hardcode these repos to RHEL-6
+ # The issue is that $releasever resolves to something like 6Server
+ # so we either need to have a repo per RHEL variant, or we need
+ # to have smarter logic here
+ redhat: {
+ # Setup repos which to pull deltacloud components
+ yumrepo{"${name}_arch":
+ name => "${name}_arch",
+ descr => "${name}_arch",
+ baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/rhel-6/$basearch',
+ enabled => 1, gpgcheck => 0}
+ yumrepo{"${name}_noarch":
+ name => "${name}_noarch",
+ descr => "${name}_noarch",
+ baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/rhel-6/noarch',
+ enabled => 1, gpgcheck => 0}
+ yumrepo{"${name}_pulp":
+ name => "${name}_pulp",
+ descr => "${name}_pulp",
+ baseurl => 'http://repos.fedorapeople.org/repos/pulp/pulp/rhel5/$basearch/',
+ enabled => 1, gpgcheck => 0}
+ }
+ }
}
+
--
1.7.4
13 years, 1 month
[PATCH configure 1/1] For RHEL, point to RHEL 6 repos
by Mike Orazi
---
contrib/deltacloud-configure.spec | 1 +
recipes/deltacloud_recipe/manifests/deltacloud.pp | 59 +++++++++++++++------
2 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/contrib/deltacloud-configure.spec b/contrib/deltacloud-configure.spec
index b8e5a4a..77eb420 100644
--- a/contrib/deltacloud-configure.spec
+++ b/contrib/deltacloud-configure.spec
@@ -82,3 +82,4 @@ rm -rf %{buildroot}
* Thu Sep 02 2010 Mohammed Morsi <mmorsi(a)redhat.com> 0.0.1-1
- Initial package
+
diff --git a/recipes/deltacloud_recipe/manifests/deltacloud.pp b/recipes/deltacloud_recipe/manifests/deltacloud.pp
index 4c6cdb6..b7cd04a 100644
--- a/recipes/deltacloud_recipe/manifests/deltacloud.pp
+++ b/recipes/deltacloud_recipe/manifests/deltacloud.pp
@@ -28,20 +28,47 @@ if $aeolus_enable_packages == "true" or $aeolus_enable_packages == "1" {
# Base deltacloud class
class deltacloud {
- # Setup repos which to pull deltacloud components
- yumrepo{"${name}_arch":
- name => "${name}_arch",
- descr => "${name}_arch",
- baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/$b...',
- enabled => 1, gpgcheck => 0}
- yumrepo{"${name}_noarch":
- name => "${name}_noarch",
- descr => "${name}_noarch",
- baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/no...',
- enabled => 1, gpgcheck => 0}
- yumrepo{"${name}_pulp":
- name => "${name}_pulp",
- descr => "${name}_pulp",
- baseurl => 'http://repos.fedorapeople.org/repos/pulp/pulp/fedora-13/$basearch/',
- enabled => 1, gpgcheck => 0}
+ case $operatingsystem {
+ fedora: {
+ # Setup repos which to pull deltacloud components
+ yumrepo{"${name}_arch":
+ name => "${name}_arch",
+ descr => "${name}_arch",
+ baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/$b...',
+ enabled => 1, gpgcheck => 0}
+ yumrepo{"${name}_noarch":
+ name => "${name}_noarch",
+ descr => "${name}_noarch",
+ baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/no...',
+ enabled => 1, gpgcheck => 0}
+ yumrepo{"${name}_pulp":
+ name => "${name}_pulp",
+ descr => "${name}_pulp",
+ baseurl => 'http://repos.fedorapeople.org/repos/pulp/pulp/fedora-13/$basearch/',
+ enabled => 1, gpgcheck => 0}
+ }
+ # TODO: Don't hardcode these repos to RHEL-6
+ # The issue is that $releasever resolves to something like 6Server
+ # so we either need to have a repo per RHEL variant, or we need
+ # to have smarter logic here
+ redhat: {
+ # Setup repos which to pull deltacloud components
+ yumrepo{"${name}_arch":
+ name => "${name}_arch",
+ descr => "${name}_arch",
+ baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/rhel-6/$basearch',
+ enabled => 1, gpgcheck => 0}
+ yumrepo{"${name}_noarch":
+ name => "${name}_noarch",
+ descr => "${name}_noarch",
+ baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/rhel-6/noarch',
+ enabled => 1, gpgcheck => 0}
+ yumrepo{"${name}_pulp":
+ name => "${name}_pulp",
+ descr => "${name}_pulp",
+ baseurl => 'http://repos.fedorapeople.org/repos/pulp/pulp/rhel5/$basearch/',
+ enabled => 1, gpgcheck => 0}
+ }
+ }
}
+
--
1.7.4
13 years, 1 month
[PATCH configure 1/1] Remove ec2-ami-tools. Boxgrinder brings in euca2ools now.
by Mike Orazi
---
.../deltacloud_recipe/manifests/image-factory.pp | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/recipes/deltacloud_recipe/manifests/image-factory.pp b/recipes/deltacloud_recipe/manifests/image-factory.pp
index 6d4be23..c937f66 100644
--- a/recipes/deltacloud_recipe/manifests/image-factory.pp
+++ b/recipes/deltacloud_recipe/manifests/image-factory.pp
@@ -4,14 +4,9 @@ class deltacloud::image-factory inherits deltacloud {
# TODO: Fix me, find a better way to do this...
# We need to also install this rpm from amazon
if $enable_packages {
- package{"ec2-ami-tools":
- provider => "rpm",
- source => "http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.noarch.rpm",
- ensure => 'installed' }
-
package { 'rubygem-deltacloud-image-builder-agent':
provider => 'yum', ensure => 'installed',
- require => [Package['ec2-ami-tools'], Yumrepo['deltacloud_arch', 'deltacloud_noarch']]}
+ require => [Yumrepo['deltacloud_arch', 'deltacloud_noarch']]}
}
--
1.7.4
13 years, 1 month
[PATCH configure] install rubygem-aws dependency for ec2 support in core
by Mo Morsi
---
recipes/deltacloud_recipe/manifests/core.pp | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/recipes/deltacloud_recipe/manifests/core.pp b/recipes/deltacloud_recipe/manifests/core.pp
index 471279d..11c2df1 100644
--- a/recipes/deltacloud_recipe/manifests/core.pp
+++ b/recipes/deltacloud_recipe/manifests/core.pp
@@ -5,6 +5,12 @@ class deltacloud::core inherits deltacloud {
if $enable_packages {
package { 'rubygem-deltacloud-core':
provider => 'yum', ensure => 'installed', require => Yumrepo['deltacloud_arch', 'deltacloud_noarch']}
+
+
+ # install ec2 support,
+ # TODO eventually we should prompt the user to select which drivers they want to install
+ package { "rubygem-aws":
+ provider => 'yum', ensure => 'installed' }
}
file { "/var/log/deltacloud-core": ensure => 'directory' }
@@ -18,7 +24,7 @@ class deltacloud::core inherits deltacloud {
service { 'deltacloud-core':
ensure => 'running',
enable => true,
- require => [return_if($enable_packages, Package['rubygem-deltacloud-core']),
+ require => [return_if($enable_packages, Package['rubygem-deltacloud-core', 'rubygem-aws']),
File['/etc/init.d/deltacloud-core', '/var/log/deltacloud-core']] }
}
@@ -28,6 +34,9 @@ class deltacloud::core::disabled {
package { 'rubygem-deltacloud-core':
provider => 'yum', ensure => 'absent',
require => Service['deltacloud-core']}
+ package { "rubygem-aws":
+ provider => 'yum', ensure => 'absent',
+ require => Service['deltacloud-core']}
}
### Stop the deltacloud services
--
1.7.2.3
13 years, 1 month