cas.spec | 8 ++++++--
doc/fixtures/servers.yml | 17 +++++++++++++++++
setup.py | 2 +-
3 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit 2733622948be561909957b7f99193375149706a9
Author: adam stokes <uzr(a)jak.rebo>
Date: Tue Sep 15 14:40:14 2009 -0400
- setup pre-existing fixtures for ease of adding servers
diff --git a/cas.spec b/cas.spec
index 3cf34df..708bbcc 100644
--- a/cas.spec
+++ b/cas.spec
@@ -12,9 +12,9 @@ BuildArch: noarch
Url:
http://fedorahosted.org/cas
BuildRequires: python-devel
%if 0%{?rhel}
-Requires: python-sqlite crash
+Requires: python-sqlite crash PyYAML
%else
-Requires: crash python-paramiko
+Requires: crash python-paramiko PyYAML
%endif
%description
@@ -49,6 +49,10 @@ rm -rf ${RPM_BUILD_ROOT}
%doc AUTHORS LICENSE README PKG-INFO doc/*
%changelog
+* Tue Sep 15 2009 Adam Stokes <ajs at redhat dot com> - 0.15-1
+- Require PyYAML, paramiko
+- Rip out func code
+
* Tue May 5 2009 Adam Stokes <ajs at redhat dot com> - 0.14-8
- support for purging old data
- documentation updated to reflect updated workflow and describe
diff --git a/doc/fixtures/servers.yml b/doc/fixtures/servers.yml
new file mode 100644
index 0000000..a8f4bb2
--- /dev/null
+++ b/doc/fixtures/servers.yml
@@ -0,0 +1,17 @@
+# Server listing in YAML
+# Supported architectures: x86_64, i686, s390, s390x, ppc, ppc64, ia64
+
+username: root
+password: password
+ssh_key: id_dsa
+
+server1.example.com:
+ architecture: x86_64
+ username: testuser # overwrite master username
+ port: 22
+server2.example.com:
+ architecture: i686
+ port: 22
+server3.example.com:
+ architecture: ppc64
+ port: 22
diff --git a/setup.py b/setup.py
index d5aba5b..16773ff 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ for dirpath, dirnames, filenames in os.walk('snippets'):
setup(
name = 'cas',
- version = '0.14',
+ version = '0.15',
author = 'Adam Stokes',
author_email = 'ajs(a)redhat.com',
url = "http://fedorahosted.org/cas",