[deltacloud-core] Imported .spec file from F18, since that seems to be the most recent.

Fri Apr 5 14:04:34 UTC 2013

commit 896db32a392413e33db4a4848548715dd01734df
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Apr 5 15:01:50 2013 +0200

    Imported .spec file from F18, since that seems to be the most recent.

 .gitignore              |    1 +
 deltacloud-core-config  |    8 ++++
 deltacloud-core.init    |  104 -----------------------------------------------
 deltacloud-core.service |   11 +++++
 deltacloud-core.spec    |   42 +++++++++----------
 deltacloud-db-upgrade   |    5 --
 sources                 |    4 +-
 7 files changed, 40 insertions(+), 135 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index c3dda1d..b53c11a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /d8c9a4450623477e3b35e5223a082ff9ced35c0a-1.0.5.patch
 /deltacloud-core-1.0.5.gem
 /deltacloud-core-1.1.1.gem
+/deltacloud-core-1.1.2.gem
diff --git a/deltacloud-core-config b/deltacloud-core-config
index e50c96f..5204a9d 100644
--- a/deltacloud-core-config
+++ b/deltacloud-core-config
@@ -10,6 +10,14 @@ API_ENV="production"
 # drivers
 DRIVER="mock"
 
+# By default Deltacloud API will explose just native Deltacloud API
+# You can enable other frontends using the variable below
+#
+# Example: ENABLED_FRONTEND="deltacloud,cimi,ec2"
+#
+ENABLED_FRONTEND="deltacloud"
+
+
 # Port where deltacloud core will listen (default: localhost)
 # You should be able to access Deltacloud API on http://localhost:PORT/api
 PORT="3002"
diff --git a/deltacloud-core.service b/deltacloud-core.service
new file mode 100644
index 0000000..d1b945f
--- /dev/null
+++ b/deltacloud-core.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Deltacloud Core Daemon
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/deltacloud-core
+ExecStart=/usr/bin/deltacloudd -i $DRIVER -f $ENABLED_FRONTEND -e $API_ENV --port $PORT --host $HOST -u $DELTACLOUD_USER -g $DELTACLOUD_GROUP
+User=nobody
+Group=nobody
+
+[Install]
+WantedBy=multi-user.target
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index ad514e7..22af871 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -11,7 +11,6 @@ Source0: http://apache.mirror.rbftpnetworks.com/deltacloud/stable/%{name}-%{vers
 Source1: deltacloudd-fedora
 Source2: deltacloud-core-config
 Source3: deltacloud-core.service
-Source4: deltacloud-db-upgrade
 Requires: ruby(rubygems)
 Requires: ruby(abi) = 1.9.1
 Requires: rubygem(haml)
@@ -22,10 +21,9 @@ Requires: rubygem(net-ssh)
 Requires: rubygem(json_pure)
 Requires: rubygem(rack-accept)
 Requires: rubygem(nokogiri)
-Requires: rubygem(sinatra-rabbit) >= 1.1.6
 Requires: rubygem(sequel)
 Requires: rubygem(sqlite3)
-Requires: rubygem(xml-simple) >= 1.1.0
+Requires: rubygem(sinatra-rabbit) >= 1.1.6
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -33,7 +31,6 @@ Requires(post): systemd-sysv
 BuildRequires: rubygems-devel
 BuildRequires: ruby(abi) = 1.9.1
 BuildRequires: rubygem(haml)
-BuildRequires: rubygem(json_pure)
 BuildRequires: rubygem(sinatra) >= 1.0
 BuildRequires: rubygem(nokogiri)
 BuildRequires: rubygem(tilt)
@@ -43,12 +40,11 @@ BuildRequires: rubygem(rack-accept)
 BuildRequires: rubygem(rake) >= 0.8.7
 BuildRequires: rubygem(rack)
 BuildRequires: rubygem(rack-test)
-BuildRequires: rubygem(json)
+BuildRequires: rubygem(json_pure)
 BuildRequires: rubygem(minitest)
-BuildRequires: rubygem(sinatra-rabbit)
 BuildRequires: rubygem(sequel)
 BuildRequires: rubygem(sqlite3)
