deltacloud-devel March 2010

deltacloud-devel@lists.fedorahosted.org

15 participants
103 discussions

[PATCH core] Support for optional features
by David Lutterkort 05 Mar '10

05 Mar '10

These patches add support for optional features to Deltacloud API. Features are declared in lib/deltacloud/base_driver/features.rb; for example, declare_feature :instances, :user_name do description "Accept a user-defined name on instance creation" operation :create do param :name, :string, :optional, nil, "The user-defined name" end end declares the feature 'user_name' for the instances collection (features are scoped by collections, there's not much point in sharing them across collections). The feature declaration describes what happens to the API when a driver supports this feature - for user_name, the create operation for instances will accept an additional parameter 'name'. The driver then supports the feature by simply including the line feature :instances, :user_name That will make sure operations are modified according to the feature declaration (including docs ;) It will also cause that feature to be advertised in the API XML: <api driver="mock" version="1.0"> ... <link href="http://localhost:3000/api/instances" rel="instances"> <feature name="user_name"/> </link> ... </api> Finally, patches 8/9 and 9/9 add feature support to the client: the client now has a method feature?(collection, feature_name), and deltacloudc uses that to reject user-specified names on instance creation when the driver does not support that feature (funnily enough, it's pretty much only EC2 that does _not_ support that) Besides user_name, there's also a user_data feature for EC2-style data injection. I initially thought that the api.xml should describe in more detail how a particular feature is supported (e.g., the maximum length of the instance name for user_name, the size of the data for user_data), but it seems that that is overkill for now - it's easy enough to add that in later without breaking API compatibility. David

1 10

[PATCH core] Add destroy method to instance.
by Ian Main 05 Mar '10

05 Mar '10

I noticed during testing that the ruby client does not have a destroy method, this patch adds that to it. Signed-off-by: Ian Main <imain(a)redhat.com> --- client/lib/dcloud/instance.rb | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/client/lib/dcloud/instance.rb b/client/lib/dcloud/instance.rb index 04820a4..e3455aa 100644 --- a/client/lib/dcloud/instance.rb +++ b/client/lib/dcloud/instance.rb @@ -71,6 +71,13 @@ module DCloud unload end + def destroy!() + url = action_urls['destroy'] + throw Exception.new( "Unable to destroy" ) unless url + client.post_instance( url ) + unload + end + def load_payload(xml=nil) super(xml) unless xml.nil? -- 1.6.2.5

2 1

Changed Rakefile to run tests
by Michal Fojtik 05 Mar '10

05 Mar '10

Hi, I removed run_tests.sh script and moved tests exexution into Rakefile. So now you could do: rake test Michal

2 2

[PATCH portal] replaced mongrel with thin. (revised)
by Scott Seago 04 Mar '10

04 Mar '10

