[PATCH configure] Remove old deltacloud-<provider> init files
by Richard Su
Subject line correction.
aeolus-cleanup does clean them up. But if you upgraded to a version of aeolus-configure
that supported single deltacloud-core without running aeolus-cleanup, then these
init files will remain in /etc/init.d.
---
recipes/aeolus/manifests/deltacloud.pp | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/recipes/aeolus/manifests/deltacloud.pp b/recipes/aeolus/manifests/deltacloud.pp
index 87b5905..cb442d1 100644
--- a/recipes/aeolus/manifests/deltacloud.pp
+++ b/recipes/aeolus/manifests/deltacloud.pp
@@ -56,4 +56,11 @@ class aeolus::deltacloud::disabled {
ensure => 'stopped',
enable => false,
hasstatus => true}
+
+ # remove deprecated services
+ file { '/etc/init.d/deltacloud-ec2-us-east-1': ensure => 'absent' }
+ file { '/etc/init.d/deltacloud-ec2-us-west-1': ensure => 'absent' }
+ file { '/etc/init.d/deltacloud-mock': ensure => 'absent' }
+ file { '/etc/init.d/deltacloud-rhevm': ensure => 'absent' }
+ file { '/etc/init.d/deltacloud-vsphere': ensure => 'absent' }
}
--
1.7.6
12 years, 7 months
[PATCH configure] Remove old deltacloud-core-<provider> init files
by Richard Su
aeolus-cleanup does clean them up. But if you upgraded to a version of aeolus-configure
that supported single deltacloud-core without running aeolus-cleanup, then these
init files will remain in /etc/init.d.
---
recipes/aeolus/manifests/deltacloud.pp | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/recipes/aeolus/manifests/deltacloud.pp b/recipes/aeolus/manifests/deltacloud.pp
index 87b5905..cb442d1 100644
--- a/recipes/aeolus/manifests/deltacloud.pp
+++ b/recipes/aeolus/manifests/deltacloud.pp
@@ -56,4 +56,11 @@ class aeolus::deltacloud::disabled {
ensure => 'stopped',
enable => false,
hasstatus => true}
+
+ # remove deprecated services
+ file { '/etc/init.d/deltacloud-ec2-us-east-1': ensure => 'absent' }
+ file { '/etc/init.d/deltacloud-ec2-us-west-1': ensure => 'absent' }
+ file { '/etc/init.d/deltacloud-mock': ensure => 'absent' }
+ file { '/etc/init.d/deltacloud-rhevm': ensure => 'absent' }
+ file { '/etc/init.d/deltacloud-vsphere': ensure => 'absent' }
}
--
1.7.6
12 years, 7 months
weekly bug reports
by wes hayutin
Hey all,
I wrote a quick python scripts to send each dev and qe person a list of
bugs assigned to them. The hope here is to help you keep track of whats
on your plate. I've been asked several times for links to bugs, so
hopefully this will help.
You will surely get some bugs that you think are invalid, or there is
not enough information, or the bug is just plain old. If you disagree
with the bug as it stands, it is perfectly valid to move the bug to
on_qa with your comments why you are doing so.
I'm positive we can get the queue down, there are a lot of bugs there
that just need a dev to confirm that is fixed or invalid. Angus, Mike
and I dont always have enough information to close out bugs, this will
help us a lot.
The current plan is to send this out every week, which can be adjusted
if its too often.
Thank you for your time!!
Your friendly neighborhood QE
12 years, 7 months
[PATCH configure 2/2] BZ 739091 - ability to run multiple profiles in a single execution
by Richard Su
Use a comma to specify multiple profiles to -p.
Example: aeolus-configure -p rhevm,vsphere,ec2
---
bin/aeolus-configure | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/bin/aeolus-configure b/bin/aeolus-configure
index 3786270..40722e4 100644
--- a/bin/aeolus-configure
+++ b/bin/aeolus-configure
@@ -67,9 +67,14 @@ echo "Launching aeolus configuration recipe..."
export FACTER_AEOLUS_ENABLE_HTTPS=true
export FACTER_AEOLUS_ENABLE_SECURITY=false
-puppet /usr/share/aeolus-configure/modules/aeolus/aeolus.pp \
+
+NODE_ARRAY=(`echo $PUPPET_NODE | tr "," "\n"`)
+for x in "${NODE_ARRAY[@]}"
+do
+ 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 \
+ --external_nodes "/usr/sbin/aeolus-node $x" --node_terminus exec \
--logdest=/var/log/aeolus-configure/aeolus-configure.log \
--logdest=console \
$LOGLEVEL
+done
\ No newline at end of file
--
1.7.6
12 years, 7 months
[PATCH configure 1/2] Move ec2 and mock out of default configure and into their own profiles
by Richard Su
Their profiles are activated by running "aeolus-configure -p ec2" and
"aeolus-configure -p mock".
Make hwp1 more generic to support existing providers plus rackspace.
Ensure all provider profiles create a default bucket.
Remove whitespaces.
---
conf/ec2 | 13 ++++++
conf/mock | 12 ++++++
recipes/aeolus/manifests/profiles/default.pp | 46 +----------------------
recipes/aeolus/manifests/profiles/ec2.pp | 52 ++++++++++++++++++++++++++
recipes/aeolus/manifests/profiles/mock.pp | 51 +++++++++++++++++++++++++
recipes/aeolus/manifests/profiles/rhevm.pp | 7 ++-
recipes/aeolus/manifests/profiles/vsphere.pp | 6 +-
7 files changed, 137 insertions(+), 50 deletions(-)
create mode 100644 conf/ec2
create mode 100644 conf/mock
create mode 100644 recipes/aeolus/manifests/profiles/ec2.pp
create mode 100644 recipes/aeolus/manifests/profiles/mock.pp
diff --git a/conf/ec2 b/conf/ec2
new file mode 100644
index 0000000..142887f
--- /dev/null
+++ b/conf/ec2
@@ -0,0 +1,13 @@
+# ec2 setup configuration.
+---
+parameters:
+ enable_https: true
+ enable_security: false
+ package_provider: rpm
+classes:
+- aeolus::conductor
+- aeolus::image-factory
+- aeolus::iwhd
+- aeolus::deltacloud::core
+- aeolus::deltacloud::ec2
+- aeolus::profiles::ec2
diff --git a/conf/mock b/conf/mock
new file mode 100644
index 0000000..087c329
--- /dev/null
+++ b/conf/mock
@@ -0,0 +1,12 @@
+# mock setup configuration.
+---
+parameters:
+ enable_https: true
+ enable_security: false
+ package_provider: rpm
+classes:
+- aeolus::conductor
+- aeolus::image-factory
+- aeolus::iwhd
+- aeolus::deltacloud::core
+- aeolus::profiles::mock
diff --git a/recipes/aeolus/manifests/profiles/default.pp b/recipes/aeolus/manifests/profiles/default.pp
index 8bbfb7f..20b5072 100644
--- a/recipes/aeolus/manifests/profiles/default.pp
+++ b/recipes/aeolus/manifests/profiles/default.pp
@@ -13,7 +13,6 @@
# limitations under the License.
class aeolus::profiles::default {
- include aeolus::deltacloud::ec2
aeolus::create_bucket{"aeolus":}
@@ -26,48 +25,7 @@ class aeolus::profiles::default {
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
- aeolus::conductor::provider{"mock":
- deltacloud_driver => 'mock',
- url => 'http://localhost:3002/api',
- require => Aeolus::Conductor::Login["admin"] }
-
- aeolus::conductor::provider::account{"mockuser":
- provider => 'mock',
- type => 'mock',
- username => 'mockuser',
- password => 'mockpassword',
- require => Aeolus::Conductor::Provider["mock"] }
-
- aeolus::conductor::provider{"ec2-us-east-1":
- deltacloud_driver => 'ec2',
- deltacloud_provider => 'us-east-1',
- url => 'http://localhost:3002/api',
- require => Aeolus::Conductor::Login["admin"] }
-
- aeolus::conductor::provider{"ec2-us-west-1":
- deltacloud_driver => 'ec2',
- deltacloud_provider => 'us-west-1',
- url => 'http://localhost:3002/api',
- require => Aeolus::Conductor::Login["admin"] }
-
- aeolus::conductor::hwp{"hwp1":
- memory => "512",
- cpu => "1",
- storage => "",
- architecture => "x86_64",
- require => Aeolus::Conductor::Login["admin"] }
-
- aeolus::conductor::hwp{"hwp2":
- memory => "1",
- cpu => "",
- storage => "1",
- architecture => "x86_64",
- require => Aeolus::Conductor::Login["admin"] }
-
aeolus::conductor::logout{"admin":
- require => [Aeolus::Conductor::Provider['mock'],
- Aeolus::Conductor::Provider::Account['mockuser'],
- Aeolus::Conductor::Provider['ec2-us-east-1'],
- Aeolus::Conductor::Provider['ec2-us-west-1'],
- Aeolus::Conductor::Hwp['hwp1', 'hwp2']] }
+ require => Aeolus::Conductor::Login['admin'] }
+
}
diff --git a/recipes/aeolus/manifests/profiles/ec2.pp b/recipes/aeolus/manifests/profiles/ec2.pp
new file mode 100644
index 0000000..e577dfe
--- /dev/null
+++ b/recipes/aeolus/manifests/profiles/ec2.pp
@@ -0,0 +1,52 @@
+# Copyright 2011 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class aeolus::profiles::ec2 {
+ include aeolus::deltacloud::ec2
+
+ aeolus::create_bucket{"aeolus":}
+
+ aeolus::conductor::site_admin{"admin":
+ email => 'dcuser(a)aeolusproject.org',
+ password => "password",
+ first_name => 'aeolus',
+ last_name => 'user'}
+
+ aeolus::conductor::login{"admin": password => "password",
+ require => Aeolus::Conductor::Site_admin['admin']}
+
+ aeolus::conductor::provider{"ec2-us-east-1":
+ deltacloud_driver => 'ec2',
+ deltacloud_provider => 'us-east-1',
+ url => 'http://localhost:3002/api',
+ require => Aeolus::Conductor::Login["admin"] }
+
+ aeolus::conductor::provider{"ec2-us-west-1":
+ deltacloud_driver => 'ec2',
+ deltacloud_provider => 'us-west-1',
+ url => 'http://localhost:3002/api',
+ require => Aeolus::Conductor::Login["admin"] }
+
+ aeolus::conductor::hwp{"hwp1":
+ memory => "512",
+ cpu => "",
+ storage => "",
+ architecture => "x86_64",
+ require => Aeolus::Conductor::Login["admin"] }
+
+ aeolus::conductor::logout{"admin":
+ require => [Aeolus::Conductor::Provider['ec2-us-east-1'],
+ Aeolus::Conductor::Provider['ec2-us-west-1'],
+ Aeolus::Conductor::Hwp['hwp1']] }
+}
diff --git a/recipes/aeolus/manifests/profiles/mock.pp b/recipes/aeolus/manifests/profiles/mock.pp
new file mode 100644
index 0000000..50b972f
--- /dev/null
+++ b/recipes/aeolus/manifests/profiles/mock.pp
@@ -0,0 +1,51 @@
+# Copyright 2011 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class aeolus::profiles::mock {
+
+ aeolus::create_bucket{"aeolus":}
+
+ aeolus::conductor::site_admin{"admin":
+ email => 'dcuser(a)aeolusproject.org',
+ password => "password",
+ first_name => 'aeolus',
+ last_name => 'user'}
+
+ aeolus::conductor::login{"admin": password => "password",
+ require => Aeolus::Conductor::Site_admin['admin']}
+
+ aeolus::conductor::provider{"mock":
+ deltacloud_driver => 'mock',
+ url => 'http://localhost:3002/api',
+ require => Aeolus::Conductor::Login["admin"] }
+
+ aeolus::conductor::provider::account{"mockuser":
+ provider => 'mock',
+ type => 'mock',
+ username => 'mockuser',
+ password => 'mockpassword',
+ require => Aeolus::Conductor::Provider["mock"] }
+
+ aeolus::conductor::hwp{"hwp1":
+ memory => "512",
+ cpu => "",
+ storage => "",
+ architecture => "x86_64",
+ require => Aeolus::Conductor::Login["admin"] }
+
+ aeolus::conductor::logout{"admin":
+ require => [Aeolus::Conductor::Provider['mock'],
+ Aeolus::Conductor::Provider::Account['mockuser'],
+ Aeolus::Conductor::Hwp['hwp1']] }
+}
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp
index 6ff7e8f..09f9c7c 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -13,6 +13,7 @@
# limitations under the License.
class aeolus::profiles::rhevm {
+
file {"/etc/rhevm.json":
content => template("aeolus/rhevm.json"),
mode => 755,
@@ -57,17 +58,17 @@ class aeolus::profiles::rhevm {
url => "http://localhost:3002/api",
deltacloud_provider => "$rhevm_deltacloud_provider",
require => Aeolus::Conductor::Login["admin"] }
-
+
aeolus::conductor::provider::account{"rhevm":
provider => 'rhevm',
type => 'rhevm',
username => '$rhevm_deltacloud_username',
password => '$rhevm_deltacloud_password',
require => Aeolus::Conductor::Provider["rhevm"] }
-
+
aeolus::conductor::hwp{"hwp1":
memory => "512",
- cpu => "1",
+ cpu => "",
storage => "",
architecture => "x86_64",
require => Aeolus::Conductor::Login["admin"] }
diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp
index 570e653..17abc4b 100644
--- a/recipes/aeolus/manifests/profiles/vsphere.pp
+++ b/recipes/aeolus/manifests/profiles/vsphere.pp
@@ -29,17 +29,17 @@ class aeolus::profiles::vsphere {
url => "http://localhost:3002/api",
deltacloud_provider => "$vsphere_deltacloud_provider",
require => [Aeolus::Conductor::Login["admin"]] }
-
+
aeolus::conductor::provider::account{"vsphere":
provider => 'vsphere',
type => 'vsphere',
username => '$vsphere_username',
password => '$vsphere_password',
require => Aeolus::Conductor::Provider["vsphere"] }
-
+
aeolus::conductor::hwp{"hwp1":
memory => "512",
- cpu => "1",
+ cpu => "",
storage => "",
architecture => "x86_64",
require => Aeolus::Conductor::Login["admin"] }
--
1.7.6
12 years, 7 months
oz.git unittests - take#2
by James Laska
Greetings,
The following patches represent another take at adding py.test support into the
current oz.git unittest framework. I tried several methods of using stock
python 'unittest', however it always felt very kludgy to instrument 'yield'
support into unittest. Additionally, the test output for xfail results in
unittests was sub-optimal. Support for the 'yield' generator is essential for
the current structure of tests to support enumerating over expected pass/fail
results. After discussions with Chris, I opted to stick with py.test since it
required much less fiddling (imo) yet is still documented.
This round of patches addresses Chris' concerns regarding ...
1) Virtualenv support should be optional
2) Don't get fancy with a test.cfg ConfigParser
3) Support for running tests individually
Some additional changes include:
* Integration with distutils. Tests can also be run with 'python setup.py test'
* Py.test native support for junit test output (jenkins likey!)
> .gitignore | 2 +
> Makefile | 12 ++-
> setup.py | 14 ++-
> tests/factory/run_test | 219 ----------------------------------
> tests/factory/test_factory.py | 258 +++++++++++++++++++++++++++++++++++++++++
> tests/tdl/run_test | 129 --------------------
> tests/tdl/test_tdl.py | 155 ++++++++++++++++++++++++
> 7 files changed, 436 insertions(+), 353 deletions(-)
Comments/suggestions/concerns encouraged!
Thanks,
James
12 years, 7 months
[PATCH] Removed extraneous comma which broke condor actions
by Scott Seago
---
src/app/util/condormatic.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index c35afe1..dac4887 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -89,7 +89,7 @@ def condormatic_instance_create(task)
pipe_and_log(pipe, "executable = #{job_name}\n")
pipe_and_log(pipe,
- "grid_resource = deltacloud #{found.account.provider.encoded_url_with_driver_and_provider};\n")
+ "grid_resource = deltacloud #{found.account.provider.encoded_url_with_driver_and_provider}\n")
pipe_and_log(pipe, "DeltacloudUsername = #{found.account.credentials_hash['username']}\n")
pipe_and_log(pipe, "DeltacloudPasswordFile = #{pwfilename}")
pipe_and_log(pipe, "DeltacloudImageId = #{found.provider_image.target_identifier}\n")
--
1.7.6
12 years, 7 months
[PATCH aeolus-image] Fix rpm spec to remove unneeded .yardoc directory
by steve linabery
This directory is not needed, so nuke it.
---
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 1f6b983..64fe4b6 100644
--- a/rubygem-aeolus-image.spec
+++ b/rubygem-aeolus-image.spec
@@ -52,6 +52,7 @@ mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod 755
rmdir %{buildroot}%{gemdir}/bin
+rm -rf %{buildroot}%{gemdir}/gems/%{gemname}-%{version}/.yardoc
mkdir -p %{buildroot}%{mandir}
mv %{buildroot}%{geminstdir}/man/* %{buildroot}%{mandir}
@@ -60,7 +61,6 @@ mv %{buildroot}%{geminstdir}/man/* %{buildroot}%{mandir}
%doc %{geminstdir}/COPYING
%{_bindir}/aeolus-image
%dir %{geminstdir}
-%{geminstdir}/.yardoc
%{geminstdir}/Rakefile
%{geminstdir}/bin
%{geminstdir}/examples
--
1.7.6
12 years, 7 months