-BuildRequires: rubygem(xml-simple) >= 1.1.0
+BuildRequires: rubygem(sinatra-rabbit) >= 1.1.6
 BuildArch: noarch
 Obsoletes: rubygem-deltacloud-core
 
@@ -104,15 +100,6 @@ Requires: rubygem(aws)
 The ec2 sub-package brings in all dependencies necessary to use deltacloud
 core to connect to EC2.
 
-%package digitalocean
-Summary: Deltacloud Core for DigitalOcean cloud
-Requires: %{name} = %{version}-%{release}
-Requires: rubygem(rest-client)
-
-%description digitalocean
-The digitalocean sub-package brings in all dependencies necessary to use deltacloud
-core to connect to DigitalOcean cloud.
-
 %package eucalyptus
 Summary: Deltacloud Core for Eucalyptus
 Requires: %{name} = %{version}-%{release}
@@ -202,10 +189,20 @@ Requires: rubygem(xml-simple)
 The fgcp sub-package brings in all dependencies necessary to use deltacloud
 core to connect to Fujitsu Global Cloud Platform (FGCP).
 
+%package digitalocean
+Summary: Deltacloud Core for DigitalOcean
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(rest-client)
+
+%description digitalocean
+The digitalocean sub-package brings in all dependencies necessary to use deltacloud
+core to connect to DigitalOcean cloud.
+
 %prep
 %setup -q -c -T
 gem unpack -V --target=%{_builddir} %{SOURCE0}
 pushd %{_builddir}/%{name}-%{version}
+#%patch0 -p1
 popd
 
 %triggerun -- deltacloud-core < 1.0-1
@@ -227,10 +224,10 @@ install -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/deltacloudd
 install -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/deltacloud-db-upgrade
 install -m 0655 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 0655 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
-#install -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/deltacloud-db-upgrade
 find %{buildroot}%{app_root}/lib -type f | xargs chmod -x
 chmod -x %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 chmod 0755 %{buildroot}%{app_root}/bin/deltacloudd
+chmod 0755 %{buildroot}%{app_root}/bin/deltacloud-db-upgrade
 
 # Temporary remove Azure drivers until all dependencies will be pushed in to Fedora
 rm %{buildroot}%{app_root}/config/drivers/azure.yaml
@@ -266,8 +263,6 @@ popd
 if [ $1 -eq 1 ] ; then 
     # Initial installation
     /bin/systemctl enable deltacloud-core.service >/dev/null 2>&1 || :
-    # Upgrade database schema
-    # /usr/bin/deltacloud-db-upgrade
 fi
 
 %preun
@@ -291,10 +286,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %dir %{app_root}/
 %{app_root}/bin
-%{app_root}/db
 %{app_root}/config.ru
 %{app_root}/views
 %{app_root}/lib
+%{app_root}/db
 %dir %{app_root}/config/drivers
 %{app_root}/config/drivers/mock.yaml
 %dir %{app_root}/public
@@ -348,13 +343,14 @@ fi
 %files fgcp
 %{app_root}/config/drivers/fgcp.yaml
 
-%files digitalocean
-%{app_root}/config/drivers/digitalocean.yaml
-
 %files google
 %defattr(-, root, root, -)
 %{app_root}/config/drivers/google.yaml
 
+%files digitalocean
+%defattr(-, root, root, -)
+%{app_root}/config/drivers/digitalocean.yaml
+
 %changelog
 * Mon Mar 18 2013 Michal Fojtik <mfojtik at redhat.com> - 1.1.2-2
 - Bumped rbovirt and sinatra-rabbit versions
diff --git a/sources b/sources
index d66266b..9fc4d07 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-bf4e5d4bf5785f4c4064de0866c84e4b  deltacloud-core.service
-13fe58eb2f2c001c29684a5fa0d71ed6  deltacloud-core-1.1.1.gem
-13fe58eb2f2c001c29684a5fa0d71ed6  deltacloud-core-1.1.2.gem
+7a6ba956d734129ae250ab0a7a77a2dc  deltacloud-core-1.1.2.gem
