[rOCCI-server] Update to 1.1.6: - New Amazon EC2 backend - Disable Opennebula backend for now (new rubygem-ox depen
František Dvořák
valtri at fedoraproject.org
Wed Feb 18 17:19:16 UTC 2015
commit 415a5b7e675a28370160b1dfb855b542bbb3ec31
Author: František Dvořák <valtri at civ.zcu.cz>
Date: Wed Feb 18 17:14:56 2015 +0100
Update to 1.1.6:
- New Amazon EC2 backend
- Disable Opennebula backend for now (new rubygem-ox dependency)
- Fix build on F22+ with rails >= 4.2
.gitignore | 1 +
rOCCI-server.spec | 102 ++++++++++++++------
...bundle.diff => rocci-server-1.1.x-unbundle.diff | 17 ++-
sources | 2 +-
4 files changed, 84 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e7ebd46..c864b20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/rOCCI-server-aa036b71edcffd0e531a3ceba5b7113d40577977.tar.gz
+/rOCCI-server-73409eab8f4a1e6139ed67f335d674a5d2da2a80.tar.gz
diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index ee9d8fe..67ac55e 100644
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -2,13 +2,14 @@
%global app_root %{_datadir}/%{name}
%global semodule_name rocci_server
-%global commit aa036b71edcffd0e531a3ceba5b7113d40577977
+%global commit 73409eab8f4a1e6139ed67f335d674a5d2da2a80
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global openssl_cms openssl_cms_2_2
Name: rOCCI-server
-Version: 1.0.5
-Release: 4%{?dist}
+Version: 1.1.6
+Release: 1.20150217git%{shortcommit}%{?dist}
Summary: Ruby OCCI Server
License: ASL 2.0
@@ -20,12 +21,12 @@ Source3: %{name}.logrotate
Source4: README.Fedora
# kill the bundler
# (not intended for upstream)
-Patch0: rocci-server-1.0.x-unbundle.diff
+Patch0: rocci-server-1.1.x-unbundle.diff
BuildArch: noarch
BuildRequires: checkpolicy
BuildRequires: policycoreutils-python
-BuildRequires: ruby(release) >= 1.9.3
+BuildRequires: ruby(release) >= 2.0
BuildRequires: rubygems-devel
BuildRequires: rubygem(rdoc)
Requires(pre): shadow-utils
@@ -39,14 +40,17 @@ Requires: mod_ssl
Requires: rubygem(dalli)
Requires: rubygem(hashie)
Requires: rubygem(ice_nine)
-Requires: rubygem(jbuilder)
Requires: rubygem(kgio)
-Requires: rubygem(logstasher)
-Requires: rubygem(rails) >= 4.0.0
-Requires: rubygem(rails) < 4.2
-Requires: rubygem(rails-api)
-Requires: rubygem(occi-core) >= 4.2.15
+Requires: rubygem(logstasher) >= 0.6.2
+Requires: rubygem(logstasher) < 0.7
+Requires: rubygem(occi-core) >= 4.3.2
+Requires: rubygem(occi-core) < 4.4
Requires: rubygem(rack-cors)
+Requires: rubygem(rails) >= 4.2.0
+Requires: rubygem(rails) < 4.3
+Requires: rubygem(rails-api)
+Requires: rubygem(responders) >= 2.1.0
+Requires: rubygem(responders) < 2.2
Requires: rubygem(warden) >= 1.2.3
Requires: rubygem(%{openssl_cms})
Requires: selinux-policy
@@ -78,10 +82,12 @@ Summary: Tests for %{name}
BuildArch: noarch
Requires: rubygem(bundler)
#Requires: rubygem(guard-test)
-Requires: rubygem(rspec-rails) >= 2.14.0
-Requires: rubygem(rspec-rails) < 3
+#Requires: rubygem(rspec-rails) >= 3.2.0
+#Requires: rubygem(rspec-rails) < 3.3
Requires: rubygem(simplecov)
-Requires: %{name}-opennebula = %{version}-%{release}
+Requires: %{name}-ec2 = %{version}-%{release}
+# TODO: ox required
+#Requires: %{name}-opennebula = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description tests
@@ -95,21 +101,40 @@ This package contains tests for OCCI server. See README.Fedora how to launch
them.
-%package opennebula
-Summary: Opennebula backend for %{gem_name}
+# TODO: ox required (https://bugzilla.redhat.com/show_bug.cgi?id=1142491)
+#%package opennebula
+#Summary: Opennebula backend for %{gem_name}
+#BuildArch: noarch
+#Requires: rubygem(erubis)
+#Requires: rubygem(opennebula) >= 4.4.0
+#Requires: rubygem(ox)
+#Requires: %{name} = %{version}-%{release}
+#
+#%description opennebula
+#OCCI (the Open Cloud Computing Interface) is a standard by the Open Grid Forum,
+#specifying a protocol and API to perform various remote management tasks in
+#clouds. The rOCCI-server extends cloud managers, which are not OCCI-compliant
+#natively, with its own OCCI interface. It is based on the rOCCI (Ruby OCCI)
+#Framework.
+#
+#This package provides Opennebula backend for OCCI server.
+
+
+%package ec2
+Summary: Amazon backend for %{gem_name}
BuildArch: noarch
-Requires: rubygem(erubis)
-Requires: rubygem(opennebula) >= 4.4.0
+Requires: rubygem(aws-sdk-core) >= 2.0.24
+Requires: rubygem(aws-sdk-core) < 2.1
Requires: %{name} = %{version}-%{release}
-%description opennebula
+%description ec2
OCCI (the Open Cloud Computing Interface) is a standard by the Open Grid Forum,
specifying a protocol and API to perform various remote management tasks in
clouds. The rOCCI-server extends cloud managers, which are not OCCI-compliant
natively, with its own OCCI interface. It is based on the rOCCI (Ruby OCCI)
Framework.
-This package provides Opennebula backend for OCCI server.
+This package provides Amazon Web Services backend for OCCI server.
%prep
@@ -122,25 +147,21 @@ This package provides Opennebula backend for OCCI server.
mv Gemfile.lock Gemfile.upstream.lock
cp -p Gemfile Gemfile.upstream
cp -p lib/authentication_strategies/bundles/Gemfile.keystone Gemfile.keystone.upstream
+cp -p lib/backends/bundles/Gemfile.ec2 Gemfile.ec2.upstream
cp -p lib/backends/bundles/Gemfile.opennebula Gemfile.opennebula.upstream
# relax upstream requirements
while read name ver file; do
file=${file:-'Gemfile'}
sed -i "s/^\(\s*gem ['\"]$name['\"]\).*/\1, '>= $ver'/" $file
done << EOF
-jbuilder 1.5.0
-rails 4.0.0
-rails-api 0.1.0
-rspec-rails 2.14.0
-occi-core 4.2.15
+rails-api 0.2.1
opennebula 4.4.0 lib/backends/bundles/Gemfile.opennebula
EOF
# gems not needed for tests
-for p in sdoc capistrano rvm-capistrano debugger whenever passenger fuubar pry-rails pry-rescue pry-stack_explorer guard-bundler guard-rails rb-inotify libnotify yard redcarpet bond hirb; do
+for p in sdoc capistrano rvm-capistrano debugger byebug web-console whenever passenger rake fuubar pry-rails pry-rescue pry-stack_explorer guard-bundler guard-rails rb-inotify libnotify yard redcarpet bond hirb; do
sed -i "s/^\(\s*gem ['\"]$p['\"].*\)/#disabled: \1/" Gemfile
done
-# logstasher and openssl_cms not from git
-sed -i "s/, git:.*//" Gemfile
+# openssl_cms not from git
echo 'gem "%{openssl_cms}"' > lib/authentication_strategies/bundles/Gemfile.keystone
# but move away the prepared Gemfile
@@ -204,6 +225,10 @@ install -p -m 0644 examples/etc/apache2/sites-available/occi-ssl %{buildroot}%{_
echo "Listen 11443" >> %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-listen.conf
install -p -m 0644 examples/etc/apache2/conf.d/security %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-security.conf
+# don't test opennebula backend for now
+# TODO: ox required
+rm -f %{buildroot}%{app_root}/spec/lib/backends/opennebula_backend_spec.rb
+
# Testsuite requires running server
#%%check
@@ -260,6 +285,7 @@ fi
%{app_root}/lib/hooks/
%{app_root}/lib/request_parsers/
%{app_root}/lib/tasks
+%{app_root}/lib/application_responder.rb
%{app_root}/public/
%{app_root}/vendor/
%{app_root}/etc
@@ -271,9 +297,13 @@ fi
%exclude %{app_root}/.bundle/
%exclude %{app_root}/.rspec
%exclude %{app_root}/.travis.yml
+%exclude %{app_root}/.yardopts
%exclude %{app_root}/Capfile
%exclude %{app_root}/Guardfile
%exclude %{app_root}/Rakefile
+# TODO: ox required
+%exclude %{app_root}/lib/backends/opennebula/
+%exclude %{app_root}/lib/backends/opennebula_backend.rb
%files doc
%{_pkgdocdir}/rdoc/
@@ -286,12 +316,22 @@ fi
%{app_root}/test/
%{app_root}/Gemfile*
-%files opennebula
-%{app_root}/lib/backends/opennebula/
-%{app_root}/lib/backends/opennebula_backend.rb
+%files ec2
+%{app_root}/lib/backends/ec2/
+%{app_root}/lib/backends/ec2_backend.rb
+
+#%files opennebula
+#%{app_root}/lib/backends/opennebula/
+#%{app_root}/lib/backends/opennebula_backend.rb
%changelog
+* Tue Feb 17 2015 František Dvořák <valtri at civ.zcu.cz> - 1.1.6-1.20150217git73409ea
+- Update to 1.1.6
+- New Amazon EC2 backend
+- Disable Opennebula backend for now (new rubygem-ox dependency)
+- Fix build on F22+ with rails >= 4.2
+
* Wed Jan 28 2015 František Dvořák <valtri at civ.zcu.cz> - 1.0.5-4
- Rebuilt with ruby 2.2 and rubygem-openssl_cms_2_2
- Fix generating of the documentation
diff --git a/rocci-server-1.0.x-unbundle.diff b/rocci-server-1.1.x-unbundle.diff
similarity index 80%
rename from rocci-server-1.0.x-unbundle.diff
rename to rocci-server-1.1.x-unbundle.diff
index a503fcd..ae6a391 100644
--- a/rocci-server-1.0.x-unbundle.diff
+++ b/rocci-server-1.1.x-unbundle.diff
@@ -1,14 +1,13 @@
-commit f1a70411dc804b9861593632e13142feac4d244d
Author: František Dvořák <valtri at civ.zcu.cz>
-Date: Thu Sep 18 22:36:18 2014 +0200
+Date: Tue Feb 17 23:53:30 2015 +0100
- Remove the bundler (branch 1.0.x).
+ Remove the bundler.
diff --git a/config/application.rb b/config/application.rb
-index 6f37af1..72c497e 100644
+index 248420d..d772d87 100644
--- a/config/application.rb
+++ b/config/application.rb
-@@ -8,9 +8,24 @@ require 'action_controller/railtie'
+@@ -8,9 +8,30 @@ require 'action_controller/railtie'
require 'rails/test_unit/railtie'
# require 'sprockets/railtie'
@@ -18,7 +17,7 @@ index 6f37af1..72c497e 100644
+# Gemfile requires
+require 'rails'
+require 'rails-api'
-+require 'jbuilder'
++require 'responders'
+require 'rack/cors'
+require 'dalli'
+require 'kgio'
@@ -27,10 +26,16 @@ index 6f37af1..72c497e 100644
+require 'hashie'
+require 'ice_nine'
+require 'occi-core'
++# ec2 backend
++begin
++ require 'aws-sdk-core'
++rescue LoadError
++end
+# opennebula backend
+begin
+ require 'opennebula'
+ require 'erubis'
++ require 'ox'
+rescue LoadError
+end
diff --git a/sources b/sources
index 1d87ff5..2ab4d38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55bb0c22b6d6409aca5944e7c08ede13 rOCCI-server-aa036b71edcffd0e531a3ceba5b7113d40577977.tar.gz
+6ed5d13ef9445b669a9bd39ed1403fc1 rOCCI-server-73409eab8f4a1e6139ed67f335d674a5d2da2a80.tar.gz
More information about the scm-commits
mailing list