This is temporarily broken on F11 unless you manually comment out the rubygem(thin) requires line and install the gem manually, as thin is not currently pushed to the F11 repo due to a missing dep. Signed-off-by: Scott Seago <sseago(a)redhat.com> --- README | 6 +- conf/deltacloud-aggregator | 90 +++++++++++++++++++++++++++ conf/deltacloud-aggregator.sysconf | 18 +++++ conf/deltacloud-mongrel-rails | 86 ------------------------- conf/deltacloud-mongrel-rails.sysconf | 18 ----- conf/deltacloud-portal.logrotate | 4 +- deltacloud-portal.spec.in | 18 +++--- src/config/initializers/abstract_request.rb | 20 ------ 8 files changed, 122 insertions(+), 138 deletions(-) create mode 100755 conf/deltacloud-aggregator create mode 100644 conf/deltacloud-aggregator.sysconf delete mode 100755 conf/deltacloud-mongrel-rails delete mode 100644 conf/deltacloud-mongrel-rails.sysconf delete mode 100644 src/config/initializers/abstract_request.rb diff --git a/README b/README index 31d38d5..79c89fe 100644 --- a/README +++ b/README @@ -46,7 +46,7 @@ There are three ways you can install the portal application (though all require * rubygem(activeldap) >= 0.10.0 * rubygem(activerecord) >= 2.1.1-2 * rubygem(gettext_rails) - * rubygem(mongrel) >= 1.0.1 + * rubygem(thin) >= 1.2.5 * rubygem(rails) >= 2.3.2 4. Continue to Section 5 - Database setup @@ -129,7 +129,7 @@ Next, you need to have the correct rubygems installed. If you followed the steps === Section 6 - Finishing Setup === You should now have everyting configured and installed to run the portal. If you followed either of the RPM instructions, you can now run: - * service deltacloud-mongrel-rails start + * service deltacloud-aggregator start * service deltacloud-taskomatic start If you followed the development steps: @@ -141,7 +141,7 @@ Lastly, you will need one or more instances of the Deltacloud framework running === Getting Started === -For these steps, we will assume the mock driver is setup and running in a framework on http://localhost:3001/api, and your portal is running on http://localhost:3000 (this will just be http://localhost/deltacloud if you are running through apache, and can be started with 'service deltacloud-mongrel-rails start') +For these steps, we will assume the mock driver is setup and running in a framework on http://localhost:3001/api, and your portal is running on http://localhost:3000 (this will just be http://localhost/deltacloud if you are running through apache, and can be started with 'service deltacloud-aggregator start') Taskomatic is a separate process that checks for tasks needing to be handled for portal instances. (If you installed the rpm, you can simply start the deltacloud-taskomatic service) This can be run from the commandline from the taskomatic directory with 'ruby taskomatic -n'. If you are running in development mode, you can point taskomatic there by exporting 'RAILS_ENV=development'. Taskomatic needs to be running to do things like 'start an instance'. diff --git a/conf/deltacloud-aggregator b/conf/deltacloud-aggregator new file mode 100755 index 0000000..a3c08a0 --- /dev/null +++ b/conf/deltacloud-aggregator @@ -0,0 +1,90 @@ +#!/bin/bash +# +# +# deltacloud-aggregator startup script for deltacloud-aggregator +# +# chkconfig: - 97 03 +# description: deltacloud-aggregator is primary server process for the \ +# Deltacloud Aggregator. +# + +[ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails + +[ -r /etc/sysconfig/deltacloud-aggregator ] && . /etc/sysconfig/deltacloud-aggregator + +RAILS_ENV="${RAILS_ENV:-production}" +DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-portal}" +THIN_LOG="${THIN_LOG:-/var/log/deltacloud-portal/thin.log}" +THIN_PID="${THIN_PID:-/var/run/deltacloud-portal/thin.pid}" +THIN_LOCKFILE="${THIN_LOCKFILE:-/var/lock/subsys/deltacloud-aggregator }" +USER="${USER:-dcloud}" +GROUP="${GROUP:-dcloud}" +PREFIX="${PREFIX:-/deltacloud}" +ADAPTER="${ADAPTER:-/rails}" + +THIN_PROG=thin +ADDR=127.0.0.1 +RETVAL=0 + +. /etc/init.d/functions + +start() { + echo -n "Starting deltacloud-aggregator: " + echo $THIN_PROG start -c $DELTACLOUD_DIR -l $THIN_LOG -P $THIN_PID \ + -a $ADDR -e $RAILS_ENV --user $USER --group $GROUP \ + -d --prefix=$PREFIX -A $ADAPTER + + $THIN_PROG start -c $DELTACLOUD_DIR -l $THIN_LOG -P $THIN_PID \ + -a $ADDR -e $RAILS_ENV --user $USER --group $GROUP \ + -d --prefix=$PREFIX + RETVAL=$? + if [ $RETVAL -eq 0 ] && touch $THIN_LOCKFILE ; then + echo_success + echo + else + echo_failure + echo + fi + +} + +stop() { + echo -n "Shutting down deltacloud-aggregator: " + $THIN_PROG stop -c $DELTACLOUD_DIR -P $THIN_PID + RETVAL=$? + if [ $RETVAL -eq 0 ] && rm -f $THIN_LOCKFILE ; then + echo_success + echo + else + echo_failure + echo + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + reload) + ;; + force-reload) + restart + ;; + status) + status $THIN_PROG + RETVAL=$? + ;; + *) + echo "Usage: deltacloud-aggregator {start|stop|restart|status}" + exit 1 + ;; +esac + +exit $RETVAL diff --git a/conf/deltacloud-aggregator.sysconf b/conf/deltacloud-aggregator.sysconf new file mode 100644 index 0000000..5c94997 --- /dev/null +++ b/conf/deltacloud-aggregator.sysconf @@ -0,0 +1,18 @@ +# root directory of the Deltacloud Aggregator Rails application +#DELTACLOUD_DIR=/usr/share/deltacloud-portal + +# location of the logfile +#THIN_LOG=/var/log/deltacloud-portal/thin.log + +# location of the lockfile +#THIN_LOCKFILE=/var/lock/subsys/deltacloud-portal + +# location of the file containing running process ID +#THIN_PID=/var/run/deltacloud-portal/thin.pid + +# user and group under which Rails application runs +#USER=dcloud +#GROUP=dcloud + +# URL prefix for Rails application +#PREFIX=/deltacloud diff --git a/conf/deltacloud-mongrel-rails b/conf/deltacloud-mongrel-rails deleted file mode 100755 index bbbc829..0000000 --- a/conf/deltacloud-mongrel-rails +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# -# -# deltacloud-mongrel-rails startup script for deltacloud-mongrel-rails -# -# chkconfig: - 97 03 -# description: deltacloud-mongrel-rails is an essential component of the \ -# deltacloud Portal. -# - -[ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails - -[ -r /etc/sysconfig/deltacloud-mongrel-rails ] && . /etc/sysconfig/deltacloud-mongrel-rails - -RAILS_ENV="${RAILS_ENV:-production}" -DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-portal}" -MONGREL_LOG="${MONGREL_LOG:-/var/log/deltacloud-portal/mongrel.log}" -MONGREL_PID="${MONGREL_PID:-/var/run/deltacloud-portal/mongrel.pid}" -MONGREL_LOCKFILE="${MONGREL_LOCKFILE:-/var/lock/subsys/deltacloud-mongrel-rails }" -USER="${USER:-dcloud}" -GROUP="${GROUP:-dcloud}" -PREFIX="${PREFIX:-/deltacloud}" - -MONGREL_PROG=mongrel_rails -ADDR=127.0.0.1 -RETVAL=0 - -. /etc/init.d/functions - -start() { - echo -n "Starting deltacloud-mongrel-rails: " - - $MONGREL_PROG start -c $DELTACLOUD_DIR -l $MONGREL_LOG -P $MONGREL_PID \ - -a $ADDR -e $RAILS_ENV --user $USER --group $GROUP \ - -d --prefix=$PREFIX - RETVAL=$? - if [ $RETVAL -eq 0 ] && touch $MONGREL_LOCKFILE ; then - echo_success - echo - else - echo_failure - echo - fi - -} - -stop() { - echo -n "Shutting down deltacloud-mongrel-rails: " - $MONGREL_PROG stop -c $DELTACLOUD_DIR -P $MONGREL_PID - RETVAL=$? - if [ $RETVAL -eq 0 ] && rm -f $MONGREL_LOCKFILE ; then - echo_success - echo - else - echo_failure - echo - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - reload) - ;; - force-reload) - restart - ;; - status) - status $MONGREL_PROG - RETVAL=$? - ;; - *) - echo "Usage: deltacloud-mongrel-rails {start|stop|restart|status}" - exit 1 - ;; -esac - -exit $RETVAL diff --git a/conf/deltacloud-mongrel-rails.sysconf b/conf/deltacloud-mongrel-rails.sysconf deleted file mode 100644 index 582418c..0000000 --- a/conf/deltacloud-mongrel-rails.sysconf +++ /dev/null @@ -1,18 +0,0 @@ -# root directory of the Deltacloud Portal Rails application -#OVIRT_DIR=/usr/share/deltacloud-portal - -# location of the logfile -#MONGREL_LOG=/var/log/deltacloud-portal/mongrel.log - -# location of the lockfile -#MONGREL_LOCKFILE=/var/lock/subsys/deltacloud-portal - -# location of the file containing running process ID -#MONGREL_PID=/var/run/deltacloud-portal/mongrel.pid - -# user and group under which Rails application runs -#USER=dcloud -#GROUP=dcloud - -# URL prefix for Rails application -#PREFIX=/deltacloud diff --git a/conf/deltacloud-portal.logrotate b/conf/deltacloud-portal.logrotate index ff4b390..92a494f 100644 --- a/conf/deltacloud-portal.logrotate +++ b/conf/deltacloud-portal.logrotate @@ -10,9 +10,9 @@ notifempty endscript } -/var/log/deltacloud-portal/rails.log /var/log/deltacloud-portal/mongrel.log { +/var/log/deltacloud-portal/rails.log /var/log/deltacloud-portal/thin.log { sharedscripts postrotate - /etc/init.d/deltacloud-mongrel-rails restart + /etc/init.d/deltacloud-aggregator restart endscript } diff --git a/deltacloud-portal.spec.in b/deltacloud-portal.spec.in index 642da34..106d36a 100644 --- a/deltacloud-portal.spec.in +++ b/deltacloud-portal.spec.in @@ -16,7 +16,7 @@ Requires: ruby(abi) = 1.8 Requires: rubygem(activerecord) >= 2.1.1-2 Requires: rubygem(activeldap) >= 0.10.0 Requires: rubygem(rails) >= 2.1.1 -Requires: rubygem(mongrel) >= 1.0.1 +Requires: rubygem(thin) >= 1.2.5 %if 0%{?fedora} >= 11 Requires: rubygem(gettext_rails) %else @@ -69,14 +69,14 @@ mkdir %{buildroot} # by dcloud:dcloud. This is a temporary workaround while we've still # got root-owned daemon processes. Once we resolve that issue # these files will no longer be added explicitly here. -touch %{buildroot}%{_localstatedir}/log/%{name}/mongrel.log +touch %{buildroot}%{_localstatedir}/log/%{name}/thin.log touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log %{__install} -p -m0644 %{pbuild}/conf/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d %{__install} -p -m0644 %{pbuild}/conf/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-mongrel-rails %{buildroot}%{_initrddir} -%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-mongrel-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-mongrel-rails +%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-aggregator %{buildroot}%{_initrddir} +%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-aggregator.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator %{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails %{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-taskomatic %{buildroot}%{_initrddir} @@ -126,23 +126,23 @@ fi \ # if this is the initial RPM install, then we want to turn the new services # on; otherwise, we respect the choices the administrator already has made. # check this by seeing if each daemon is already installed -%daemon_chkconfig_post -d deltacloud-mongrel-rails +%daemon_chkconfig_post -d deltacloud-aggregator %daemon_chkconfig_post -d deltacloud-taskomatic %preun if [ "$1" = 0 ] ; then - /sbin/service deltacloud-mongrel-rails stop > /dev/null 2>&1 + /sbin/service deltacloud-aggregator stop > /dev/null 2>&1 /sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 - /sbin/chkconfig --del deltacloud-mongrel-rails + /sbin/chkconfig --del deltacloud-aggregator /sbin/chkconfig --del deltacloud-taskomatic fi %files %defattr(-,root,root,0755) -%{_initrddir}/deltacloud-mongrel-rails +%{_initrddir}/deltacloud-aggregator %{_initrddir}/deltacloud-taskomatic %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-mongrel-rails +%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-aggregator %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %doc README AUTHORS COPYING diff --git a/src/config/initializers/abstract_request.rb b/src/config/initializers/abstract_request.rb deleted file mode 100644 index 12d4378..0000000 --- a/src/config/initializers/abstract_request.rb +++ /dev/null @@ -1,20 +0,0 @@ -# This is a (hopefully) temporary workaround to help -# mongrel, since it hooks into the now-gone AbstractRequest -# class. We should test if this issue occurs with thin -# webserver, perhaps we can use that instead of mongrel -# and drop this altogether. Set only to production, otherwise -# it kills our test suite. - -config = Rails::Configuration.new -if config.environment == 'production' - module ActionController - class AbstractRequest < ActionController::Request - def self.relative_url_root=(path) - ActionController::Base.relative_url_root=(path) - end - def self.relative_url_root - ActionController::Base.relative_url_root - end - end - end -end -- 1.6.2.5

2 1

[PATCH portal] replaced mongrel with thin.
by Scott Seago 04 Mar '10

04 Mar '10

This is temporarily broken on F11 unless you manually comment out the rubygem(thin) requires line and install the gem manually, as thin is not currently pushed to the F11 repo due to a missing dep. Signed-off-by: Scott Seago <sseago(a)redhat.com> --- README | 6 +- conf/deltacloud-aggregator | 90 +++++++++++++++++++++++++++ conf/deltacloud-aggregator.sysconf | 18 +++++ conf/deltacloud-mongrel-rails | 86 ------------------------- conf/deltacloud-mongrel-rails.sysconf | 18 ----- conf/deltacloud-portal.logrotate | 4 +- deltacloud-portal.spec.in | 18 +++--- src/config/initializers/abstract_request.rb | 20 ------ 8 files changed, 122 insertions(+), 138 deletions(-) create mode 100755 conf/deltacloud-aggregator create mode 100644 conf/deltacloud-aggregator.sysconf delete mode 100755 conf/deltacloud-mongrel-rails delete mode 100644 conf/deltacloud-mongrel-rails.sysconf delete mode 100644 src/config/initializers/abstract_request.rb diff --git a/README b/README index 31d38d5..79c89fe 100644 --- a/README +++ b/README @@ -46,7 +46,7 @@ There are three ways you can install the portal application (though all require * rubygem(activeldap) >= 0.10.0 * rubygem(activerecord) >= 2.1.1-2 * rubygem(gettext_rails) - * rubygem(mongrel) >= 1.0.1 + * rubygem(thin) >= 1.2.5 * rubygem(rails) >= 2.3.2 4. Continue to Section 5 - Database setup @@ -129,7 +129,7 @@ Next, you need to have the correct rubygems installed. If you followed the steps === Section 6 - Finishing Setup === You should now have everyting configured and installed to run the portal. If you followed either of the RPM instructions, you can now run: - * service deltacloud-mongrel-rails start + * service deltacloud-aggregator start * service deltacloud-taskomatic start If you followed the development steps: @@ -141,7 +141,7 @@ Lastly, you will need one or more instances of the Deltacloud framework running === Getting Started === -For these steps, we will assume the mock driver is setup and running in a framework on http://localhost:3001/api, and your portal is running on http://localhost:3000 (this will just be http://localhost/deltacloud if you are running through apache, and can be started with 'service deltacloud-mongrel-rails start') +For these steps, we will assume the mock driver is setup and running in a framework on http://localhost:3001/api, and your portal is running on http://localhost:3000 (this will just be http://localhost/deltacloud if you are running through apache, and can be started with 'service deltacloud-aggregator start') Taskomatic is a separate process that checks for tasks needing to be handled for portal instances. (If you installed the rpm, you can simply start the deltacloud-taskomatic service) This can be run from the commandline from the taskomatic directory with 'ruby taskomatic -n'. If you are running in development mode, you can point taskomatic there by exporting 'RAILS_ENV=development'. Taskomatic needs to be running to do things like 'start an instance'. diff --git a/conf/deltacloud-aggregator b/conf/deltacloud-aggregator new file mode 100755 index 0000000..f033fd1 --- /dev/null +++ b/conf/deltacloud-aggregator @@ -0,0 +1,90 @@ +#!/bin/bash +# +# +# deltacloud-aggregator startup script for deltacloud-aggregator +# +# chkconfig: - 97 03 +# description: deltacloud-aggregator is primary server process for the \ +# Deltacloud Aggregator. +# + +[ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails + +[ -r /etc/sysconfig/deltacloud-aggregator ] && . /etc/sysconfig/deltacloud-aggregator + +RAILS_ENV="${RAILS_ENV:-production}" +DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-portal}" +THIN_LOG="${MONGREL_LOG:-/var/log/deltacloud-portal/thin.log}" +THIN_PID="${MONGREL_PID:-/var/run/deltacloud-portal/thin.pid}" +THIN_LOCKFILE="${THIN_LOCKFILE:-/var/lock/subsys/deltacloud-aggregator }" +USER="${USER:-dcloud}" +GROUP="${GROUP:-dcloud}" +PREFIX="${PREFIX:-/deltacloud}" +ADAPTER="${ADAPTER:-/rails}" + +THIN_PROG=thin +ADDR=127.0.0.1 +RETVAL=0 + +. /etc/init.d/functions + +start() { + echo -n "Starting deltacloud-aggregator: " + echo $THIN_PROG start -c $DELTACLOUD_DIR -l $THIN_LOG -P $THIN_PID \ + -a $ADDR -e $RAILS_ENV --user $USER --group $GROUP \ + -d --prefix=$PREFIX -A $ADAPTER + + $THIN_PROG start -c $DELTACLOUD_DIR -l $THIN_LOG -P $THIN_PID \ + -a $ADDR -e $RAILS_ENV --user $USER --group $GROUP \ + -d --prefix=$PREFIX + RETVAL=$? + if [ $RETVAL -eq 0 ] && touch $THIN_LOCKFILE ; then + echo_success + echo + else + echo_failure + echo + fi + +} + +stop() { + echo -n "Shutting down deltacloud-aggregator: " + $THIN_PROG stop -c $DELTACLOUD_DIR -P $THIN_PID + RETVAL=$? + if [ $RETVAL -eq 0 ] && rm -f $THIN_LOCKFILE ; then + echo_success + echo + else + echo_failure + echo + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + reload) + ;; + force-reload) + restart + ;; + status) + status $THIN_PROG + RETVAL=$? + ;; + *) + echo "Usage: deltacloud-aggregator {start|stop|restart|status}" + exit 1 + ;; +esac + +exit $RETVAL diff --git a/conf/deltacloud-aggregator.sysconf b/conf/deltacloud-aggregator.sysconf new file mode 100644 index 0000000..5c94997 --- /dev/null +++ b/conf/deltacloud-aggregator.sysconf @@ -0,0 +1,18 @@ +# root directory of the Deltacloud Aggregator Rails application +#DELTACLOUD_DIR=/usr/share/deltacloud-portal + +# location of the logfile +#THIN_LOG=/var/log/deltacloud-portal/thin.log + +# location of the lockfile +#THIN_LOCKFILE=/var/lock/subsys/deltacloud-portal + +# location of the file containing running process ID +#THIN_PID=/var/run/deltacloud-portal/thin.pid + +# user and group under which Rails application runs +#USER=dcloud +#GROUP=dcloud + +# URL prefix for Rails application +#PREFIX=/deltacloud diff --git a/conf/deltacloud-mongrel-rails b/conf/deltacloud-mongrel-rails deleted file mode 100755 index bbbc829..0000000 --- a/conf/deltacloud-mongrel-rails +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# -# -# deltacloud-mongrel-rails startup script for deltacloud-mongrel-rails -# -# chkconfig: - 97 03 -# description: deltacloud-mongrel-rails is an essential component of the \ -# deltacloud Portal. -# - -[ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails - -[ -r /etc/sysconfig/deltacloud-mongrel-rails ] && . /etc/sysconfig/deltacloud-mongrel-rails - -RAILS_ENV="${RAILS_ENV:-production}" -DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-portal}" -MONGREL_LOG="${MONGREL_LOG:-/var/log/deltacloud-portal/mongrel.log}" -MONGREL_PID="${MONGREL_PID:-/var/run/deltacloud-portal/mongrel.pid}" -MONGREL_LOCKFILE="${MONGREL_LOCKFILE:-/var/lock/subsys/deltacloud-mongrel-rails }" -USER="${USER:-dcloud}" -GROUP="${GROUP:-dcloud}" -PREFIX="${PREFIX:-/deltacloud}" - -MONGREL_PROG=mongrel_rails -ADDR=127.0.0.1 -RETVAL=0 - -. /etc/init.d/functions - -start() { - echo -n "Starting deltacloud-mongrel-rails: " - - $MONGREL_PROG start -c $DELTACLOUD_DIR -l $MONGREL_LOG -P $MONGREL_PID \ - -a $ADDR -e $RAILS_ENV --user $USER --group $GROUP \ - -d --prefix=$PREFIX - RETVAL=$? - if [ $RETVAL -eq 0 ] && touch $MONGREL_LOCKFILE ; then - echo_success - echo - else - echo_failure - echo - fi - -} - -stop() { - echo -n "Shutting down deltacloud-mongrel-rails: " - $MONGREL_PROG stop -c $DELTACLOUD_DIR -P $MONGREL_PID - RETVAL=$? - if [ $RETVAL -eq 0 ] && rm -f $MONGREL_LOCKFILE ; then - echo_success - echo - else - echo_failure - echo - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - reload) - ;; - force-reload) - restart - ;; - status) - status $MONGREL_PROG - RETVAL=$? - ;; - *) - echo "Usage: deltacloud-mongrel-rails {start|stop|restart|status}" - exit 1 - ;; -esac - -exit $RETVAL diff --git a/conf/deltacloud-mongrel-rails.sysconf b/conf/deltacloud-mongrel-rails.sysconf deleted file mode 100644 index 582418c..0000000 --- a/conf/deltacloud-mongrel-rails.sysconf +++ /dev/null @@ -1,18 +0,0 @@ -# root directory of the Deltacloud Portal Rails application -#OVIRT_DIR=/usr/share/deltacloud-portal - -# location of the logfile -#MONGREL_LOG=/var/log/deltacloud-portal/mongrel.log - -# location of the lockfile -#MONGREL_LOCKFILE=/var/lock/subsys/deltacloud-portal - -# location of the file containing running process ID -#MONGREL_PID=/var/run/deltacloud-portal/mongrel.pid - -# user and group under which Rails application runs -#USER=dcloud -#GROUP=dcloud - -# URL prefix for Rails application -#PREFIX=/deltacloud diff --git a/conf/deltacloud-portal.logrotate b/conf/deltacloud-portal.logrotate index ff4b390..92a494f 100644 --- a/conf/deltacloud-portal.logrotate +++ b/conf/deltacloud-portal.logrotate @@ -10,9 +10,9 @@ notifempty endscript } -/var/log/deltacloud-portal/rails.log /var/log/deltacloud-portal/mongrel.log { +/var/log/deltacloud-portal/rails.log /var/log/deltacloud-portal/thin.log { sharedscripts postrotate - /etc/init.d/deltacloud-mongrel-rails restart + /etc/init.d/deltacloud-aggregator restart endscript } diff --git a/deltacloud-portal.spec.in b/deltacloud-portal.spec.in index 642da34..106d36a 100644 --- a/deltacloud-portal.spec.in +++ b/deltacloud-portal.spec.in @@ -16,7 +16,7 @@ Requires: ruby(abi) = 1.8 Requires: rubygem(activerecord) >= 2.1.1-2 Requires: rubygem(activeldap) >= 0.10.0 Requires: rubygem(rails) >= 2.1.1 -Requires: rubygem(mongrel) >= 1.0.1 +Requires: rubygem(thin) >= 1.2.5 %if 0%{?fedora} >= 11 Requires: rubygem(gettext_rails) %else @@ -69,14 +69,14 @@ mkdir %{buildroot} # by dcloud:dcloud. This is a temporary workaround while we've still # got root-owned daemon processes. Once we resolve that issue # these files will no longer be added explicitly here. -touch %{buildroot}%{_localstatedir}/log/%{name}/mongrel.log +touch %{buildroot}%{_localstatedir}/log/%{name}/thin.log touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log %{__install} -p -m0644 %{pbuild}/conf/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d %{__install} -p -m0644 %{pbuild}/conf/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-mongrel-rails %{buildroot}%{_initrddir} -%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-mongrel-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-mongrel-rails +%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-aggregator %{buildroot}%{_initrddir} +%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-aggregator.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator %{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails %{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-taskomatic %{buildroot}%{_initrddir} @@ -126,23 +126,23 @@ fi \ # if this is the initial RPM install, then we want to turn the new services # on; otherwise, we respect the choices the administrator already has made. # check this by seeing if each daemon is already installed -%daemon_chkconfig_post -d deltacloud-mongrel-rails +%daemon_chkconfig_post -d deltacloud-aggregator %daemon_chkconfig_post -d deltacloud-taskomatic %preun if [ "$1" = 0 ] ; then - /sbin/service deltacloud-mongrel-rails stop > /dev/null 2>&1 + /sbin/service deltacloud-aggregator stop > /dev/null 2>&1 /sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 - /sbin/chkconfig --del deltacloud-mongrel-rails + /sbin/chkconfig --del deltacloud-aggregator /sbin/chkconfig --del deltacloud-taskomatic fi %files %defattr(-,root,root,0755) -%{_initrddir}/deltacloud-mongrel-rails +%{_initrddir}/deltacloud-aggregator %{_initrddir}/deltacloud-taskomatic %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-mongrel-rails +%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-aggregator %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %doc README AUTHORS COPYING diff --git a/src/config/initializers/abstract_request.rb b/src/config/initializers/abstract_request.rb deleted file mode 100644 index 12d4378..0000000 --- a/src/config/initializers/abstract_request.rb +++ /dev/null @@ -1,20 +0,0 @@ -# This is a (hopefully) temporary workaround to help -# mongrel, since it hooks into the now-gone AbstractRequest -# class. We should test if this issue occurs with thin -# webserver, perhaps we can use that instead of mongrel -# and drop this altogether. Set only to production, otherwise -# it kills our test suite. - -config = Rails::Configuration.new -if config.environment == 'production' - module ActionController - class AbstractRequest < ActionController::Request - def self.relative_url_root=(path) - ActionController::Base.relative_url_root=(path) - end - def self.relative_url_root - ActionController::Base.relative_url_root - end - end - end -end -- 1.6.2.5

1 0

[PATCH portal] Remove taskomatic.
by Ian Main 04 Mar '10

04 Mar '10

Now that it's inline, we don't need the daemon anymore. Signed-off-by: Ian Main <imain(a)redhat.com> --- src/task-omatic/.gitignore | 1 - src/task-omatic/taskomatic.rb | 185 ---------------------------- src/task-omatic/taskomatic_instance.rb | 208 -------------------------------- src/task-omatic/taskomatic_task.rb | 28 ----- 4 files changed, 0 insertions(+), 422 deletions(-) delete mode 100644 src/task-omatic/.gitignore delete mode 100755 src/task-omatic/taskomatic.rb delete mode 100644 src/task-omatic/taskomatic_instance.rb delete mode 100644 src/task-omatic/taskomatic_task.rb diff --git a/src/task-omatic/.gitignore b/src/task-omatic/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/src/task-omatic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/src/task-omatic/taskomatic.rb b/src/task-omatic/taskomatic.rb deleted file mode 100755 index 8c51e9b..0000000 --- a/src/task-omatic/taskomatic.rb +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/ruby -# -# Copyright (C) 2008 Red Hat, Inc. -# Written by Chris Lalancette <clalance(a)redhat.com> and -# Ian Main <imain(a)redhat.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. A copy of the GNU General Public License is -# also available at http://www.gnu.org/copyleft/gpl.html. - -$: << File.join(File.dirname(__FILE__), "../dutils") -$: << File.join(File.dirname(__FILE__), ".") - -require 'rubygems' -require 'monitor' -require 'dutils' -require 'optparse' -require 'daemons' -require 'logger' -include Daemonize - -require 'taskomatic_instance' - -# This sad and pathetic readjustment to ruby logger class is -# required to fix the formatting because rails does the same -# thing but overrides it to just the message. -# -# See eg: http://osdir.com/ml/lang.ruby.rails.core/2007-01/msg00082.html -# -class Logger - def format_message(severity, timestamp, progname, msg) - "#{severity} #{timestamp} (#{$$}) #{msg}\n" - end -end - -class TaskOmatic - - include MonitorMixin - - $logfile = '/var/log/deltacloud-portal/taskomatic.log' - - def initialize() - super() - - @sleeptime = 5 - @nth_host = 0 - - do_daemon = true - do_debug = false - - opts = OptionParser.new do |opts| - opts.on("-h", "--help", "Print help message") do - puts opts - exit - end - opts.on("-n", "--nodaemon", "Run interactively (useful for debugging)") do |n| - do_daemon = false - end - opts.on("-d", "--debug", "Print verbose debugging output") do |d| - do_debug = true - end - opts.on("-s N", Integer, "--sleep", - "Seconds to sleep between iterations (default is 5 seconds)") do |s| - sleeptime = s - end - end - begin - opts.parse!(ARGV) - rescue OptionParser::InvalidOption - puts opts - exit - end - - if do_daemon - # This gets around a problem with paths for the database stuff. - # Normally daemonize would chdir to / but the paths for the database - # stuff are relative so it breaks it.. It's either this or rearrange - # things so the db stuff is included after daemonizing. - pwd = Dir.pwd - daemonize - Dir.chdir(pwd) - @logger = Logger.new($logfile) - else - @logger = Logger.new(STDERR) - end - - #(a)logger.level = Logger::DEBUG if do_debug - # - # For now I'm going to always enable debugging until we do a real release. - @logger.level = Logger::DEBUG - end - - def mainloop() - - loop do - tasks = Array.new - begin - tasks = Task.find(:all, :conditions => - [ "state = ?", Task::STATE_QUEUED ]) - rescue => ex - @logger.error "1 #{ex.class}: #{ex.message}" - if Task.connected? - begin - ActiveRecord::Base.connection.reconnect! - rescue => norecon - @logger.error "2 #{norecon.class}: #{norecon.message}" - end - else - begin - database_connect - rescue => ex - @logger.error "3 #{ex.class}: #{ex.message}" - end - end - end - - tasks.each do |task| - - task.time_started = Time.now - - state = Task::STATE_FINISHED - begin - case task.action - when InstanceTask::ACTION_CREATE - tasko_task = TaskomaticInstanceCreate.new(@logger, task) - when InstanceTask::ACTION_START - tasko_task = TaskomaticInstanceStart.new(@logger, task) - when InstanceTask::ACTION_STOP - tasko_task = TaskomaticInstanceStop.new(@logger, task) - when InstanceTask::ACTION_REBOOT - tasko_task = TaskomaticInstanceReboot.new(@logger, task) - when InstanceTask::ACTION_DESTROY - tasko_task = TaskomaticInstanceDestroy.new(@logger, task) - else - @logger.error "unknown task " + task.action - state = Task::STATE_FAILED - task.message = "Unknown task type" - end - - # Implement the task.. this may be done in threads based on - # dependencies in the future. - tasko_task.run - - rescue Exception => ex - @logger.error "Task action processing failed: #{ex.class}: #{ex.message}" - @logger.error ex.backtrace - state = Task::STATE_FAILED - task.message = ex.message - end - - task.state = state - task.time_ended = Time.now - begin - task.save! - rescue Exception => ex - @logger.error "Error saving task state for task #{task.id}: #{ex.class}: #{ex.message}" - @logger.error ex.backtrace - end - @logger.info "done" - end - # FIXME: here, we clean up "orphaned" tasks. These are tasks - # that we had to orphan (set task_target to nil) because we were - # deleting the object they depended on. - Task.find(:all, :conditions => - [ "task_target_id IS NULL and task_target_type IS NULL" ]).each do |task| - task.destroy - end - sleep(@sleeptime) - end - end -end - -taskomatic = TaskOmatic.new() -taskomatic.mainloop() diff --git a/src/task-omatic/taskomatic_instance.rb b/src/task-omatic/taskomatic_instance.rb deleted file mode 100644 index 99161ac..0000000 --- a/src/task-omatic/taskomatic_instance.rb +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright (C) 2009 Red Hat, Inc. -# Written by Ian Main <imain(a)redhat.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. A copy of the GNU General Public License is -# also available at http://www.gnu.org/copyleft/gpl.html. - -require 'taskomatic_task' - -def dcloud_to_instance_state(state_str) - case state_str.upcase - when 'PENDING' - return Instance::STATE_PENDING - when 'RUNNING' - return Instance::STATE_RUNNING - when 'STOPPED' - return Instance::STATE_STOPPED - when 'SHUTTING_DOWN' - return Instance::STATE_SHUTTING_DOWN - else - return Instance::STATE_PENDING - end -end - -# Create a new instance on a cloud. -class TaskomaticInstanceCreate < TaskomaticTask - - def initialize(logger, task) - super(logger, task) - @logger.info("TaskomaticInstanceCreate created.") - end - - def run - @logger.info("TaskomaticInstanceCreate running.") - - client = @task.instance.portal_pool.cloud_account.connect - puts "client is #{client.type}" - @logger.info "Creating instance with name #{(a)task.instance.image.external_key}, flavor #{(a)task.instance.flavor.external_key}, realm #{(a)task.instance.realm.external_key}, name #{(a)task.instance.name}" - dcloud_instance = client.create_instance((a)task.instance.image.external_key, - :flavor => @task.instance.flavor.external_key, - :realm => @task.instance.realm.external_key, - :name => @task.instance.name) - if dcloud_instance.class == Net::HTTPInternalServerError - @task.instance.state = Instance::STATE_CREATE_FAILED - raise "Error creating dcloud instance, returned internal server error." - end - - @logger.info "Instance created with key #{dcloud_instance.id} and state #{dcloud_instance.state}" - @task.instance.external_key = dcloud_instance.id - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - while dcloud_instance.state.upcase == 'PENDING' - sleep(3) - dcloud_instance = client.instance((a)task.instance.external_key) - end - - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - # Instance::STATE_NEW - # Instance::STATE_PENDING - # Instance::STATE_RUNNING - # Instance::STATE_SHUTTING_DOWN - # Instance::STATE_STOPPED - - @logger.info("New instance created.") - end -end - -# Start a stopped instance on a cloud -class TaskomaticInstanceStart < TaskomaticTask - - def initialize(logger, task) - super(logger, task) - @logger.info("TaskomaticInstanceStart created.") - end - - def run - @logger.info("TaskomaticInstanceStart running.") - - client = @task.instance.portal_pool.cloud_account.connect - dcloud_instance = client.instance((a)task.instance.external_key) - dcloud_instance.start! - - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - @logger.info("Command completed, instance now in state #{dcloud_instance.state}") - while dcloud_instance.state.upcase == 'PENDING' - sleep(3) - dcloud_instance = client.instance((a)task.instance.external_key) - end - @logger.info("After wait, instance now in state #{dcloud_instance.state}") - - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - @logger.info("Instance started.") - end -end - -# Stop an instance. -class TaskomaticInstanceStop < TaskomaticTask - - def initialize(logger, task) - super(logger, task) - @logger.info("TaskomaticInstanceStop started.") - end - - def run - @logger.info("TaskomaticInstanceStop running.") - - client = @task.instance.portal_pool.cloud_account.connect - dcloud_instance = client.instance((a)task.instance.external_key) - dcloud_instance.stop! - - @logger.info("Command completed, instance now in state #{dcloud_instance.state}") - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - while dcloud_instance.state.upcase == 'PENDING' or dcloud_instance.state.upcase == "SHUTTING_DOWN" - sleep(3) - dcloud_instance = client.instance((a)task.instance.external_key) - end - - @logger.info("After wait, instance now in state #{dcloud_instance.state}") - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - @logger.info("Instance stopped.") - end -end - -# Reboot an instance. -class TaskomaticInstanceReboot < TaskomaticTask - - def initialize(logger, task) - super(logger, task) - @logger.info("TaskomaticInstanceReboot started.") - end - - def run - @logger.info("TaskomaticInstanceReboot running.") - - client = @task.instance.portal_pool.cloud_account.connect - dcloud_instance = client.instance((a)task.instance.external_key) - dcloud_instance.reboot! - - @logger.info("Command completed, instance now in state #{dcloud_instance.state}") - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - while dcloud_instance.state.upcase == 'PENDING' or dcloud_instance.state.upcase == "SHUTTING_DOWN" - sleep(3) - dcloud_instance = client.instance((a)task.instance.external_key) - end - - @logger.info("After wait, instance now in state #{dcloud_instance.state}") - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - @logger.info("Reboot completed.") - end -end - -# Destroy an instance. -class TaskomaticInstanceDestroy < TaskomaticTask - - def initialize(logger, task) - super(logger, task) - @logger.info("TaskomaticInstanceDestroy started.") - end - - def run - @logger.info("TaskomaticInstanceDestroy running.") - - client = @task.instance.portal_pool.cloud_account.connect - dcloud_instance = client.instance((a)task.instance.external_key) - dcloud_instance.destroy! - - @logger.info("Command completed, instance now in state #{dcloud_instance.state}") - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - while dcloud_instance.state.upcase == 'PENDING' or dcloud_instance.state.upcase == "SHUTTING_DOWN" - sleep(3) - dcloud_instance = client.instance((a)task.instance.external_key) - end - - @logger.info("After wait, instance now in state #{dcloud_instance.state}") - @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - @task.instance.save! - - @logger.info("Destroy completed.") - end -end diff --git a/src/task-omatic/taskomatic_task.rb b/src/task-omatic/taskomatic_task.rb deleted file mode 100644 index f717321..0000000 --- a/src/task-omatic/taskomatic_task.rb +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2009 Red Hat, Inc. -# Written by Ian Main <imain(a)redhat.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. A copy of the GNU General Public License is -# also available at http://www.gnu.org/copyleft/gpl.html. - - -# Create a new instance on a cloud. -class TaskomaticTask - - def initialize(logger, task) - @logger = logger - @task = task - end - -end -- 1.6.2.5

1 2

[PATCH portal] Move taskomatic into the web UI.
by Ian Main 04 Mar '10

04 Mar '10

This patch moves taskomatic inline with the web UI. The only issue here is that we don't have any way of updating the states of the instances. Note that this also requires my patch to add 'destroy' to the ruby client for destroy to work. Signed-off-by: Ian Main <imain(a)redhat.com> --- README | 4 - src/app/controllers/instance_controller.rb | 10 ++- src/app/util/taskomatic.rb | 127 ++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 5 deletions(-) create mode 100644 src/app/util/taskomatic.rb diff --git a/README b/README index 31d38d5..f1d0061 100644 --- a/README +++ b/README @@ -130,11 +130,9 @@ Next, you need to have the correct rubygems installed. If you followed the steps You should now have everyting configured and installed to run the portal. If you followed either of the RPM instructions, you can now run: * service deltacloud-mongrel-rails start - * service deltacloud-taskomatic start If you followed the development steps: * cd to your src directory and run ruby script/server - * in another terminal cd to the src/task-omatic directory and 'export RAILS_ENV=development; ruby taskomatic.rb -n' Lastly, you will need one or more instances of the Deltacloud framework running for the portal to talk to. Directions for this can be found in the framework documentation(which can be found here: git://git.fedorahosted.org/git/deltacloud/framework.git/). Assuming everything is installed for that, start a framework up in the framework directory with 'ruby script/server -p 3001' (so it is on a different port than our portal app). You should now be ready to try out the portal application. @@ -143,8 +141,6 @@ Lastly, you will need one or more instances of the Deltacloud framework running For these steps, we will assume the mock driver is setup and running in a framework on http://localhost:3001/api, and your portal is running on http://localhost:3000 (this will just be http://localhost/deltacloud if you are running through apache, and can be started with 'service deltacloud-mongrel-rails start') -Taskomatic is a separate process that checks for tasks needing to be handled for portal instances. (If you installed the rpm, you can simply start the deltacloud-taskomatic service) This can be run from the commandline from the taskomatic directory with 'ruby taskomatic -n'. If you are running in development mode, you can point taskomatic there by exporting 'RAILS_ENV=development'. Taskomatic needs to be running to do things like 'start an instance'. - When you navigate to the main page of your app, you will be presented with an 'Add cloud provider' form. 'Name' can be whatever you like, types currently suppoerted are mock, ec2, and rhevm. 'URL' is the url pointing to your framework (http://localhost:3001/api for our example). Upon successful completion of the form, you will be brought to the main page for that provider. Here you would click 'Add a pool'. This form asks you fro the username and password for the account on the provider's service that you wish to connect to. Then just provide a name for what we will call this 'pool'. Completion of this form will attempt to connect to the provider associated with this pool and gather some information such as a list of instances that this user has access to and can be started. diff --git a/src/app/controllers/instance_controller.rb b/src/app/controllers/instance_controller.rb index fc05113..73f688a 100644 --- a/src/app/controllers/instance_controller.rb +++ b/src/app/controllers/instance_controller.rb @@ -19,6 +19,8 @@ # Filters added to this controller apply to all controllers in the application. # Likewise, all the methods added will be available for all controllers. +require 'util/taskomatic' + class InstanceController < ApplicationController before_filter :require_user @@ -49,6 +51,8 @@ class InstanceController < ApplicationController :task_target => @instance, :action => InstanceTask::ACTION_CREATE}) if @task.save + task_impl = Taskomatic.new(@task) + task_impl.instance_create flash[:notice] = "Instance added." redirect_to :controller => "portal_pool", :action => 'show', :id => @instance.portal_pool_id else @@ -69,10 +73,14 @@ class InstanceController < ApplicationController raise ActionError.new("#{action} is an invalid action.") end #permissons check here - @task = @instance.queue_action(@current_user, action, action_args) + @task = @instance.queue_action(get_login_user, action, action_args) unless @task raise ActionError.new("#{action} cannot be performed on this instance.") end + + task_impl = Taskomatic.new(@task) + task_impl.send "instance_#{action}" + alert = "#{(a)instance.name}: #{action} was successfully queued." flash[:notice] = alert redirect_to :controller => "portal_pool", :action => 'show', :id => @instance.portal_pool_id diff --git a/src/app/util/taskomatic.rb b/src/app/util/taskomatic.rb new file mode 100644 index 0000000..736fda1 --- /dev/null +++ b/src/app/util/taskomatic.rb @@ -0,0 +1,127 @@ +# +# Copyright (C) 2010 Red Hat, Inc. +# Written by Ian Main <imain(a)redhat.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. A copy of the GNU General Public License is +# also available at http://www.gnu.org/copyleft/gpl.html. + + +def dcloud_to_instance_state(state_str) + case state_str.upcase + when 'PENDING' + return Instance::STATE_PENDING + when 'RUNNING' + return Instance::STATE_RUNNING + when 'STOPPED' + return Instance::STATE_STOPPED + when 'SHUTTING_DOWN' + return Instance::STATE_SHUTTING_DOWN + else + return Instance::STATE_PENDING + end +end + + +class Taskomatic + + def initialize(task) + @task = task + @logger = Logger.new('Taskomatic') + end + + def instance_create + + @task.time_started = Time.now + + begin + client = @task.instance.cloud_account.connect + realm = @task.instance.realm.external_key rescue nil + dcloud_instance = client.create_instance((a)task.instance.image.external_key, + :flavor => @task.instance.hardware_profile.external_key, + :realm => realm, + :name => @task.instance.name) + if dcloud_instance.class == Net::HTTPInternalServerError + @task.instance.state = Instance::STATE_CREATE_FAILED + raise "Error creating dcloud instance, returned internal server error." + end + + @logger.info "Task instance create completed with key #{dcloud_instance.id} and state #{dcloud_instance.state}" + @task.instance.external_key = dcloud_instance.id + @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) + @task.instance.save! + rescue Exception => ex + @task.state = Task::STATE_FAILED + @task.message = ex.message + else + @task.state = Task::STATE_FINISHED + end + @task.time_ended = Time.now + @task.save! + end + + def do_action(action) + @task.time_started = Time.now + + begin + client = @task.instance.cloud_account.connect + dcloud_instance = client.instance((a)task.instance.external_key) + dcloud_instance.send(action) + + @task.instance.state = dcloud_to_instance_state(dcloud_instance.state) + @task.instance.save! + @logger.info("Task instance '#{action}' complete, now in state #{dcloud_instance.state}.") + rescue Exception => ex + @task.state = Task::STATE_FAILED + @task.message = ex.message + else + @task.state = Task::STATE_FINISHED + end + @task.time_ended = Time.now + @task.save! + end + + def instance_start + do_action(:start!) + end + + def instance_stop + do_action(:stop!) + end + + def instance_reboot + do_action(:reboot!) + end + + def instance_destroy + @task.time_started = Time.now + + begin + client = @task.instance.cloud_account.connect + dcloud_instance = client.instance((a)task.instance.external_key) + + dcloud_instance.destroy! + + @logger.info("Task Destroy completed.") + rescue Exception => ex + @task.state = Task::STATE_FAILED + @task.message = ex.message + else + @task.state = Task::STATE_FINISHED + end + @task.time_ended = Time.now + @task.save! + end +end + -- 1.6.2.5

2 1

Fixed fetch_documentation method in client
by Michal Fojtik 04 Mar '10

04 Mar '10

Fixed one small bug in fetch_documentation method, which causes that 'list' operation in deltacloudc thows exception. (thx. to jayg)

2 2

deltacloudc error
by jason.guiditta 04 Mar '10

04 Mar '10

Just trying out deltacloudc and hit the following error, which looks like what we had with the rest-client version issue we were trying to resolve over the last couple days: [jay ~]$ deltacloudc -u http://mockuser:mockpassword@localhost:3001/api -l /usr/lib/ruby/1.8/rexml/source.rb:21:in `create_from': RestClient::Response is not a valid input stream. It must walk (RuntimeError) like either a String, an IO, or a Source. from /usr/lib/ruby/1.8/rexml/parsers/baseparser.rb:133:in `stream=' from /usr/lib/ruby/1.8/rexml/parsers/baseparser.rb:110:in `initialize' from /usr/lib/ruby/1.8/rexml/parsers/treeparser.rb:9:in `new' from /usr/lib/ruby/1.8/rexml/parsers/treeparser.rb:9:in `initialize' from /usr/lib/ruby/1.8/rexml/document.rb:227:in `new' from /usr/lib/ruby/1.8/rexml/document.rb:227:in `build' from /usr/lib/ruby/1.8/rexml/document.rb:43:in `initialize' from /usr/lib/ruby/gems/1.8/gems/deltacloud-client-0.0.2/lib/deltacloud.rb:117:in `new' from /usr/lib/ruby/gems/1.8/gems/deltacloud-client-0.0.2/lib/deltacloud.rb:117:in `fetch_documentation' from /usr/lib/ruby/gems/1.8/gems/deltacloud-client-0.0.2/bin/deltacloudc:80 from /usr/lib/ruby/gems/1.8/gems/deltacloud-client-0.0.2/bin/deltacloudc:79:in `each' from /usr/lib/ruby/gems/1.8/gems/deltacloud-client-0.0.2/bin/deltacloudc:79 from /usr/bin/deltacloudc:19:in `load' from /usr/bin/deltacloudc:19

2 2

Eucalyptus test
by graziano obertelli 02 Mar '10

02 Mar '10

Hello, talking with David, it seemed that it could be useful to have a Eucalyptus test system that you could use. We are in the process of acquiring colo space and machine to provide such system at a decent scale, but I did wanted to provide you with something sooner, so I scavanged a couple of machine around the office, and install on them the latest Eucalyptus (1.6.2). You can access it at https://98.173.24.221:8443 and apply there for an account: the node does not have email setup, so you will have to ping me for approval. Machines (only 2) and bandwith is limited, but the Eucalyptus installation is fully features (EBS, Elastic IPs etc ...). Let me know if you find it useful, not useful or if you need any other help in configuration. cheers, graziano -- Graziano Obertelli Eucalyptus Systems, Inc. 130 Castilian St. Goleta, CA 93117 Office: 805-845-8000 www.eucalyptus.com

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel March 2010