Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
AUTHORS | 2 +-
Makefile.am | 24 +-
aeolus-conductor.spec.in | 242 ++++++++++++++++++++
autogen.sh | 2 +-
conf/aeolus-conductor | 87 +++++++
conf/aeolus-conductor-httpd.conf | 23 ++
conf/aeolus-conductor.logrotate | 12 +
conf/aeolus-conductor.sysconf | 18 ++
conf/conductor-condor_refreshd | 78 +++++++
conf/conductor-dbomatic | 83 +++++++
conf/conductor-image_builder_service | 78 +++++++
conf/conductor-rails.sysconf | 6 +
conf/deltacloud-aggregator | 87 -------
conf/deltacloud-aggregator-httpd.conf | 23 --
conf/deltacloud-aggregator.logrotate | 12 -
conf/deltacloud-aggregator.sysconf | 18 --
conf/deltacloud-condor_refreshd | 78 -------
conf/deltacloud-dbomatic | 83 -------
conf/deltacloud-image_builder_service | 78 -------
conf/deltacloud-rails.sysconf | 6 -
configure.ac | 14 +-
deltacloud-aggregator.spec.in | 239 -------------------
src/app/controllers/instances_controller.rb | 2 +-
src/app/controllers/templates_controller.rb | 2 +-
src/app/helpers/application_helper.rb | 4 +-
src/app/models/hardware_profile.rb | 14 +-
src/app/models/provider.rb | 2 +-
src/app/models/realm.rb | 4 +-
src/app/stylesheets/aggregator.scss | 4 +-
src/app/stylesheets/newui.scss | 4 +-
src/app/util/condormatic.rb | 4 +-
src/app/util/conductor.rb | 45 ++++
src/app/util/deltacloud.rb | 45 ----
src/app/views/dashboard/summary.haml | 4 +-
src/app/views/layouts/aggregator.haml | 4 +-
src/app/views/permissions/new.haml | 2 +-
src/app/views/providers/_providers.haml | 4 +-
src/app/views/providers/edit.haml | 2 +-
src/app/views/providers/new.haml | 2 +-
src/app/views/providers/show.haml | 2 +-
src/app/views/quotas/edit.haml | 4 +-
src/app/views/user_sessions/new.haml | 2 +-
src/app/views/users/_form.haml | 2 +-
src/classad_plugin/Makefile.am | 10 +-
src/classad_plugin/conductor_classad_plugin.cpp | 217 ++++++++++++++++++
src/classad_plugin/deltacloud_classad_plugin.cpp | 217 ------------------
src/condor_refreshd/condor_refreshd | 4 +-
src/config/database.pg | 16 +-
src/config/database.sqlite | 4 +-
src/config/environments/production.rb | 2 +-
src/config/locales/en.yml | 10 +-
.../20090804135630_create_hardware_profiles.rb | 2 +-
src/dbomatic/dbomatic | 6 +-
src/features/hardware_profile.feature | 8 +-
src/features/instance.feature | 4 +-
.../step_definitions/hardware_profile_steps.rb | 2 +-
src/features/support/custom.rb | 2 +-
src/image_builder_service/image_builder_service | 12 +-
src/lib/tasks/dc_tasks.rake | 2 +-
src/public/javascripts/application.js | 12 +-
src/script/server | 2 +-
src/script/use-existing-ec2-templates | 4 +-
src/spec/fixtures/packagegroups.json | 10 +-
src/spec/fixtures/packages.json | 8 +-
src/spec/models/cloud_account_observer_spec.rb | 2 +-
src/spec/models/cloud_account_spec.rb | 4 +-
src/spec/models/hardware_profile_spec.rb | 18 +-
src/spec/models/provider_spec.rb | 3 +-
.../services/data_service_active_record_spec.rb | 6 +-
src/spec/utils/repository_manager_spec.rb | 2 +-
src/test/unit/provider_test.rb | 2 +-
71 files changed, 1019 insertions(+), 1023 deletions(-)
create mode 100644 aeolus-conductor.spec.in
create mode 100644 conf/aeolus-conductor
create mode 100644 conf/aeolus-conductor-httpd.conf
create mode 100644 conf/aeolus-conductor.logrotate
create mode 100644 conf/aeolus-conductor.sysconf
create mode 100644 conf/conductor-condor_refreshd
create mode 100644 conf/conductor-dbomatic
create mode 100644 conf/conductor-image_builder_service
create mode 100644 conf/conductor-rails.sysconf
delete mode 100755 conf/deltacloud-aggregator
delete mode 100644 conf/deltacloud-aggregator-httpd.conf
delete mode 100644 conf/deltacloud-aggregator.logrotate
delete mode 100644 conf/deltacloud-aggregator.sysconf
delete mode 100755 conf/deltacloud-condor_refreshd
delete mode 100755 conf/deltacloud-dbomatic
delete mode 100755 conf/deltacloud-image_builder_service
delete mode 100644 conf/deltacloud-rails.sysconf
delete mode 100644 deltacloud-aggregator.spec.in
create mode 100644 src/app/util/conductor.rb
delete mode 100644 src/app/util/deltacloud.rb
create mode 100644 src/classad_plugin/conductor_classad_plugin.cpp
delete mode 100644 src/classad_plugin/deltacloud_classad_plugin.cpp
diff --git a/AUTHORS b/AUTHORS
index 8f7cc64..39d93a7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
- deltacloud-aggregator Authors
+ aeolus-conductor Authors
=========================
The primary maintainers and people with commit access rights:
diff --git a/Makefile.am b/Makefile.am
index b9de310..64d0303 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,28 +15,28 @@
# MA 02110-1301, USA. A copy of the GNU General Public License is
# also available at
http://www.gnu.org/copyleft/gpl.html.
-DELTACLOUD_CACHE_DIR ?= $(HOME)/deltacloud-cache
+CONDUCTOR_CACHE_DIR ?= $(HOME)/conductor-cache
EXTRA_DIST = \
.gitignore \
- deltacloud-aggregator.spec \
- deltacloud-aggregator.spec.in \
- conf \
+ aeolus-conductor.spec \
+ aeolus-conductor.spec.in \
+ conf \
src
DISTCLEANFILES = $(PACKAGE)-$(VERSION).tar.gz
-# For Release: 0..., set _deltacloud_dev=1 so that we get extra_release.GIT-
+# For Release: 0..., set _conductor_dev=1 so that we get extra_release.GIT-
# annotated rpm version strings.
-_deltacloud_dev = \
+_conductor_dev = \
$(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
$(srcdir)/*.spec.in && echo 1 || :)
git_head = $$(git log -1 --pretty=format:%h)
GIT_RELEASE = $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
RPMDIR = $$(rpm --eval '%{_rpmdir}')
-RPM_FLAGS = --define "deltacloud_cache_dir $(DELTACLOUD_CACHE_DIR)"
-RPM_FLAGS += $(if $(_deltacloud_dev),--define "extra_release .$(GIT_RELEASE)")
+RPM_FLAGS = --define "conductor_cache_dir $(CONDUCTOR_CACHE_DIR)"
+RPM_FLAGS += $(if $(_conductor_dev),--define "extra_release .$(GIT_RELEASE)")
SUBDIRS = src/classad_plugin
@@ -49,10 +49,10 @@ srpms: dist
rpmbuild $(RPM_FLAGS) -ts $(distdir).tar.gz
publish: rpms
- mkdir -p $(DELTACLOUD_CACHE_DIR)
- rsync -aq $(shell rpm --eval '%{_rpmdir}')/ $(DELTACLOUD_CACHE_DIR)/deltacloud/
- rsync -aq $(shell rpm --eval '%{_srcrpmdir}')/
$(DELTACLOUD_CACHE_DIR)/deltacloud/src
- createrepo $(DELTACLOUD_CACHE_DIR)/deltacloud
+ mkdir -p $(CONDUCTOR_CACHE_DIR)
+ rsync -aq $(shell rpm --eval '%{_rpmdir}')/ $(CONDUCTOR_CACHE_DIR)/conductor/
+ rsync -aq $(shell rpm --eval '%{_srcrpmdir}')/
$(CONDUCTOR_CACHE_DIR)/conductor/src
+ createrepo $(CONDUCTOR_CACHE_DIR)/conductor
genlangs:
cd src && rake updatepo && rake makemo
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
new file mode 100644
index 0000000..36fc264
--- /dev/null
+++ b/aeolus-conductor.spec.in
@@ -0,0 +1,242 @@
+%define app_root %{_datadir}/%{name}
+%define doc_root %{_datadir}/%{name}-doc
+
+Name: aeolus-conductor
+Version: @VERSION@
+Release: 0%{?dist}%{?extra_release}
+Summary: The Aeolus Conductor
+
+Group: Applications/System
+License: GPLv2+ and MIT and BSD
+URL:
http://aeolusproject.org
+
+Source0: aeolus-conductor-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires: ruby >= 1.8.1
+Requires: ruby(abi) = 1.8
+Requires: rubygem(rails) >= 2.1.1
+Requires: rubygem(haml)
+Requires: rubygem(nokogiri) >= 1.4.0
+Requires: rubygem(will_paginate)
+Requires: rubygem(parseconfig)
+Requires: rubygem(authlogic)
+Requires: rubygem(deltacloud-client) >= 0.0.9.8
+Requires: rubygem(compass)
+Requires: rubygem(compass-960-plugin)
+Requires: rubygem(simple-navigation)
+Requires: rubygem(typhoeus)
+Requires: rubygem(rb-inotify)
+Requires: rubygem(builder)
+Requires: rubygem(json)
+Requires: rubygem(deltacloud-image-builder-agent)
+Requires: rubygem(imagebuilder-console)
+Requires: rubygem(rack-restful_submit)
+Requires: rubygem(sunspot_rails)
+Requires: postgresql
+Requires: postgresql-server
+Requires: ruby-postgres
+Requires: ruby-RMagick
+Requires: classads >= 1.0
+Requires: condor >= 7.5.5-10dcloud
+Requires: iwhd
+Requires: aeolus-configure
+
+BuildRequires: ruby
+BuildRequires: ruby-devel
+BuildRequires: classads-devel >= 1.0
+
+%package daemons
+Summary: Aeolus Conductor daemons
+Group: Applications/Internet
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
+Requires: httpd >= 2.0
+Requires: rubygem(thin) >= 1.2.5
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+
+
+%package doc
+Summary: Aeolus Conductor documentation and test suite
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+
+%description
+The Aeolus Conductor, a web UI for managing cloud instances.
+
+%description daemons
+The configuration and daemons necessary to run and proxy the Aeolus Conductor.
+
+%description doc
+Documentation and tests for the Aeolus Conductor.
+
+%prep
+%setup -q
+
+%build
+%configure
+make
+
+%install
+%{__rm} -rf %{buildroot}
+
+%{__mkdir} -p %{buildroot}
+%{__mkdir} -p %{buildroot}%{app_root}
+%{__mkdir} -p %{buildroot}%{doc_root}
+%{__mkdir} -p %{buildroot}%{_initrddir}
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d
+
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/%{name}
+%{__mkdir} -p %{buildroot}%{_localstatedir}/lib/%{name}
+%{__mkdir} -p %{buildroot}%{_localstatedir}/log/%{name}
+%{__mkdir} -p %{buildroot}%{_localstatedir}/run/%{name}
+
+# copy over all of the src directory...
+%{__cp} -R src/* %{buildroot}/%{app_root}
+
+# we need to make sure there are no leftover logfiles getting pulled in
+rm -f %{buildroot}/%{app_root}/log/*
+
+# Remove this directory as the make install below will install the correct files to this
dir.
+%{__rm} -rf %{buildroot}%{app_root}/classad_plugin
+
+%makeinstall
+
+# move documentation to the correct place
+mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc_root}
+
+# copy over init scripts and various config
+%{__cp} conf/aeolus-conductor %{buildroot}%{_initrddir}
+%{__cp} conf/conductor-dbomatic %{buildroot}%{_initrddir}
+%{__cp} conf/conductor-condor_refreshd %{buildroot}%{_initrddir}
+%{__cp} conf/conductor-image_builder_service %{buildroot}%{_initrddir}
+%{__cp} conf/aeolus-conductor-httpd.conf
%{buildroot}%{_sysconfdir}/httpd/conf.d/aeolus-conductor.conf
+%{__cp} conf/aeolus-conductor.logrotate
%{buildroot}%{_sysconfdir}/logrotate.d/aeolus-conductor
+%{__cp} conf/aeolus-conductor.sysconf
%{buildroot}%{_sysconfdir}/sysconfig/aeolus-conductor
+%{__cp} conf/conductor-rails.sysconf
%{buildroot}%{_sysconfdir}/sysconfig/conductor-rails
+
+# move rails config to /etc, creating symlinks
+if [ -f %{buildroot}%{app_root}/config/database.yml ]; then
+ %{__mv} %{buildroot}%{app_root}/config/database.yml
%{buildroot}%{_sysconfdir}/%{name}
+else
+ %{__cp} %{buildroot}%{app_root}/config/database.pg
%{buildroot}%{_sysconfdir}/%{name}/database.yml
+fi
+%{__mv} %{buildroot}%{app_root}/config/environments/development.rb
%{buildroot}%{_sysconfdir}/%{name}
+%{__mv} %{buildroot}%{app_root}/config/environments/production.rb
%{buildroot}%{_sysconfdir}/%{name}
+%{__mv} %{buildroot}%{app_root}/config/environments/test.rb
%{buildroot}%{_sysconfdir}/%{name}
+%{__ln_s} %{_sysconfdir}/%{name}/database.yml %{buildroot}%{app_root}/config
+%{__ln_s} %{_sysconfdir}/%{name}/development.rb
%{buildroot}%{app_root}/config/environments
+%{__ln_s} %{_sysconfdir}/%{name}/production.rb
%{buildroot}%{app_root}/config/environments
+%{__ln_s} %{_sysconfdir}/%{name}/test.rb %{buildroot}%{app_root}/config/environments
+%{__mkdir} -p %{buildroot}%{app_root}/config/image_descriptor_xmls
+
+# Creating these files now to make sure the logfiles will be owned
+# by aeolus:aeolus. 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}/rails.log
+touch %{buildroot}%{_localstatedir}/log/%{name}/dbomatic.log
+touch %{buildroot}%{_localstatedir}/run/%{name}/event_log_position
+touch %{buildroot}%{_localstatedir}/log/%{name}/condor_refreshd.log
+touch %{buildroot}%{_localstatedir}/log/%{name}/image_builder_service.log
+
+# remove the files not needed for the installation
+%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore
+%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest
+
+%{__rm} -rf %{buildroot}%{app_root}/tmp
+%{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp
+%{__ln_s} %{_localstatedir}/lib/%{name}/tmp %{buildroot}%{app_root}/tmp
+
+%{__rm} -rf %{buildroot}%{app_root}/tmp
+
+# Delete unused build stuff.
+%{__rm} -rf %{buildroot}%{app_root}/classad_plugin/.libs
+%{__rm} -rf %{buildroot}%{app_root}/classad_plugin/.deps
+
+%clean
+%{__rm} -rf %{buildroot}
+
+#%check
+#rake spec
+
+%pre daemons
+getent group aeolus >/dev/null || /usr/sbin/groupadd -g 109 -r aeolus 2>/dev/null
|| :
+getent passwd aeolus >/dev/null || \
+ /usr/sbin/useradd -u 109 -g aeolus -c "aeolus" \
+ -s /sbin/nologin -r -d /var/aeolus aeolus 2> /dev/null || :
+
+%post daemons
+# Register the services
+/sbin/chkconfig --add aeolus-conductor
+/sbin/chkconfig --add conductor-dbomatic
+/sbin/chkconfig --add conductor-condor_refreshd
+/sbin/chkconfig --add conductor-image_builder_service
+
+%preun daemons
+if [ $1 = 0 ]; then
+/sbin/service aeolus-conductor stop > /dev/null 2>&1
+/sbin/chkconfig --del aeolus-conductor
+/sbin/service conductor-dbomatic stop > /dev/null 2>&1
+/sbin/chkconfig --del conductor-dbomatic
+/sbin/service conductor-condor_refreshd stop > /dev/null 2>&1
+/sbin/chkconfig --del conductor-condor_refreshd
+/sbin/service conductor-image_builder_service stop > /dev/null 2>&1
+/sbin/chkconfig --del conductor-image_builder_service
+fi
+
+%files
+%defattr(-,root,root,-)
+%{app_root}
+%attr(777, root, root) %{app_root}/config/image_descriptor_xmls
+%attr(777, root, root) %{app_root}/public
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/database.yml
+%config(noreplace) %{_sysconfdir}/%{name}/development.rb
+%config(noreplace) %{_sysconfdir}/%{name}/production.rb
+%config(noreplace) %{_sysconfdir}/%{name}/test.rb
+%doc AUTHORS COPYING
+
+%files daemons
+%defattr(-,root,root,-)
+%{_initrddir}/aeolus-conductor
+%{_initrddir}/conductor-dbomatic
+%{_initrddir}/conductor-condor_refreshd
+%{_initrddir}/conductor-image_builder_service
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/aeolus-conductor
+%config(noreplace) %{_sysconfdir}/sysconfig/conductor-rails
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%attr(-, aeolus, aeolus) %{_localstatedir}/lib/%{name}
+%attr(-, aeolus, aeolus) %{_localstatedir}/run/%{name}
+%attr(-, aeolus, aeolus) %{_localstatedir}/log/%{name}
+%doc AUTHORS COPYING
+
+%files doc
+%defattr(-,root,root,-)
+%{doc_root}
+%doc AUTHORS COPYING
+
+%changelog
+* Thu Jan 20 2011 Chris Lalancette <clalance(a)redhat.com>
+- Rename from deltacloud-aggregator to aeolus-conductor
+
+* Mon Sep 27 2010 Chris Lalancette <clalance(a)redhat.com>
+- Added new rubygem-parseconfig dependency
+- Turn on services during install with chkconfig
+
+* Sat Mar 6 2010 Ian Main <imain(a)redhat.com> - 0.0.2-2
+- removed taskomatic from packaging.
+
+* Wed Feb 18 2010 Mohammed Morsi <mmorsi(a)redhat.com> - 0.0.2-1
+- renamed portal to aggregator
+- updated / cleaned up package
+
+* Fri Sep 1 2009 <sseago(a)redhat.com> - 0.0.1-1
+- Initial build.
+
diff --git a/autogen.sh b/autogen.sh
index bce073a..24aae29 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -40,7 +40,7 @@ THEDIR=`pwd`
test $die = 1 && exit 1
- test -f deltacloud-aggregator.spec.in || {
+ test -f aeolus-conductor.spec.in || {
echo "You must run this script in the top-level directory"
exit 1
}
diff --git a/conf/aeolus-conductor b/conf/aeolus-conductor
new file mode 100644
index 0000000..80facb6
--- /dev/null
+++ b/conf/aeolus-conductor
@@ -0,0 +1,87 @@
+#!/bin/bash
+#
+#
+# aeolus-conductor startup script for aeolus-conductor
+#
+# chkconfig: - 99 01
+# description: aeolus-conductor is the primary server process for the
+# Aeolus Conductor
+#
+
+[ -r /etc/sysconfig/conductor-rails ] && . /etc/sysconfig/conductor-rails
+
+[ -r /etc/sysconfig/aeolus-conductor ] && . /etc/sysconfig/aeolus-conductor
+
+RAILS_ENV="${RAILS_ENV:-production}"
+CONDUCTOR_DIR="${CONDUCTOR_DIR:-/usr/share/aeolus-conductor}"
+THIN_LOG="${THIN_LOG:-/var/log/aeolus-conductor/thin.log}"
+THIN_PID="${THIN_PID:-/var/run/aeolus-conductor/thin.pid}"
+THIN_LOCKFILE="${THIN_LOCKFILE:-/var/lock/subsys/aeolus-conductor}"
+AEOLUS_USER="${AEOLUS_USER:-aeolus}"
+AEOLUS_GROUP="${AEOLUS_GROUP:-aeolus}"
+PREFIX="${PREFIX:-/conductor}"
+ADAPTER="${ADAPTER:-rails}"
+
+THIN_PROG=thin
+ADDR=127.0.0.1
+RETVAL=0
+
+. /etc/init.d/functions
+
+start() {
+ echo -n "Starting aeolus-conductor: "
+
+ $THIN_PROG start -c $CONDUCTOR_DIR -l $THIN_LOG -P $THIN_PID \
+ -a $ADDR -e $RAILS_ENV --user $AEOLUS_USER --group $AEOLUS_GROUP \
+ -d --prefix=$PREFIX -A $ADAPTER
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] && touch $THIN_LOCKFILE ; then
+ echo_success
+ echo
+ else
+ echo_failure
+ echo
+ fi
+
+}
+
+stop() {
+ echo -n "Shutting down aeolus-conductor: "
+ $THIN_PROG stop -c $CONDUCTOR_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: aeolus-conductor {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+exit $RETVAL
diff --git a/conf/aeolus-conductor-httpd.conf b/conf/aeolus-conductor-httpd.conf
new file mode 100644
index 0000000..2b211b2
--- /dev/null
+++ b/conf/aeolus-conductor-httpd.conf
@@ -0,0 +1,23 @@
+NameVirtualHost *:80
+<VirtualHost *:80>
+
+ ErrorLog /etc/httpd/logs/error_log
+ TransferLog /etc/httpd/logs/access_log
+ LogLevel warn
+
+ ProxyRequests Off
+
+Alias /conductor/stylesheets "/usr/share/aeolus-conductor/public/stylesheets"
+Alias /conductor/images "/usr/share/aeolus-conductor/public/images"
+Alias /conductor/errors "/usr/share/aeolus-conductor/public/"
+
+ProxyPass /conductor/images !
+ProxyPass /conductor/stylesheets !
+ProxyPass /conductor/errors !
+ProxyPass /conductor
http://localhost:3000/conductor
+ProxyPassReverse /conductor
http://localhost:3000/conductor
+ProxyPassReverse /conductor/images !
+ProxyPassReverse /conductor/stylesheets !
+ProxyPassReverse /conductor/errors !
+
+</VirtualHost>
diff --git a/conf/aeolus-conductor.logrotate b/conf/aeolus-conductor.logrotate
new file mode 100644
index 0000000..f8df8b4
--- /dev/null
+++ b/conf/aeolus-conductor.logrotate
@@ -0,0 +1,12 @@
+weekly
+rotate 52
+compress
+missingok
+notifempty
+
+/var/log/aeolus-conductor/rails.log /var/log/aeolus-conductor/thin.log {
+ sharedscripts
+ postrotate
+ /etc/init.d/aeolus-conductor restart
+ endscript
+}
diff --git a/conf/aeolus-conductor.sysconf b/conf/aeolus-conductor.sysconf
new file mode 100644
index 0000000..f6b1b9b
--- /dev/null
+++ b/conf/aeolus-conductor.sysconf
@@ -0,0 +1,18 @@
+# root directory of the Aeolus Conductor Rails application
+#CONDUCTOR_DIR=/usr/share/aeolus-conductor
+
+# location of the logfile
+#THIN_LOG=/var/log/aeolus-conductor/thin.log
+
+# location of the lockfile
+#THIN_LOCKFILE=/var/lock/subsys/aeolus-conductor
+
+# location of the file containing running process ID
+#THIN_PID=/var/run/aeolus-conductor/thin.pid
+
+# user and group under which Rails application runs
+#CONDUCTOR_USER=aeolus
+#CONDUCTOR_GROUP=aeolus
+
+# URL prefix for Rails application
+#PREFIX=/conductor
diff --git a/conf/conductor-condor_refreshd b/conf/conductor-condor_refreshd
new file mode 100644
index 0000000..0bdd369
--- /dev/null
+++ b/conf/conductor-condor_refreshd
@@ -0,0 +1,78 @@
+#!/bin/bash
+#
+#
+# conductor-condor_refreshd startup script for conductor-condor_refreshd
+#
+# chkconfig: - 99 01
+# description: conductor-condor_refreshd populates the Conductor scheduler
+# from the Aeolus Conductor db
+
+[ -r /etc/sysconfig/conductor-rails ] && . /etc/sysconfig/conductor-rails
+
+[ -r /etc/sysconfig/aeolus-conductor ] && . /etc/sysconfig/aeolus-conductor
+
+CONDUCTOR_DIR="${CONDUCTOR_DIR:-/usr/share/aeolus-conductor}"
+REFRESHD_LOG="${REFRESHD_LOG:-/var/log/aeolus-conductor/condor_refreshd.log}"
+REFRESHD_PID="${REFRESHD_PID:-/var/run/aeolus-conductor/condor_refreshd.pid}"
+REFRESHD_LOCKFILE="${REFRESHD_LOCKFILE:-/var/lock/subsys/conductor-condor_refreshd}"
+AEOLUS_USER="${AEOLUS_USER:-aeolus}"
+
+REFRESHD_PATH=$CONDUCTOR_DIR/condor_refreshd
+REFRESHD_PROG=condor_refreshd
+
+. /etc/init.d/functions
+
+start() {
+ echo -n "Starting conductor-condor_refreshd: "
+
+ daemon --user=$AEOLUS_USER $REFRESHD_PATH/$REFRESHD_PROG
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] && touch $REFRESHD_LOCKFILE ; then
+ echo_success
+ echo
+ else
+ echo_failure
+ echo
+ fi
+}
+
+stop() {
+ echo -n "Shutting down conductor-condor_refreshd: "
+ killproc -p $REFRESHD_PID $REFRESHD_PROG
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] && rm -f $REFRESHD_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 -p $REFRESHD_PID $REFRESHD_PROG
+ RETVAL=$?
+ ;;
+ *)
+ echo "Usage: conductor-condor_refreshd {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+exit $RETVAL
diff --git a/conf/conductor-dbomatic b/conf/conductor-dbomatic
new file mode 100644
index 0000000..d5a40e9
--- /dev/null
+++ b/conf/conductor-dbomatic
@@ -0,0 +1,83 @@
+#!/bin/bash
+#
+#
+# conductor-dbomatic startup script for conductor-dbomatic
+#
+# chkconfig: - 99 01
+# description: conductor-dbomatic populates the Aeolus Conductor db from
+# the Conductor scheduler's output.
+
+[ -r /etc/sysconfig/conductor-rails ] && . /etc/sysconfig/conductor-rails
+
+[ -r /etc/sysconfig/aeolus-conductor ] && . /etc/sysconfig/aeolus-conductor
+
+CONDUCTOR_DIR="${CONDUCTOR_DIR:-/usr/share/aeolus-conductor}"
+DBOMATIC_LOG="${DBOMATIC_LOG:-/var/log/aeolus-conductor/dbomatic.log}"
+DBOMATIC_PID="${DBOMATIC_PID:-/var/run/aeolus-conductor/dbomatic.pid}"
+DBOMATIC_LOCKFILE="${DBOMATIC_LOCKFILE:-/var/lock/subsys/conductor-dbomatic }"
+AEOLUS_USER="${AEOLUS_USER:-aeolus}"
+
+DBOMATIC_PATH=$CONDUCTOR_DIR/dbomatic
+DBOMATIC_PROG=dbomatic
+
+. /etc/init.d/functions
+
+start() {
+ echo -n "Starting conductor-dbomatic: "
+
+ if test -f $DBOMATIC_LOCKFILE ; then
+ echo_success
+ echo
+ else
+ daemon --user=$AEOLUS_USER $DBOMATIC_PATH/$DBOMATIC_PROG
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] && touch $DBOMATIC_LOCKFILE ; then
+ echo_success
+ echo
+ else
+ echo_failure
+ echo
+ fi
+ fi
+}
+
+stop() {
+ echo -n "Shutting down conductor-dbomatic: "
+ killproc -p $DBOMATIC_PID $DBOMATIC_PROG
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] && rm -f $DBOMATIC_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 -p $DBOMATIC_PID $DBOMATIC_PROG
+ RETVAL=$?
+ ;;
+ *)
+ echo "Usage: conductor-dbomatic {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+exit $RETVAL
diff --git a/conf/conductor-image_builder_service b/conf/conductor-image_builder_service
new file mode 100644
index 0000000..947b0ac
--- /dev/null
+++ b/conf/conductor-image_builder_service
@@ -0,0 +1,78 @@
+#!/bin/bash
+#
+#
+# conductor-image_builder_service startup script for
conductor-image_builder_service
+#
+# chkconfig: - 93 07
+# description: conductor-image_builder_service builds cloud images
+# from the Aeolus Conductor db
+
+[ -r /etc/sysconfig/conductor-rails ] && . /etc/sysconfig/conductor-rails
+
+[ -r /etc/sysconfig/aeolus-conductor ] && . /etc/sysconfig/aeolus-conductor
+
+CONDUCTOR_DIR="${CONDUCTOR_DIR:-/usr/share/aeolus-conductor}"
+BUILDER_LOG="${BUILDER_LOG:-/var/log/aeolus-conductor/image_builder_service.log}"
+BUILDER_PID="${BUILDER_PID:-/var/run/aeolus-conductor/image_builder_service.pid}"
+BUILDER_LOCKFILE="${BUILDER_LOCKFILE:-/var/lock/subsys/conductor-image_builder_service}"
+AEOLUS_USER="${AEOLUS_USER:-aeolus}"
+
+BUILDER_PATH=$CONDUCTOR_DIR/image_builder_service
+BUILDER_PROG=image_builder_service
+
+. /etc/init.d/functions
+
+start() {
+ echo -n "Starting conductor-image_builder_service: "
+
+ daemon --user=$AEOLUS_USER $BUILDER_PATH/$BUILDER_PROG
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] && touch $BUILDER_LOCKFILE ; then
+ echo_success
+ echo
+ else
+ echo_failure
+ echo
+ fi
+}
+
+stop() {
+ echo -n "Shutting down conductor-image_builder_service: "
+ killproc -p $BUILDER_PID $BUILDER_PROG
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] && rm -f $BUILDER_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 -p $BUILDER_PID $BUILDER_PROG
+ RETVAL=$?
+ ;;
+ *)
+ echo "Usage: conductor-image_builder_service
{start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+exit $RETVAL
diff --git a/conf/conductor-rails.sysconf b/conf/conductor-rails.sysconf
new file mode 100644
index 0000000..6f87ec9
--- /dev/null
+++ b/conf/conductor-rails.sysconf
@@ -0,0 +1,6 @@
+# sets ruby on Rails environment / mode of operation
+#
http://wiki.rubyonrails.org/rails/pages/Environments
+#
+# NOTE: This needs to be set to some value in order for all of the
+# daemons to access the same database
+export RAILS_ENV=production
diff --git a/conf/deltacloud-aggregator b/conf/deltacloud-aggregator
deleted file mode 100755
index d30dc86..0000000
--- a/conf/deltacloud-aggregator
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#
-#
-# deltacloud-aggregator startup script for deltacloud-aggregator
-#
-# chkconfig: - 99 01
-# 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-aggregator}"
-THIN_LOG="${THIN_LOG:-/var/log/deltacloud-aggregator/thin.log}"
-THIN_PID="${THIN_PID:-/var/run/deltacloud-aggregator/thin.pid}"
-THIN_LOCKFILE="${THIN_LOCKFILE:-/var/lock/subsys/deltacloud-aggregator }"
-DCLOUD_USER="${DCLOUD_USER:-dcloud}"
-DCLOUD_GROUP="${DCLOUD_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: "
-
- $THIN_PROG start -c $DELTACLOUD_DIR -l $THIN_LOG -P $THIN_PID \
- -a $ADDR -e $RAILS_ENV --user $DCLOUD_USER --group $DCLOUD_GROUP \
- -d --prefix=$PREFIX -A $ADAPTER
- 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-httpd.conf
b/conf/deltacloud-aggregator-httpd.conf
deleted file mode 100644
index 6ef80b8..0000000
--- a/conf/deltacloud-aggregator-httpd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-NameVirtualHost *:80
-<VirtualHost *:80>
-
- ErrorLog /etc/httpd/logs/error_log
- TransferLog /etc/httpd/logs/access_log
- LogLevel warn
-
- ProxyRequests Off
-
-Alias /deltacloud/stylesheets
"/usr/share/deltacloud-aggregator/public/stylesheets"
-Alias /deltacloud/images "/usr/share/deltacloud-aggregator/public/images"
-Alias /deltacloud/errors "/usr/share/deltacloud-aggregator/public/"
-
-ProxyPass /deltacloud/images !
-ProxyPass /deltacloud/stylesheets !
-ProxyPass /deltacloud/errors !
-ProxyPass /deltacloud
http://localhost:3000/deltacloud
-ProxyPassReverse /deltacloud
http://localhost:3000/deltacloud
-ProxyPassReverse /deltacloud/images !
-ProxyPassReverse /deltacloud/stylesheets !
-ProxyPassReverse /deltacloud/errors !
-
-</VirtualHost>
diff --git a/conf/deltacloud-aggregator.logrotate b/conf/deltacloud-aggregator.logrotate
deleted file mode 100644
index 3d10fd9..0000000
--- a/conf/deltacloud-aggregator.logrotate
+++ /dev/null
@@ -1,12 +0,0 @@
-weekly
-rotate 52
-compress
-missingok
-notifempty
-
-/var/log/deltacloud-aggregator/rails.log /var/log/deltacloud-aggregator/thin.log {
- sharedscripts
- postrotate
- /etc/init.d/deltacloud-aggregator restart
- endscript
-}
diff --git a/conf/deltacloud-aggregator.sysconf b/conf/deltacloud-aggregator.sysconf
deleted file mode 100644
index 0959ed1..0000000
--- a/conf/deltacloud-aggregator.sysconf
+++ /dev/null
@@ -1,18 +0,0 @@
-# root directory of the Deltacloud Aggregator Rails application
-#DELTACLOUD_DIR=/usr/share/deltacloud-aggregator
-
-# location of the logfile
-#THIN_LOG=/var/log/deltacloud-aggregator/thin.log
-
-# location of the lockfile
-#THIN_LOCKFILE=/var/lock/subsys/deltacloud-aggregator
-
-# location of the file containing running process ID
-#THIN_PID=/var/run/deltacloud-aggregator/thin.pid
-
-# user and group under which Rails application runs
-#DCLOUD_USER=dcloud
-#DCLOUD_GROUP=dcloud
-
-# URL prefix for Rails application
-#PREFIX=/deltacloud
diff --git a/conf/deltacloud-condor_refreshd b/conf/deltacloud-condor_refreshd
deleted file mode 100755
index 51a348a..0000000
--- a/conf/deltacloud-condor_refreshd
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-#
-#
-# deltacloud-condor_refreshd startup script for deltacloud-condor_refreshd
-#
-# chkconfig: - 99 01
-# description: deltacloud-condor_refreshd populates the Deltacloud Scheduler
-# from the Deltacloud Aggregator db
-
-[ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails
-
-[ -r /etc/sysconfig/deltacloud-aggregator ] && .
/etc/sysconfig/deltacloud-aggregator
-
-DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}"
-REFRESHD_LOG="${REFRESHD_LOG:-/var/log/deltacloud-aggregator/condor_refreshd.log}"
-REFRESHD_PID="${REFRESHD_PID:-/var/run/deltacloud-aggregator/condor_refreshd.pid}"
-REFRESHD_LOCKFILE="${REFRESHD_LOCKFILE:-/var/lock/subsys/deltacloud-condor_refreshd}"
-DCLOUD_USER="${DCLOUD_USER:-dcloud}"
-
-REFRESHD_PATH=/usr/share/deltacloud-aggregator/condor_refreshd
-REFRESHD_PROG=condor_refreshd
-
-. /etc/init.d/functions
-
-start() {
- echo -n "Starting deltacloud-condor_refreshd: "
-
- daemon --user=$DCLOUD_USER $REFRESHD_PATH/$REFRESHD_PROG
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && touch $REFRESHD_LOCKFILE ; then
- echo_success
- echo
- else
- echo_failure
- echo
- fi
-}
-
-stop() {
- echo -n "Shutting down deltacloud-condor_refreshd: "
- killproc -p $REFRESHD_PID $REFRESHD_PROG
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && rm -f $REFRESHD_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 -p $REFRESHD_PID $REFRESHD_PROG
- RETVAL=$?
- ;;
- *)
- echo "Usage: deltacloud-condor_refreshd {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-exit $RETVAL
diff --git a/conf/deltacloud-dbomatic b/conf/deltacloud-dbomatic
deleted file mode 100755
index 020b042..0000000
--- a/conf/deltacloud-dbomatic
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-#
-#
-# deltacloud-dbomatic startup script for deltacloud-dbomatic
-#
-# chkconfig: - 99 01
-# description: deltacloud-dbomatic populates the Deltacloud Aggregator
-# db from the Deltacloud scheduler's output.
-
-[ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails
-
-[ -r /etc/sysconfig/deltacloud-aggregator ] && .
/etc/sysconfig/deltacloud-aggregator
-
-DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}"
-DBOMATIC_LOG="${DBOMATIC_LOG:-/var/log/deltacloud-aggregator/dbomatic.log}"
-DBOMATIC_PID="${DBOMATIC_PID:-/var/run/deltacloud-aggregator/dbomatic.pid}"
-DBOMATIC_LOCKFILE="${DBOMATIC_LOCKFILE:-/var/lock/subsys/deltacloud-dbomatic
}"
-DCLOUD_USER="${DCLOUD_USER:-dcloud}"
-
-DBOMATIC_PATH=/usr/share/deltacloud-aggregator/dbomatic
-DBOMATIC_PROG=dbomatic
-
-. /etc/init.d/functions
-
-start() {
- echo -n "Starting deltacloud-dbomatic: "
-
- if test -f $DBOMATIC_LOCKFILE ; then
- echo_success
- echo
- else
- daemon --user=$DCLOUD_USER $DBOMATIC_PATH/$DBOMATIC_PROG
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && touch $DBOMATIC_LOCKFILE ; then
- echo_success
- echo
- else
- echo_failure
- echo
- fi
- fi
-}
-
-stop() {
- echo -n "Shutting down deltacloud-dbomatic: "
- killproc -p $DBOMATIC_PID $DBOMATIC_PROG
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && rm -f $DBOMATIC_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 -p $DBOMATIC_PID $DBOMATIC_PROG
- RETVAL=$?
- ;;
- *)
- echo "Usage: deltacloud-dbomatic {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-exit $RETVAL
diff --git a/conf/deltacloud-image_builder_service
b/conf/deltacloud-image_builder_service
deleted file mode 100755
index 9045686..0000000
--- a/conf/deltacloud-image_builder_service
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-#
-#
-# deltacloud-image_builder_service startup script for
deltacloud-image_builder_service
-#
-# chkconfig: - 93 07
-# description: deltacloud-image_builder_service builds cloud images
-# from the Deltacloud Aggregator db
-
-[ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails
-
-[ -r /etc/sysconfig/deltacloud-aggregator ] && .
/etc/sysconfig/deltacloud-aggregator
-
-DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}"
-BUILDER_LOG="${BUILDER_LOG:-/var/log/deltacloud-aggregator/image_builder_service.log}"
-BUILDER_PID="${BUILDER_PID:-/var/run/deltacloud-aggregator/image_builder_service.pid}"
-BUILDER_LOCKFILE="${BUILDER_LOCKFILE:-/var/lock/subsys/deltacloud-image_builder_service}"
-DCLOUD_USER="${DCLOUD_USER:-dcloud}"
-
-BUILDER_PATH=/usr/share/deltacloud-aggregator/image_builder_service
-BUILDER_PROG=image_builder_service
-
-. /etc/init.d/functions
-
-start() {
- echo -n "Starting deltacloud-image_builder_service: "
-
- daemon --user=$DCLOUD_USER $BUILDER_PATH/$BUILDER_PROG
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && touch $BUILDER_LOCKFILE ; then
- echo_success
- echo
- else
- echo_failure
- echo
- fi
-}
-
-stop() {
- echo -n "Shutting down deltacloud-image_builder_service: "
- killproc -p $BUILDER_PID $BUILDER_PROG
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && rm -f $BUILDER_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 -p $BUILDER_PID $BUILDER_PROG
- RETVAL=$?
- ;;
- *)
- echo "Usage: deltacloud-image_builder_service
{start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-exit $RETVAL
diff --git a/conf/deltacloud-rails.sysconf b/conf/deltacloud-rails.sysconf
deleted file mode 100644
index 6f87ec9..0000000
--- a/conf/deltacloud-rails.sysconf
+++ /dev/null
@@ -1,6 +0,0 @@
-# sets ruby on Rails environment / mode of operation
-#
http://wiki.rubyonrails.org/rails/pages/Environments
-#
-# NOTE: This needs to be set to some value in order for all of the
-# daemons to access the same database
-export RAILS_ENV=production
diff --git a/configure.ac b/configure.ac
index 9598925..b97bb21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([deltacloud-aggregator], [0.0.2], [deltacloud-devel(a)lists.fedoraproject.org])
+AC_INIT([aeolus-conductor], [0.0.2], [aeolus-devel(a)lists.fedorahosted.org])
AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-pax])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -9,9 +9,9 @@ AC_PROG_LIBTOOL
AC_LANG([C++])
AC_ARG_ENABLE(local,
- [ --enable-local Set this flag if you are planning to run the aggregator without
installing it.],
- [ DELTACLOUD_INSTALL_DIR=`pwd`/src ], [
DELTACLOUD_INSTALL_DIR=$datadir/deltacloud-aggregator ])
-AC_SUBST(DELTACLOUD_INSTALL_DIR)
+ [ --enable-local Set this flag if you are planning to run the conductor without
installing it.],
+ [ CONDUCTOR_INSTALL_DIR=`pwd`/src ], [
CONDUCTOR_INSTALL_DIR=$datadir/aeolus-conductor ])
+AC_SUBST(CONDUCTOR_INSTALL_DIR)
dnl
dnl check for classads-devel
@@ -24,12 +24,12 @@ AC_ARG_WITH([classads],
AC_HELP_STRING([--with-classads=@<:@PFX@:>@],
if test "x$with_classads" = xno ; then
AC_MSG_CHECKING([for classads libraries >= $CLASSADS_REQUIRED])
- AC_MSG_ERROR([classads >= $CLASSADS_REQUIRED is required for aggregator])
+ AC_MSG_ERROR([classads >= $CLASSADS_REQUIRED is required for conductor])
elif test "x$with_classads" = "x"; then
fail=0
AC_CHECK_HEADERS([classad/classad_distribution.h],, [fail=1],[])
if test $fail = 1; then
- AC_MSG_ERROR([You must install the classads development package to compile the
aggregator])
+ AC_MSG_ERROR([You must install the classads development package to compile the
conductor])
fi
fi
@@ -37,5 +37,5 @@ fi
test x"$ac_ct_CC:$CFLAGS" = 'xgcc:-g -O2' \
&& CFLAGS="$CFLAGS -Wshadow -Wall -Werror"
-AC_CONFIG_FILES([Makefile deltacloud-aggregator.spec])
+AC_CONFIG_FILES([Makefile aeolus-conductor.spec])
AC_OUTPUT(src/classad_plugin/Makefile)
diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in
deleted file mode 100644
index 0632f79..0000000
--- a/deltacloud-aggregator.spec.in
+++ /dev/null
@@ -1,239 +0,0 @@
-%define app_root %{_datadir}/%{name}
-%define doc_root %{_datadir}/%{name}-doc
-
-Name: deltacloud-aggregator
-Version: @VERSION@
-Release: 0%{?dist}%{?extra_release}
-Summary: The Deltacloud Aggregator
-
-Group: Applications/System
-License: GPLv2+ and MIT and BSD
-URL:
http://deltacloud.org
-
-Source0: deltacloud-aggregator-%{version}.tar.gz
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-Requires: ruby >= 1.8.1
-Requires: ruby(abi) = 1.8
-Requires: rubygem(rails) >= 2.1.1
-Requires: rubygem(haml)
-Requires: rubygem(nokogiri) >= 1.4.0
-Requires: rubygem(will_paginate)
-Requires: rubygem(parseconfig)
-Requires: rubygem(authlogic)
-Requires: rubygem(deltacloud-client) >= 0.0.9.8
-Requires: rubygem(compass)
-Requires: rubygem(compass-960-plugin)
-Requires: rubygem(simple-navigation)
-Requires: rubygem(typhoeus)
-Requires: rubygem(rb-inotify)
-Requires: rubygem(builder)
-Requires: rubygem(json)
-Requires: rubygem(deltacloud-image-builder-agent)
-Requires: rubygem(imagebuilder-console)
-Requires: rubygem(rack-restful_submit)
-Requires: rubygem(sunspot_rails)
-Requires: postgresql
-Requires: postgresql-server
-Requires: ruby-postgres
-Requires: ruby-RMagick
-Requires: classads >= 1.0
-Requires: condor >= 7.5.5-10dcloud
-Requires: iwhd
-Requires: deltacloud-configure
-
-BuildRequires: ruby
-BuildRequires: ruby-devel
-BuildRequires: classads-devel >= 1.0
-
-%package daemons
-Summary: Deltacloud Aggregator daemons config
-Group: Applications/Internet
-License: GPLv2+
-Requires: %{name} = %{version}-%{release}
-Requires: httpd >= 2.0
-Requires: rubygem(thin) >= 1.2.5
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-
-
-%package doc
-Summary: Deltacloud Aggregator documentation and test suite
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-
-%description
-The Aggregator for Deltacloud.
-
-%description daemons
-The configuration necessary to run and proxy the Deltacloud Aggregator.
-
-%description doc
-Documentation and tests for the Deltacloud Aggregator
-
-%prep
-%setup -q
-
-%build
-%configure
-make
-
-%install
-%{__rm} -rf %{buildroot}
-
-%{__mkdir} -p %{buildroot}
-%{__mkdir} -p %{buildroot}%{app_root}
-%{__mkdir} -p %{buildroot}%{doc_root}
-%{__mkdir} -p %{buildroot}%{_initrddir}
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/httpd/conf.d
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d
-
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/%{name}
-%{__mkdir} -p %{buildroot}%{_localstatedir}/lib/%{name}
-%{__mkdir} -p %{buildroot}%{_localstatedir}/log/%{name}
-%{__mkdir} -p %{buildroot}%{_localstatedir}/run/%{name}
-
-# copy over all of the src directory...
-%{__cp} -R src/* %{buildroot}/%{app_root}
-
-# we need to make sure there are no leftover logfiles getting pulled in
-rm -f %{buildroot}/%{app_root}/log/*
-
-# Remove this directory as the make install below will install the correct files to this
dir.
-%{__rm} -rf %{buildroot}%{app_root}/classad_plugin
-
-%makeinstall
-
-# move documentation to the correct place
-mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc_root}
-
-# copy over init scripts and various config
-%{__cp} conf/deltacloud-aggregator %{buildroot}%{_initrddir}
-%{__cp} conf/deltacloud-dbomatic %{buildroot}%{_initrddir}
-%{__cp} conf/deltacloud-condor_refreshd %{buildroot}%{_initrddir}
-%{__cp} conf/deltacloud-image_builder_service %{buildroot}%{_initrddir}
-%{__cp} conf/deltacloud-aggregator-httpd.conf
%{buildroot}%{_sysconfdir}/httpd/conf.d/deltacloud-aggregator.conf
-%{__cp} conf/deltacloud-aggregator.logrotate
%{buildroot}%{_sysconfdir}/logrotate.d/deltacloud-aggregator
-%{__cp} conf/deltacloud-aggregator.sysconf
%{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator
-%{__cp} conf/deltacloud-rails.sysconf
%{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails
-
-# move rails config to /etc, creating symlinks
-if [ -f %{buildroot}%{app_root}/config/database.yml ]; then
- %{__mv} %{buildroot}%{app_root}/config/database.yml
%{buildroot}%{_sysconfdir}/%{name}
-else
- %{__cp} %{buildroot}%{app_root}/config/database.pg
%{buildroot}%{_sysconfdir}/%{name}/database.yml
-fi
-%{__mv} %{buildroot}%{app_root}/config/environments/development.rb
%{buildroot}%{_sysconfdir}/%{name}
-%{__mv} %{buildroot}%{app_root}/config/environments/production.rb
%{buildroot}%{_sysconfdir}/%{name}
-%{__mv} %{buildroot}%{app_root}/config/environments/test.rb
%{buildroot}%{_sysconfdir}/%{name}
-%{__ln_s} %{_sysconfdir}/%{name}/database.yml %{buildroot}%{app_root}/config
-%{__ln_s} %{_sysconfdir}/%{name}/development.rb
%{buildroot}%{app_root}/config/environments
-%{__ln_s} %{_sysconfdir}/%{name}/production.rb
%{buildroot}%{app_root}/config/environments
-%{__ln_s} %{_sysconfdir}/%{name}/test.rb %{buildroot}%{app_root}/config/environments
-%{__mkdir} -p %{buildroot}%{app_root}/config/image_descriptor_xmls
-
-# Creating these files now to make sure the logfiles will be owned
-# 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}/rails.log
-touch %{buildroot}%{_localstatedir}/log/%{name}/dbomatic.log
-touch %{buildroot}%{_localstatedir}/run/%{name}/event_log_position
-touch %{buildroot}%{_localstatedir}/log/%{name}/condor_refreshd.log
-touch %{buildroot}%{_localstatedir}/log/%{name}/image_builder_service.log
-
-# remove the files not needed for the installation
-%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore
-%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest
-
-%{__rm} -rf %{buildroot}%{app_root}/tmp
-%{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp
-%{__ln_s} %{_localstatedir}/lib/%{name}/tmp %{buildroot}%{app_root}/tmp
-
-%{__rm} -rf %{buildroot}%{app_root}/tmp
-
-# Delete unused build stuff.
-%{__rm} -rf %{buildroot}%{app_root}/classad_plugin/.libs
-%{__rm} -rf %{buildroot}%{app_root}/classad_plugin/.deps
-
-%clean
-%{__rm} -rf %{buildroot}
-
-#%check
-#rake spec
-
-%pre daemons
-getent group dcloud >/dev/null || /usr/sbin/groupadd -g 109 -r dcloud 2>/dev/null
|| :
-getent passwd dcloud >/dev/null || \
- /usr/sbin/useradd -u 109 -g dcloud -c "dcloud" \
- -s /sbin/nologin -r -d /var/dcloud dcloud 2> /dev/null || :
-
-%post daemons
-# Register the services
-/sbin/chkconfig --add deltacloud-aggregator
-/sbin/chkconfig --add deltacloud-dbomatic
-/sbin/chkconfig --add deltacloud-condor_refreshd
-/sbin/chkconfig --add deltacloud-image_builder_service
-
-%preun daemons
-if [ $1 = 0 ]; then
-/sbin/service deltacloud-aggregator stop > /dev/null 2>&1
-/sbin/chkconfig --del deltacloud-aggregator
-/sbin/service deltacloud-dbomatic stop > /dev/null 2>&1
-/sbin/chkconfig --del deltacloud-dbomatic
-/sbin/service deltacloud-condor_refreshd stop > /dev/null 2>&1
-/sbin/chkconfig --del deltacloud-condor_refreshd
-/sbin/service deltacloud-image_builder_service stop > /dev/null 2>&1
-/sbin/chkconfig --del deltacloud-image_builder_service
-fi
-
-%files
-%defattr(-,root,root,-)
-%{app_root}
-%attr(777, root, root) %{app_root}/config/image_descriptor_xmls
-%attr(777, root, root) %{app_root}/public
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/database.yml
-%config(noreplace) %{_sysconfdir}/%{name}/development.rb
-%config(noreplace) %{_sysconfdir}/%{name}/production.rb
-%config(noreplace) %{_sysconfdir}/%{name}/test.rb
-%doc AUTHORS COPYING
-
-%files daemons
-%defattr(-,root,root,-)
-%{_initrddir}/deltacloud-aggregator
-%{_initrddir}/deltacloud-dbomatic
-%{_initrddir}/deltacloud-condor_refreshd
-%{_initrddir}/deltacloud-image_builder_service
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-aggregator
-%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%attr(-, dcloud, dcloud) %{_localstatedir}/lib/%{name}
-%attr(-, dcloud, dcloud) %{_localstatedir}/run/%{name}
-%attr(-, dcloud, dcloud) %{_localstatedir}/log/%{name}
-%doc AUTHORS COPYING
-
-%files doc
-%defattr(-,root,root,-)
-%{doc_root}
-%doc AUTHORS COPYING
-
-%changelog
-* Mon Sep 27 2010 Chris Lalancette <clalance(a)redhat.com>
-- Added new rubygem-parseconfig dependency
-- Turn on services during install with chkconfig
-
-* Sat Mar 6 2010 Ian Main <imain(a)redhat.com> - 0.0.2-2
-- removed taskomatic from packaging.
-
-* Wed Feb 18 2010 Mohammed Morsi <mmorsi(a)redhat.com> - 0.0.2-1
-- renamed portal to aggregator
-- updated / cleaned up package
-
-* Fri Sep 1 2009 <sseago(a)redhat.com> - 0.0.1-1
-- Initial build.
-
diff --git a/src/app/controllers/instances_controller.rb
b/src/app/controllers/instances_controller.rb
index e22aea4..e077f67 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -31,7 +31,7 @@ class InstancesController < ApplicationController
end
def layout
- return "aggregator" unless request.xhr?
+ return "conductor" unless request.xhr?
end
def index
diff --git a/src/app/controllers/templates_controller.rb
b/src/app/controllers/templates_controller.rb
index 51ed922..1506fff 100644
--- a/src/app/controllers/templates_controller.rb
+++ b/src/app/controllers/templates_controller.rb
@@ -5,7 +5,7 @@ class TemplatesController < ApplicationController
layout :layout
def layout
- return "aggregator" unless request.xhr?
+ return "conductor" unless request.xhr?
end
def section_id
diff --git a/src/app/helpers/application_helper.rb
b/src/app/helpers/application_helper.rb
index 7a08a91..c536a81 100644
--- a/src/app/helpers/application_helper.rb
+++ b/src/app/helpers/application_helper.rb
@@ -121,8 +121,8 @@ module ApplicationHelper
# it's possible to change it in a future
submit_url = search_url
- extend_table_js = "<script
type=\"text/javascript\">Aggregator.extendTable({id:
'##{html_id}',single_select:#{opts[:single_select] ? true :
false}});#{opts[:load_callback]};</script>"
- extend_sfield_js = "<script
type=\"text/javascript\">Aggregator.extendTableSearchField({id:
'##{html_id}'})</script>"
+ extend_table_js = "<script
type=\"text/javascript\">Conductor.extendTable({id:
'##{html_id}',single_select:#{opts[:single_select] ? true :
false}});#{opts[:load_callback]};</script>"
+ extend_sfield_js = "<script
type=\"text/javascript\">Conductor.extendTableSearchField({id:
'##{html_id}'})</script>"
rows = data.map do |rec|
if block_given?
diff --git a/src/app/models/hardware_profile.rb b/src/app/models/hardware_profile.rb
index 03ca8f7..1ed78b5 100644
--- a/src/app/models/hardware_profile.rb
+++ b/src/app/models/hardware_profile.rb
@@ -53,16 +53,16 @@ class HardwareProfile < ActiveRecord::Base
accepts_nested_attributes_for :memory, :cpu, :storage, :architecture
- has_and_belongs_to_many :aggregator_hardware_profiles,
+ has_and_belongs_to_many :conductor_hardware_profiles,
:class_name => "HardwareProfile",
:join_table => "hardware_profile_map",
:foreign_key => "provider_hardware_profile_id",
- :association_foreign_key =>
"aggregator_hardware_profile_id"
+ :association_foreign_key =>
"conductor_hardware_profile_id"
has_and_belongs_to_many :provider_hardware_profiles,
:class_name => "HardwareProfile",
:join_table => "hardware_profile_map",
- :foreign_key => "aggregator_hardware_profile_id",
+ :foreign_key => "conductor_hardware_profile_id",
:association_foreign_key =>
"provider_hardware_profile_id"
validates_presence_of :external_key, :if => Proc.new { |hwp| !hwp.provider.nil? }
@@ -84,14 +84,14 @@ class HardwareProfile < ActiveRecord::Base
# FIXME: what about custom instance profiles?
def validate
if provider.nil?
- if !aggregator_hardware_profiles.empty?
- errors.add(:aggregator_hardware_profiles,
- "Aggregator profiles only allowed for provider profiles")
+ if !conductor_hardware_profiles.empty?
+ errors.add(:conductor_hardware_profiles,
+ "Conductor profiles only allowed for provider profiles")
end
else
if !provider_hardware_profiles.empty?
errors.add(:provider_hardware_profiles,
- "Provider profiles only allowed for aggregator profiles")
+ "Provider profiles only allowed for conductor profiles")
end
end
end
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb
index 1e89958..4403675 100644
--- a/src/app/models/provider.rb
+++ b/src/app/models/provider.rb
@@ -26,7 +26,7 @@ class Provider < ActiveRecord::Base
text :url, :as => :code_substring
end
- require 'util/deltacloud'
+ require 'util/conductor'
include PermissionedObject
has_many :cloud_accounts, :dependent => :destroy
diff --git a/src/app/models/realm.rb b/src/app/models/realm.rb
index 4695792..cf55176 100644
--- a/src/app/models/realm.rb
+++ b/src/app/models/realm.rb
@@ -70,6 +70,6 @@ class Realm < ActiveRecord::Base
end
end
- AGGREGATOR_REALM_PROVIDER_DELIMITER = ":"
- AGGREGATOR_REALM_ACCOUNT_DELIMITER = "/"
+ CONDUCTOR_REALM_PROVIDER_DELIMITER = ":"
+ CONDUCTOR_REALM_ACCOUNT_DELIMITER = "/"
end
diff --git a/src/app/stylesheets/aggregator.scss b/src/app/stylesheets/aggregator.scss
index 381fc6d..6ac2870 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -807,7 +807,7 @@ li.operation>ul, li.administration>ul, li.build>ul,
li.runtime>ul {
font-size: 120%;
padding: 10px;
}
- .dcloud_form {
+ .conductor_form {
margin: 40px;
overflow: hidden;
}
@@ -910,7 +910,7 @@ fieldset.gap {
}
/* simple two column label + input pairs */
-.dcloud_form {
+.conductor_form {
fieldset {
overflow: hidden;
margin: 10px 0 0;
diff --git a/src/app/stylesheets/newui.scss b/src/app/stylesheets/newui.scss
index d0fbcc9..f973b82 100644
--- a/src/app/stylesheets/newui.scss
+++ b/src/app/stylesheets/newui.scss
@@ -815,7 +815,7 @@ li.operation>ul, li.administration>ul, li.build>ul,
li.runtime>ul {
font-size: 120%;
padding: 10px;
}
- .dcloud_form {
+ .conductor_form {
margin: 40px;
overflow: hidden;
}
@@ -920,7 +920,7 @@ fieldset.gap {
}
/* simple two column label + input pairs */
-.dcloud_form {
+.conductor_form {
fieldset {
overflow: hidden;
margin: 10px 0 0;
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index 8b4e224..dc86afd 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -63,7 +63,7 @@ def condormatic_instance_create(task)
# This is currently broken as the condor plugin loads models without initializing
rails.
# However, recent changes have required that rails be initialized in order to load
the
# pool and quota models.
- #requirements += " && deltacloud_quota_check(\"#{job_name}\",
other.cloud_account_id)"
+ #requirements += " && conductor_quota_check(\"#{job_name}\",
other.cloud_account_id)"
requirements += "\n"
pipe.puts requirements
@@ -235,7 +235,7 @@ def condormatic_classads_sync
pipe.puts 'MyType="Machine"'
pipe.puts 'Requirements=true'
pipe.puts "\n# Stuff needed to match:"
- pipe.puts
"hardwareprofile=\"#{hwp.aggregator_hardware_profiles[0].id}\""
+ pipe.puts
"hardwareprofile=\"#{hwp.conductor_hardware_profiles[0].id}\""
pipe.puts "image=\"#{replicated_image.image.template.id}\""
pipe.puts "realm=\"#{realm.frontend_realms[0].id}\""
pipe.puts "\n# Backend info to complete this job:"
diff --git a/src/app/util/conductor.rb b/src/app/util/conductor.rb
new file mode 100644
index 0000000..2062c41
--- /dev/null
+++ b/src/app/util/conductor.rb
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2009 Red Hat, Inc.
+# Written by Scott Seago <sseago(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 gb_to_kb(val_in_gigs)
+ return nil if nil_or_empty(val_in_gigs)
+ return val_in_gigs.to_i * 1024 * 1024
+end
+
+def kb_to_gb(val_in_kb)
+ return nil if nil_or_empty(val_in_kb)
+ return val_in_kb.to_i / 1024 / 1024
+end
+def mb_to_kb(val_in_mb)
+ return nil if nil_or_empty(val_in_mb)
+ return val_in_mb.to_i * 1024
+end
+
+def kb_to_mb(val_in_kb)
+ return nil if nil_or_empty(val_in_kb)
+ return val_in_kb.to_i / 1024
+end
+
+def nil_or_empty(val)
+ if val.nil? or (val.kind_of?(String) and val.empty?)
+ return true
+ else
+ return false
+ end
+end
diff --git a/src/app/util/deltacloud.rb b/src/app/util/deltacloud.rb
deleted file mode 100644
index 2062c41..0000000
--- a/src/app/util/deltacloud.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2009 Red Hat, Inc.
-# Written by Scott Seago <sseago(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 gb_to_kb(val_in_gigs)
- return nil if nil_or_empty(val_in_gigs)
- return val_in_gigs.to_i * 1024 * 1024
-end
-
-def kb_to_gb(val_in_kb)
- return nil if nil_or_empty(val_in_kb)
- return val_in_kb.to_i / 1024 / 1024
-end
-def mb_to_kb(val_in_mb)
- return nil if nil_or_empty(val_in_mb)
- return val_in_mb.to_i * 1024
-end
-
-def kb_to_mb(val_in_kb)
- return nil if nil_or_empty(val_in_kb)
- return val_in_kb.to_i / 1024
-end
-
-def nil_or_empty(val)
- if val.nil? or (val.kind_of?(String) and val.empty?)
- return true
- else
- return false
- end
-end
diff --git a/src/app/views/dashboard/summary.haml b/src/app/views/dashboard/summary.haml
index cc8d8e9..fb46012 100644
--- a/src/app/views/dashboard/summary.haml
+++ b/src/app/views/dashboard/summary.haml
@@ -1,12 +1,12 @@
- unless @hide_getting_started
#getting_started_dashboard_section
%p
- Welcome to your Deltacloud dashboard where you can track your cloud resource
+ Welcome to your Aeolus Conductor dashboard where you can track your cloud resource
usage. Here's what you need to know to get started
%ul
%li
%img{:src => "images/getting_started_pools.png"}
- Deltacloud organizes your cloud machines in collections called pools
+ Aeolus Conductor organizes your cloud machines in collections called pools
%li
%img{:src => "images/getting_started_accounts.png"}
A pool can be connected to multiple <b>cloud provider accounts</b>
diff --git a/src/app/views/layouts/aggregator.haml
b/src/app/views/layouts/aggregator.haml
index 3e407e3..2339223 100644
--- a/src/app/views/layouts/aggregator.haml
+++ b/src/app/views/layouts/aggregator.haml
@@ -9,7 +9,7 @@
= stylesheet_link_tag 'facebox'
= stylesheet_link_tag 'jquery.ui-1.8.1/jquery-ui-1.8.1.custom.css'
= stylesheet_link_tag 'jquery.loadmask'
- = stylesheet_link_tag 'compiled/aggregator'
+ = stylesheet_link_tag 'compiled/conductor'
/ [if lt IE 9]
= javascript_include_tag
"http://html5shiv.googlecode.com/svn/trunk/html5.js"
@@ -35,7 +35,7 @@
#subheader
%form#s.container_16.disabled{:disabled => "disabled"}
.prefix_10.grid_6
- %input{ :name => "s", :type => "search",
:placeholder => "Search Cloud Aggregator", :disabled =>
"disabled"}
+ %input{ :name => "s", :type => "search",
:placeholder => "Search Cloud Conductor", :disabled =>
"disabled"}
%button.action{:form => "s"} Search
%p.prefix_10.grid_6
%a.disabled
diff --git a/src/app/views/permissions/new.haml b/src/app/views/permissions/new.haml
index 15a06f9..9794368 100644
--- a/src/app/views/permissions/new.haml
+++ b/src/app/views/permissions/new.haml
@@ -1,4 +1,4 @@
-.dcloud_form
+.conductor_form
= error_messages_for 'permission'
%h2
Add new Permission for #{(a)permission_object.name}
diff --git a/src/app/views/providers/_providers.haml
b/src/app/views/providers/_providers.haml
index 6c46532..2a7f1f0 100644
--- a/src/app/views/providers/_providers.haml
+++ b/src/app/views/providers/_providers.haml
@@ -19,8 +19,8 @@
event.preventDefault()
if (!$(this).attr("disabled")) {
$.get(($(this).attr("href")), function (response) {
- var form = $(response).find('#edit_dcloud_form')
- $("#show_dcloud").replaceWith(form)
+ var form = $(response).find('#edit_conductor_form')
+ $("#show_conductor").replaceWith(form)
$('a.button').attr('disabled', true)
});
}
diff --git a/src/app/views/providers/edit.haml b/src/app/views/providers/edit.haml
index 3440311..ac0f4fb 100644
--- a/src/app/views/providers/edit.haml
+++ b/src/app/views/providers/edit.haml
@@ -2,6 +2,6 @@
#details.grid_13
%nav.subsubnav
= render_navigation({:context => 'old', :level => 4})
- - form_for :provider, @provider, :url => provider_path(@provider), :html => { :id
=> 'edit_dcloud_form', :method => 'put', :class =>
"dcloud_form" } do |f|
+ - form_for :provider, @provider, :url => provider_path(@provider), :html => { :id
=> 'edit_conductor_form', :method => 'put', :class =>
"conductor_form" } do |f|
= render :partial => 'form', :locals => { :f => f }
%input{ :type => 'submit', :value => t(:save), :name =>
'save_provider', :id => 'save_provider' }
diff --git a/src/app/views/providers/new.haml b/src/app/views/providers/new.haml
index 2803b64..d3bd6b7 100644
--- a/src/app/views/providers/new.haml
+++ b/src/app/views/providers/new.haml
@@ -2,6 +2,6 @@
#details.grid_13
%nav.subsubnav
= render_navigation({:context => 'old', :level => 4})
- - form_for :provider, @provider, :url => providers_path, :html => { :class =>
"dcloud_form" } do |f|
+ - form_for :provider, @provider, :url => providers_path, :html => { :class =>
"conductor_form" } do |f|
= render :partial => 'form', :locals => { :f => f }
%input{ :type => 'submit', :value => t(:add), :name =>
'add_provider', :id => 'add_provider' }
diff --git a/src/app/views/providers/show.haml b/src/app/views/providers/show.haml
index ccc814a..5a6400f 100644
--- a/src/app/views/providers/show.haml
+++ b/src/app/views/providers/show.haml
@@ -3,7 +3,7 @@
%nav.subsubnav
= render_navigation({:context => 'old', :level => 4})
%br
- %table#show_dcloud
+ %table#show_conductor
%thead
%tr
%th{:scope => "col"} Provider Name
diff --git a/src/app/views/quotas/edit.haml b/src/app/views/quotas/edit.haml
index 2293b43..353018e 100644
--- a/src/app/views/quotas/edit.haml
+++ b/src/app/views/quotas/edit.haml
@@ -1,8 +1,8 @@
-.dcloud_form
+.conductor_form
%h2
Edit Quota for #{@parent_type + ": " + @name}
%br/
- - form_for @quota, :url => {:controller => :quotas, :action =>
"update", :parent_type => @parent_type}, :class => "dcloud_form"
do |f|
+ - form_for @quota, :url => {:controller => :quotas, :action =>
"update", :parent_type => @parent_type}, :class =>
"conductor_form" do |f|
= hidden_field_tag 'id', @parent.id
= hidden_field_tag 'parent_type', @parent_type
%ul
diff --git a/src/app/views/user_sessions/new.haml b/src/app/views/user_sessions/new.haml
index 9bd71f6..8f8239c 100644
--- a/src/app/views/user_sessions/new.haml
+++ b/src/app/views/user_sessions/new.haml
@@ -1,6 +1,6 @@
.modalbox
%h2 Log In
- .dcloud_form
+ .conductor_form
- form_for @user_session, :url => user_session_path do |f|
%fieldset
= f.label :login, "Username:"
diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml
index efe0c96..01d1d4c 100644
--- a/src/app/views/users/_form.haml
+++ b/src/app/views/users/_form.haml
@@ -1,4 +1,4 @@
-.dcloud_form
+.conductor_form
- form_for @user, :url => account_path do |form|
= hidden_field :user, :id, :value => @user.id
= form.error_messages
diff --git a/src/classad_plugin/Makefile.am b/src/classad_plugin/Makefile.am
index 9334f5f..cea3585 100644
--- a/src/classad_plugin/Makefile.am
+++ b/src/classad_plugin/Makefile.am
@@ -1,12 +1,12 @@
AM_CPPFLAGS=-I`ruby -e "require 'rbconfig' ; puts
Config::CONFIG['archdir']"` \
- -DDELTACLOUD_INSTALL_DIR=\"$(DELTACLOUD_INSTALL_DIR)\"
-DLOGFILE=\"/var/log/condor/deltacloud_condor_plugin.log\"
+ -DCONDUCTOR_INSTALL_DIR=\"$(CONDUCTOR_INSTALL_DIR)\"
-DLOGFILE=\"/var/log/condor/conductor_condor_plugin.log\"
classadplugindir=$(pkgdatadir)/classad_plugin
-classadplugin_LTLIBRARIES = deltacloud_classad_plugin.la
+classadplugin_LTLIBRARIES = conductor_classad_plugin.la
-deltacloud_classad_plugin_la_SOURCES = deltacloud_classad_plugin.cpp
-deltacloud_classad_plugin_la_LIBADD = -lclassad -lruby
-deltacloud_classad_plugin_la_LDFLAGS = -module -avoid-version -shared
+conductor_classad_plugin_la_SOURCES = conductor_classad_plugin.cpp
+conductor_classad_plugin_la_LIBADD = -lclassad -lruby
+conductor_classad_plugin_la_LDFLAGS = -module -avoid-version -shared
classadplugin_DATA = classad_plugin.rb
diff --git a/src/classad_plugin/conductor_classad_plugin.cpp
b/src/classad_plugin/conductor_classad_plugin.cpp
new file mode 100644
index 0000000..906007f
--- /dev/null
+++ b/src/classad_plugin/conductor_classad_plugin.cpp
@@ -0,0 +1,217 @@
+#include <ruby.h>
+#include <stdio.h>
+
+#include <iostream>
+#include <sstream>
+
+#include "classad/classad_distribution.h"
+#include "classad/fnCall.h"
+
+using namespace std;
+#ifdef WANT_CLASSAD_NAMESPACE
+using namespace classad;
+#endif
+
+#define print_value(fp, val) _print_value(fp, val, #val)
+#define print_type(fp, val) _print_type(fp, val, #val)
+
+static void _print_type(FILE *fp, Value val, const char *name)
+{
+ fprintf(fp, "%s type is: ", name);
+
+ switch(val.GetType()) {
+ case Value::NULL_VALUE:
+ fprintf(fp, "NULL");
+ break;
+ case Value::ERROR_VALUE:
+ fprintf(fp, "Error");
+ break;
+ case Value::UNDEFINED_VALUE:
+ fprintf(fp, "Undefined");
+ break;
+ case Value::BOOLEAN_VALUE:
+ fprintf(fp, "Boolean");
+ break;
+ case Value::INTEGER_VALUE:
+ fprintf(fp, "Integer");
+ break;
+ case Value::REAL_VALUE:
+ fprintf(fp, "Real");
+ break;
+ case Value::LIST_VALUE:
+ fprintf(fp, "List");
+ break;
+ case Value::CLASSAD_VALUE:
+ fprintf(fp, "Classad");
+ break;
+ case Value::RELATIVE_TIME_VALUE:
+ fprintf(fp, "RelativeTime");
+ break;
+ case Value::ABSOLUTE_TIME_VALUE:
+ fprintf(fp, "AbsoluteTime");
+ break;
+ case Value::STRING_VALUE:
+ fprintf(fp, "String");
+ break;
+ }
+
+ fprintf(fp, "\n");
+}
+
+static void _print_value(FILE *fp, Value val, const char *name)
+{
+ /* AFAICT the only way to get at the string in a 'Value' object is to use
+ * the C++ stream operator <<, so we set up a stringstream and write
+ * stuff we want into that..
+ */
+ std::stringstream sstr;
+
+ sstr << name << " is " << val;
+ fprintf(fp, "%s\n", sstr.str().c_str());
+}
+
+/*
+ * Perform our quota check against the Aeolus Conductor database.
+ * This function expects:
+ *
+ * - Instance executable name as handed to condor so that we can map to the
+ * instance found in the database.
+ * - The username
+ * - The provider url so we can map back to the provider.
+ * - The realm key so we know what realm this is in.
+ *
+ * ... at least for now. Need to better analyze what is required to do all
+ * the quota matching but that's the idea.
+ */
+bool
+conductor_quota_check(const char *name, const ArgumentList &arglist,
+ EvalState &state, Value &result)
+{
+ Value instance_key;
+ Value account_id;
+ FILE *fp;
+ VALUE res;
+ bool val = false;
+ char *ruby_string;
+ std::stringstream method_args;
+ int rc;
+
+ result.SetBooleanValue(false);
+
+ fp = fopen(LOGFILE, "a");
+
+ if (arglist.size() != 2) {
+ result.SetErrorValue();
+ fprintf(fp, "Expected 2 arguments, saw %z\n", arglist.size());
+ goto do_ret;
+ }
+
+ if (!arglist[0]->Evaluate(state, instance_key)) {
+ result.SetErrorValue();
+ fprintf(fp, "Could not evaluate argument 0 to instance key\n");
+ goto do_ret;
+ }
+ if (!arglist[1]->Evaluate(state, account_id)) {
+ result.SetErrorValue();
+ fprintf(fp, "Could not evaluate argument 1 to account_id\n");
+ goto do_ret;
+ }
+
+ print_type(fp, instance_key);
+ print_value(fp, instance_key);
+ if (instance_key.GetType() != Value::STRING_VALUE) {
+ result.SetErrorValue();
+ fprintf(fp, "Instance type was not a string\n");
+ goto do_ret;
+ }
+
+ print_type(fp, account_id);
+ print_value(fp, account_id);
+ if (account_id.GetType() != Value::STRING_VALUE) {
+ result.SetErrorValue();
+ fprintf(fp, "Account ID type was not a string\n");
+ goto do_ret;
+ }
+
+ ruby_init();
+ ruby_init_loadpath();
+
+ method_args << "'" << CONDUCTOR_INSTALL_DIR <<
"/config/database.yml', '"
+ << instance_key << "', " << account_id;
+
+ rc = asprintf(&ruby_string,
+ "$: << '%s/classad_plugin'\n"
+ "$: << '%s/app/models'\n"
+ "logf = File.new('%s', 'a')\n"
+ "logf.puts \"Loading ruby support file from
%s/classad_plugin\"\n"
+ "begin\n"
+ " require 'classad_plugin.rb'\n"
+ " ret = classad_plugin(logf, %s)\n"
+ "rescue Exception => ex\n"
+ " logf.puts \"Error running classad plugin: #{ex.message}\"\n"
+ " logf.puts ex.backtrace\n"
+ " ret = false\n"
+ "end\n"
+ "logf.close\n"
+ "ret",
+ CONDUCTOR_INSTALL_DIR,
+ CONDUCTOR_INSTALL_DIR,
+ LOGFILE,
+ CONDUCTOR_INSTALL_DIR,
+ method_args.str().c_str());
+
+ if (rc < 0) {
+ fprintf(fp, "Failed to allocate memory for asprintf\n");
+ goto do_ret;
+ }
+
+ fprintf(fp, "ruby string is %s\n", ruby_string);
+ fflush(fp);
+
+ res = rb_eval_string(ruby_string);
+ free(ruby_string);
+
+ /* FIXME: I'd like to call ruby_finalize here, but it spews weird errors:
+ *
+ * Error running classad plugin: wrong argument type Mutex (expected Data)
+ */
+ //ruby_finalize();
+
+ fprintf(fp, "Returned result from ruby code was %s\n", (res == Qtrue) ?
"true" : "false");
+
+ if (res == Qtrue) {
+ result.SetBooleanValue(true);
+ val = true;
+ }
+
+ do_ret:
+ fclose(fp);
+
+ return val;
+}
+
+/*
+ * Struct containing the names of the functions provided here and a pointer
+ * to the function that implements them. Third arg is an int flags that appears
+ * to be unused.
+ *
+ * This is found in fnCall.h
+ */
+static ClassAdFunctionMapping classad_functions[] =
+{
+ { "conductor_quota_check", (void *) conductor_quota_check, 0 },
+ { "", NULL, 0 }
+};
+
+/*
+ * This is the 'Init' function that is called after the library is
dlopen()'d.
+ * This just returns the struct defined above.
+ *
+ */
+extern "C"
+{
+ ClassAdFunctionMapping *
+ Init(void) {
+ return classad_functions;
+ }
+}
diff --git a/src/classad_plugin/deltacloud_classad_plugin.cpp
b/src/classad_plugin/deltacloud_classad_plugin.cpp
deleted file mode 100644
index 74d6023..0000000
--- a/src/classad_plugin/deltacloud_classad_plugin.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-#include <ruby.h>
-#include <stdio.h>
-
-#include <iostream>
-#include <sstream>
-
-#include "classad/classad_distribution.h"
-#include "classad/fnCall.h"
-
-using namespace std;
-#ifdef WANT_CLASSAD_NAMESPACE
-using namespace classad;
-#endif
-
-#define print_value(fp, val) _print_value(fp, val, #val)
-#define print_type(fp, val) _print_type(fp, val, #val)
-
-static void _print_type(FILE *fp, Value val, const char *name)
-{
- fprintf(fp, "%s type is: ", name);
-
- switch(val.GetType()) {
- case Value::NULL_VALUE:
- fprintf(fp, "NULL");
- break;
- case Value::ERROR_VALUE:
- fprintf(fp, "Error");
- break;
- case Value::UNDEFINED_VALUE:
- fprintf(fp, "Undefined");
- break;
- case Value::BOOLEAN_VALUE:
- fprintf(fp, "Boolean");
- break;
- case Value::INTEGER_VALUE:
- fprintf(fp, "Integer");
- break;
- case Value::REAL_VALUE:
- fprintf(fp, "Real");
- break;
- case Value::LIST_VALUE:
- fprintf(fp, "List");
- break;
- case Value::CLASSAD_VALUE:
- fprintf(fp, "Classad");
- break;
- case Value::RELATIVE_TIME_VALUE:
- fprintf(fp, "RelativeTime");
- break;
- case Value::ABSOLUTE_TIME_VALUE:
- fprintf(fp, "AbsoluteTime");
- break;
- case Value::STRING_VALUE:
- fprintf(fp, "String");
- break;
- }
-
- fprintf(fp, "\n");
-}
-
-static void _print_value(FILE *fp, Value val, const char *name)
-{
- /* AFAICT the only way to get at the string in a 'Value' object is to use
- * the C++ stream operator <<, so we set up a stringstream and write
- * stuff we want into that..
- */
- std::stringstream sstr;
-
- sstr << name << " is " << val;
- fprintf(fp, "%s\n", sstr.str().c_str());
-}
-
-/*
- * Perform our quota check against the deltacloud aggregator database.
- * This function expects:
- *
- * - Instance executable name as handed to condor so that we can map to the
- * instance found in the database.
- * - The username
- * - The provider url so we can map back to the provider.
- * - The realm key so we know what realm this is in.
- *
- * ... at least for now. Need to better analyze what is required to do all
- * the quota matching but that's the idea.
- */
-bool
-deltacloud_quota_check(const char *name, const ArgumentList &arglist,
- EvalState &state, Value &result)
-{
- Value instance_key;
- Value account_id;
- FILE *fp;
- VALUE res;
- bool val = false;
- char *ruby_string;
- std::stringstream method_args;
- int rc;
-
- result.SetBooleanValue(false);
-
- fp = fopen(LOGFILE, "a");
-
- if (arglist.size() != 2) {
- result.SetErrorValue();
- fprintf(fp, "Expected 2 arguments, saw %z\n", arglist.size());
- goto do_ret;
- }
-
- if (!arglist[0]->Evaluate(state, instance_key)) {
- result.SetErrorValue();
- fprintf(fp, "Could not evaluate argument 0 to instance key\n");
- goto do_ret;
- }
- if (!arglist[1]->Evaluate(state, account_id)) {
- result.SetErrorValue();
- fprintf(fp, "Could not evaluate argument 1 to account_id\n");
- goto do_ret;
- }
-
- print_type(fp, instance_key);
- print_value(fp, instance_key);
- if (instance_key.GetType() != Value::STRING_VALUE) {
- result.SetErrorValue();
- fprintf(fp, "Instance type was not a string\n");
- goto do_ret;
- }
-
- print_type(fp, account_id);
- print_value(fp, account_id);
- if (account_id.GetType() != Value::STRING_VALUE) {
- result.SetErrorValue();
- fprintf(fp, "Account ID type was not a string\n");
- goto do_ret;
- }
-
- ruby_init();
- ruby_init_loadpath();
-
- method_args << "'" << DELTACLOUD_INSTALL_DIR <<
"/config/database.yml', '"
- << instance_key << "', " << account_id;
-
- rc = asprintf(&ruby_string,
- "$: << '%s/classad_plugin'\n"
- "$: << '%s/app/models'\n"
- "logf = File.new('%s', 'a')\n"
- "logf.puts \"Loading ruby support file from
%s/classad_plugin\"\n"
- "begin\n"
- " require 'classad_plugin.rb'\n"
- " ret = classad_plugin(logf, %s)\n"
- "rescue Exception => ex\n"
- " logf.puts \"Error running classad plugin: #{ex.message}\"\n"
- " logf.puts ex.backtrace\n"
- " ret = false\n"
- "end\n"
- "logf.close\n"
- "ret",
- DELTACLOUD_INSTALL_DIR,
- DELTACLOUD_INSTALL_DIR,
- LOGFILE,
- DELTACLOUD_INSTALL_DIR,
- method_args.str().c_str());
-
- if (rc < 0) {
- fprintf(fp, "Failed to allocate memory for asprintf\n");
- goto do_ret;
- }
-
- fprintf(fp, "ruby string is %s\n", ruby_string);
- fflush(fp);
-
- res = rb_eval_string(ruby_string);
- free(ruby_string);
-
- /* FIXME: I'd like to call ruby_finalize here, but it spews weird errors:
- *
- * Error running classad plugin: wrong argument type Mutex (expected Data)
- */
- //ruby_finalize();
-
- fprintf(fp, "Returned result from ruby code was %s\n", (res == Qtrue) ?
"true" : "false");
-
- if (res == Qtrue) {
- result.SetBooleanValue(true);
- val = true;
- }
-
- do_ret:
- fclose(fp);
-
- return val;
-}
-
-/*
- * Struct containing the names of the functions provided here and a pointer
- * to the function that implements them. Third arg is an int flags that appears
- * to be unused.
- *
- * This is found in fnCall.h
- */
-static ClassAdFunctionMapping classad_functions[] =
-{
- { "deltacloud_quota_check", (void *) deltacloud_quota_check, 0 },
- { "", NULL, 0 }
-};
-
-/*
- * This is the 'Init' function that is called after the library is
dlopen()'d.
- * This just returns the struct defined above.
- *
- */
-extern "C"
-{
- ClassAdFunctionMapping *
- Init(void) {
- return classad_functions;
- }
-}
diff --git a/src/condor_refreshd/condor_refreshd b/src/condor_refreshd/condor_refreshd
index 4f1b93c..273902f 100755
--- a/src/condor_refreshd/condor_refreshd
+++ b/src/condor_refreshd/condor_refreshd
@@ -29,8 +29,8 @@ require 'dutils'
port = 7890
help = false
daemon = true
-refreshd_log_dir = "/var/log/deltacloud-aggregator"
-refreshd_pid_dir = "/var/run/deltacloud-aggregator"
+refreshd_log_dir = "/var/log/aeolus-conductor"
+refreshd_pid_dir = "/var/run/aeolus-conductor"
timeout = 15
optparse = OptionParser.new do |opts|
diff --git a/src/config/database.pg b/src/config/database.pg
index a727f23..e59fb72 100644
--- a/src/config/database.pg
+++ b/src/config/database.pg
@@ -12,18 +12,18 @@
# sudo /sbin/service postgresql start
# sudo su - postgres
# $ psql
-# $-# CREATE USER dcloud WITH PASSWORD 'v23zj59an' CREATEDB;
+# $-# CREATE USER aeolus WITH PASSWORD 'v23zj59an' CREATEDB;
# $-# \q
# $ exit
#
# To start off a new environment, use the following commands.
-# If running from /usr/share/deltacloud-aggregator, use 'sudo' or run as root
+# If running from /usr/share/aeolus-conductor, use 'sudo' or run as root
# as the migrate will write to a file.
#
# rake db:drop:all
# rake db:create:all
#
-# If you are running this in /usr/share/deltacloud-aggregator, use:
+# If you are running this in /usr/share/aeolus-conductor, use:
# sudo RAILS_ENV=production rake db:migrate
#
# or else just:
@@ -41,8 +41,8 @@
development:
adapter: postgresql
- database: dcloud_development
- username: dcloud
+ database: conductor_development
+ username: aeolus
password: v23zj59an
host: localhost
@@ -51,14 +51,14 @@ development:
# Do not set this db to the same as development or production.
test: &TEST
adapter: postgresql
- database: dcloud_test
+ database: conductor_test
username: postgres
host: localhost
production:
adapter: postgresql
- database: dcloud
- username: dcloud
+ database: conductor
+ username: aeolus
password: v23zj59an
host: localhost
diff --git a/src/config/database.sqlite b/src/config/database.sqlite
index 5efe557..fa76c6b 100644
--- a/src/config/database.sqlite
+++ b/src/config/database.sqlite
@@ -1,11 +1,11 @@
# SQLite version 3.x
# gem install sqlite3-ruby (not necessary on OS X Leopard)
-# If you are running the aggregator from an rpm, and wish to use
+# If you are running the conductor from an rpm, and wish to use
# sqlite, you will need to mv this file to database.yml. The .sqlite3 file can be put
# in any location you desire, just update the relative paths below to point
# to the correct location. Also, you will need to take the following 2 steps:
-# 1. Run rake db:migrate (as root) to create the db file and set it to be owned by the
dcloud user
+# 1. Run rake db:migrate (as root) to create the db file and set it to be owned by the
aeolus user
# 2. Make sure the dir that the above file lives in is also writable by this user.
development:
adapter: sqlite3
diff --git a/src/config/environments/production.rb
b/src/config/environments/production.rb
index dc093bf..9ad4568 100644
--- a/src/config/environments/production.rb
+++ b/src/config/environments/production.rb
@@ -35,4 +35,4 @@ config.action_controller.perform_caching = true
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
-config.log_path = "/var/log/deltacloud-aggregator/rails.log"
+config.log_path = "/var/log/aeolus-conductor/rails.log"
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 715c0a0..915f876 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -91,15 +91,15 @@ en:
general_settings: General Settings
general_settings_desc: Enable Self-service Account Registration, Setup Custom
Branding, Manage Content Sources
define_locales: Define Locales
- define_locales_desc: View, edit and define the names of locales that DeltaCloud
will expose to its users. The meaning of the names will be defined by being mapped to the
geographical locations offered by individual providers.
+ define_locales_desc: View, edit and define the names of locales that Aeolus
Conductor will expose to its users. The meaning of the names will be defined by being
mapped to the geographical locations offered by individual providers.
manage_users: Manage Users
- manage_users_desc: View, edit, create and delete user accounts on DeltaCloud.
Adjust quotas and privileges for users.
+ manage_users_desc: View, edit, create and delete user accounts on Aeolus
Conductor. Adjust quotas and privileges for users.
define_hardware_profiles: Define Hardware Profiles
- define_hardware_profiles_desc: View, edit and define the names of the hardware
profiles that DeltaCloud will expose to its users. The meaning of the names will be
defined by being mapped to capabilities offered by individual providers.
+ define_hardware_profiles_desc: View, edit and define the names of the hardware
profiles that Aeolus Conductor will expose to its users. The meaning of the names will be
defined by being mapped to capabilities offered by individual providers.
manage_providers: Manage Providers
- manage_providers_desc: View, edit and add providers of virtual compute resources
to DeltaCloud. View, edit and add DeltaCloud accounts for these providers. Map
provider-specific concepts to DeltaCloud.
+ manage_providers_desc: View, edit and add providers of virtual compute resources
to Aeolus Conductor. View, edit and add Aeolus Conductor accounts for these providers. Map
provider-specific concepts to Aeolus Conductor.
define_services: Define Services
- define_services_desc: View, edit and define services that DeltaCloud will offer.
These services will be mapped to individual providers based on their capabilities.
+ define_services_desc: View, edit and define services that Aeolus Conductor will
offer. These services will be mapped to individual providers based on their capabilities.
permissions: Permissions
permissions_desc: Create and edit User Treatments that are applied to users.
Treatments pair together Roles with Categories of Instances, Pools and Templates. Manage
the categories, and define and edit Roles. Roles group together sets of permissions that
are relevant to Pools, Templates and Instances.
self_service:
diff --git a/src/db/migrate/20090804135630_create_hardware_profiles.rb
b/src/db/migrate/20090804135630_create_hardware_profiles.rb
index ec4a50f..b8077b0 100644
--- a/src/db/migrate/20090804135630_create_hardware_profiles.rb
+++ b/src/db/migrate/20090804135630_create_hardware_profiles.rb
@@ -52,7 +52,7 @@ class CreateHardwareProfiles < ActiveRecord::Migration
end
create_table "hardware_profile_map", :force => true, :id => false do
|t|
- t.column "aggregator_hardware_profile_id", :integer
+ t.column "conductor_hardware_profile_id", :integer
t.column "provider_hardware_profile_id", :integer
end
end
diff --git a/src/dbomatic/dbomatic b/src/dbomatic/dbomatic
index 8a3e968..1c3b3a9 100755
--- a/src/dbomatic/dbomatic
+++ b/src/dbomatic/dbomatic
@@ -28,9 +28,9 @@ require 'optparse'
help = false
daemon = true
condor_event_log_dir = "/var/log/condor"
-dbomatic_run_dir = "/var/run/deltacloud-aggregator"
-dbomatic_log_dir = "/var/log/deltacloud-aggregator"
-dbomatic_pid_dir = "/var/run/deltacloud-aggregator"
+dbomatic_run_dir = "/var/run/aeolus-conductor"
+dbomatic_log_dir = "/var/log/aeolus-conductor"
+dbomatic_pid_dir = "/var/run/aeolus-conductor"
optparse = OptionParser.new do |opts|
diff --git a/src/features/hardware_profile.feature
b/src/features/hardware_profile.feature
index d93f7ce..07452eb 100644
--- a/src/features/hardware_profile.feature
+++ b/src/features/hardware_profile.feature
@@ -9,7 +9,7 @@ Feature: Manage Pools
And I am using new UI
Scenario: View front end hardware profiles
- Given there are the following aggregator hardware profiles:
+ Given there are the following conductor hardware profiles:
| name | memory | cpu |storage | architecture |
| m1-small | 1740 | 2 | 160 | i386 |
| m1-large | 4096 | 4 | 850 | x86_64 |
@@ -22,7 +22,7 @@ Feature: Manage Pools
| m1-xlarge | 8192 | 8 | 1690 | x86_64 |
Scenario: View a Hardware Profiles Properties
- Given there are the following aggregator hardware profiles:
+ Given there are the following conductor hardware profiles:
| name | memory | cpu |storage | architecture |
| m1-small | 1740 | 2 | 160 | i386 |
| m1-large | 4096 | 4 | 850 | x86_64 |
@@ -37,7 +37,7 @@ Feature: Manage Pools
| architecture | fixed | n/a | n/a | n/a | i386 |
label |
Scenario: View a Front End Hardware Profiles Matching Provider Hardware Profiles
- Given there are the following aggregator hardware profiles:
+ Given there are the following conductor hardware profiles:
| name | memory | cpu |storage | architecture |
| m1-small | 1740 | 2 | 160 | i386 |
And the Hardare Profile "m1-small" has the following Provider Hardware
Profiles:
@@ -51,7 +51,7 @@ Feature: Manage Pools
| m1-small | 1740 | 2 | 160 | i386 |
Scenario: Search for hardware profiles
- Given there are the following aggregator hardware profiles:
+ Given there are the following conductor hardware profiles:
| name | memory | cpu |storage | architecture |
| m1-small | 1740 | 2 | 160 | i386 |
| m1-large | 4096 | 4 | 850 | x86_64 |
diff --git a/src/features/instance.feature b/src/features/instance.feature
index ad22025..6f41f02 100644
--- a/src/features/instance.feature
+++ b/src/features/instance.feature
@@ -38,8 +38,8 @@ Feature: Mange Instances
Scenario: Launch instance
Given there is an uploaded image for a template
And I am on the instances page
- And there is "mock_profile" aggregator hardware profile
- And there is "mock_realm" aggregator realm
+ And there is "mock_profile" conductor hardware profile
+ And there is "mock_realm" conductor realm
And there is "mock_pool" pool
When I press "Create"
Then I should see "Show Templates"
diff --git a/src/features/step_definitions/hardware_profile_steps.rb
b/src/features/step_definitions/hardware_profile_steps.rb
index a7a17bf..acce11e 100644
--- a/src/features/step_definitions/hardware_profile_steps.rb
+++ b/src/features/step_definitions/hardware_profile_steps.rb
@@ -1,4 +1,4 @@
-Given /^there are the following aggregator hardware profiles:$/ do |table|
+Given /^there are the following conductor hardware profiles:$/ do |table|
table.hashes.each do |hash|
create_hwp(hash)
end
diff --git a/src/features/support/custom.rb b/src/features/support/custom.rb
index c2c4987..2dc872d 100644
--- a/src/features/support/custom.rb
+++ b/src/features/support/custom.rb
@@ -15,7 +15,7 @@ Provider.class_eval do
def populate_hardware_profiles
[[:mock_hwp1, :agg_hwp1], [:mock_hwp2, :agg_hwp2]].each do |mp_name, ap_name|
mock = Factory(mp_name, :provider_id => self.id)
- agg_mock = Factory(ap_name, :external_key => self.name +
Realm::AGGREGATOR_REALM_ACCOUNT_DELIMITER + mock.name)
+ agg_mock = Factory(ap_name, :external_key => self.name +
Realm::CONDUCTOR_REALM_ACCOUNT_DELIMITER + mock.name)
agg_mock.provider_hardware_profiles << mock
end
return true
diff --git a/src/image_builder_service/image_builder_service
b/src/image_builder_service/image_builder_service
index 0ffb74d..c20199c 100755
--- a/src/image_builder_service/image_builder_service
+++ b/src/image_builder_service/image_builder_service
@@ -17,14 +17,6 @@
# MA 02110-1301, USA. A copy of the GNU General Public License is
# also available at
http://www.gnu.org/copyleft/gpl.html.
-# This service is a very early attempt at integration with the Image Builder,
-# and should in no way be considered either stable or production-ready.
-# In order to use this service you must have the gem installed for
-# image_builder_console.
-# This can be checked out from the image_builder repo (link on
deltacloud.org),
-# and built locally. Then keep a terminal open to run this in and run with:
-# ruby image_builder_service.rb
-
$: << File.join(File.dirname(__FILE__), "../dutils")
require 'dutils'
require "image_builder_console"
@@ -33,8 +25,8 @@ require 'optparse'
help = false
daemon = true
-builder_pid_dir = "/var/run/deltacloud-aggregator"
-builder_log_dir = "/var/log/deltacloud-aggregator"
+builder_pid_dir = "/var/run/aeolus-conductor"
+builder_log_dir = "/var/log/aeolus-conductor"
timeout = 8
optparse = OptionParser.new do |opts|
diff --git a/src/lib/tasks/dc_tasks.rake b/src/lib/tasks/dc_tasks.rake
index f1d0c7d..e222ca5 100644
--- a/src/lib/tasks/dc_tasks.rake
+++ b/src/lib/tasks/dc_tasks.rake
@@ -61,7 +61,7 @@ namespace :dc do
desc 'Create user "admin" for CloudEngine'
task :create_admin_user => :environment do
- Rake::Task[:'dc:create_user'].invoke('admin', 'password',
'admin(a)deltacloud.org', 'Administrator', 'Administrator')
+ Rake::Task[:'dc:create_user'].invoke('admin', 'password',
'admin(a)aeolusproject.org', 'Administrator', 'Administrator')
Rake::Task[:'dc:site_admin'].invoke('admin')
end
diff --git a/src/public/javascripts/application.js
b/src/public/javascripts/application.js
index e5fce46..ef3b1d5 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -1,7 +1,7 @@
// Place your application-specific JavaScript functions and classes here
// This file is automatically included by javascript_include_tag :defaults
-var Aggregator = {
+var Conductor = {
extendTable: function(options) {
var table = $(options.id);
var wrapper = $(".wrapper", table);
@@ -69,7 +69,7 @@ var Aggregator = {
$('#list-view').removeClass('full').addClass('part');
$('#details-view').html(data)
.show();
- Aggregator.enhanceDetailsTabs();
+ Conductor.enhanceDetailsTabs();
});
});
},
@@ -159,11 +159,11 @@ var Aggregator = {
};
})(jQuery);
-/* Aggregator JS */
+/* Conductor JS */
$(document).ready(function () {
-
$(window).scroll(Aggregator.positionFooter).resize(Aggregator.positionFooter).scroll();
+ $(window).scroll(Conductor.positionFooter).resize(Conductor.positionFooter).scroll();
$("#notification").enhanceInteraction();
- Aggregator.enhanceListView();
- Aggregator.enhanceDetailsTabs();
+ Conductor.enhanceListView();
+ Conductor.enhanceDetailsTabs();
});
diff --git a/src/script/server b/src/script/server
index e9b183a..8d5e871 100755
--- a/src/script/server
+++ b/src/script/server
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
if Process.uid == 0 or Process.gid == 0
- puts "Deltacloud aggregator cannot be run as root"
+ puts "Aeolus Conductor cannot be run as root"
exit(1)
end
diff --git a/src/script/use-existing-ec2-templates
b/src/script/use-existing-ec2-templates
index 7396380..5896509 100755
--- a/src/script/use-existing-ec2-templates
+++ b/src/script/use-existing-ec2-templates
@@ -72,10 +72,10 @@ add_ec2_template("
add_ec2_template("
<?xml version=\"1.0\"?>
<image>
- <name>Deltacloud demo Fedora 13 64 bit image</name>
+ <name>Aeolus Conductor demo Fedora 13 64 bit image</name>
<repos>
<
repo>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Ev...
</repos>
<os name=\"fedora\" version=\"13\"
architecture=\"64-bit\"/>",
- "Deltacloud demo Fedora 13 64 bit image",
+ "Aeolus Conductor Fedora 13 64 bit image",
"ami-709d6919")
diff --git a/src/spec/fixtures/packagegroups.json b/src/spec/fixtures/packagegroups.json
index d915ac4..a556ca9 100644
--- a/src/spec/fixtures/packagegroups.json
+++ b/src/spec/fixtures/packagegroups.json
@@ -1,16 +1,16 @@
-{ "deltacloud" : { "_id" : "deltacloud",
+{ "conductor" : { "_id" : "conductor",
"conditional_package_names" : { },
"default" : true,
"default_package_names" : [ "libdeltacloud",
- "deltacloud-aggregator"
+ "aeolus-conductor"
],
- "description" : "Deltacloud description",
+ "description" : "Aeolus Conductor description",
"display_order" : 1024,
- "id" : "deltacloud",
+ "id" : "aeolus",
"immutable" : true,
"langonly" : null,
"mandatory_package_names" : [ ],
- "name" : "Deltacloud",
+ "name" : "Aeolus Conductor",
"optional_package_names" : [ ],
"repo_defined" : true,
"translated_description" : { },
diff --git a/src/spec/fixtures/packages.json b/src/spec/fixtures/packages.json
index 01b3dc9..303b886 100644
--- a/src/spec/fixtures/packages.json
+++ b/src/spec/fixtures/packages.json
@@ -20,12 +20,12 @@
"_ns" : "packages",
"arch" : "src",
"checksum" : { "sha256" :
"ae415673a3cb07b72d4fe33d9da2a69b0ad1c1e274bd3f04a41f863f17d39035" },
- "description" : "The Aggregator for deltacloud.",
- "download_url" :
"http://localhost//pub/deltacloud/deltacloud-aggregator-0.0.1-1.fc11.src.rpm",
+ "description" : "The Aeolus Conductor.",
+ "download_url" :
"http://localhost//pub/aeolus/aeolus-conductor-0.0.1-1.fc11.src.rpm",
"epoch" : "0",
- "filename" : "deltacloud-aggregator-0.0.1-1.fc11.src.rpm",
+ "filename" : "aeolus-conductor-0.0.1-1.fc11.src.rpm",
"id" : "e7f2bd45-4afa-412a-98f8-004b40748b82",
- "name" : "deltacloud-aggregator",
+ "name" : "aeolus-conductor",
"provides" : [ ],
"release" : "1.fc11",
"requires" : [ "ruby-devel",
diff --git a/src/spec/models/cloud_account_observer_spec.rb
b/src/spec/models/cloud_account_observer_spec.rb
index 48491c0..9e7f4d9 100644
--- a/src/spec/models/cloud_account_observer_spec.rb
+++ b/src/spec/models/cloud_account_observer_spec.rb
@@ -4,7 +4,7 @@ describe CloudAccountObserver do
fixtures :all
it "should create an instance_key if provider is EC2" do
- @client = mock('DeltaCloud', :null_object => true)
+ @client = mock('Conductor', :null_object => true)
@provider = Factory.build :ec2_provider
@key = mock('Key', :null_object => true)
@key.stub!(:pem).and_return("PEM")
diff --git a/src/spec/models/cloud_account_spec.rb
b/src/spec/models/cloud_account_spec.rb
index fb04e40..ad266d9 100644
--- a/src/spec/models/cloud_account_spec.rb
+++ b/src/spec/models/cloud_account_spec.rb
@@ -33,7 +33,7 @@ describe CloudAccount do
end
it "should create an instance_key if provider is EC2" do
- @client = mock('DeltaCloud', :null_object => true)
+ @client = mock('Conductor', :null_object => true)
@provider = Factory.build :ec2_provider
@key = mock('Key', :null_object => true)
@key.stub!(:pem).and_return("PEM")
@@ -50,7 +50,7 @@ describe CloudAccount do
end
it "when calling connect and it fails with exception it will return nil" do
- DeltaCloud.should_receive(:new).and_raise(Exception.new)
+ Conductor.should_receive(:new).and_raise(Exception.new)
@cloud_account.connect.should be_nil
end
diff --git a/src/spec/models/hardware_profile_spec.rb
b/src/spec/models/hardware_profile_spec.rb
index a3e75e7..b25712e 100644
--- a/src/spec/models/hardware_profile_spec.rb
+++ b/src/spec/models/hardware_profile_spec.rb
@@ -56,25 +56,25 @@ describe HardwareProfile do
end
end
- it "should allow Aggregator profiles only for provider profiles" do
+ it "should allow Conductor profiles only for provider profiles" do
@hp.provider = nil
- @hp.aggregator_hardware_profiles << @hp
- @hp.should have(1).error_on(:aggregator_hardware_profiles)
- @hp.errors.on(:aggregator_hardware_profiles).should eql(
- "Aggregator profiles only allowed for provider profiles")
+ @hp.conductor_hardware_profiles << @hp
+ @hp.should have(1).error_on(:conductor_hardware_profiles)
+ @hp.errors.on(:conductor_hardware_profiles).should eql(
+ "Conductor profiles only allowed for provider profiles")
- @hp.aggregator_hardware_profiles.clear
+ @hp.conductor_hardware_profiles.clear
@hp.should be_valid
end
- it "should allow Provider profiles only for aggregator profiles" do
+ it "should allow Provider profiles only for conductor profiles" do
@hp.provider = Provider.new
- @hp.aggregator_hardware_profiles << @hp
+ @hp.conductor_hardware_profiles << @hp
@hp.should have(1).error_on(:provider_hardware_profiles)
@hp.errors.on(:provider_hardware_profiles).should eql(
- "Provider profiles only allowed for aggregator profiles")
+ "Provider profiles only allowed for conductor profiles")
@hp.provider_hardware_profiles.clear
@hp.should be_valid
diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb
index 1b86f92..f9b68ef 100644
--- a/src/spec/models/provider_spec.rb
+++ b/src/spec/models/provider_spec.rb
@@ -1,9 +1,10 @@
+# -*- coding: utf-8 -*-
require 'spec_helper'
describe Provider do
context "(using stubbed out connect method)" do
before(:each) do
- @client = mock('DeltaCloud', :null_object => true)
+ @client = mock('', :null_object => true)
@provider = Factory.build(:mock_provider)
@provider.stub!(:connect).and_return(@client)
end
diff --git a/src/spec/services/data_service_active_record_spec.rb
b/src/spec/services/data_service_active_record_spec.rb
index b443fa9..4566a01 100644
--- a/src/spec/services/data_service_active_record_spec.rb
+++ b/src/spec/services/data_service_active_record_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe DataServiceActiveRecord do
it "should calculate the total instance quota usage for a provider with a number
of cloud accounts" do
- client = mock('DeltaCloud', :null_object => true)
+ client = mock('Conductor', :null_object => true)
provider = Factory.build(:mock_provider)
provider.stub!(:connect).and_return(client)
provider.save!
@@ -31,7 +31,7 @@ describe DataServiceActiveRecord do
end
it "should calculate the total number of instances and maximum number of instances
of a cloud account" do
- client = mock('DeltaCloud', :null_object => true)
+ client = mock('Conductor', :null_object => true)
provider = Factory.build(:mock_provider)
provider.stub!(:connect).and_return(client)
provider.save!
@@ -122,7 +122,7 @@ describe DataServiceActiveRecord do
end_time = Time.utc(2010,"jan",1,20,15,1)
start_time = end_time - (interval_length * no_intervals)
- client = mock('DeltaCloud', :null_object => true)
+ client = mock('Conductor', :null_object => true)
provider = Factory.build(:mock_provider)
provider.stub!(:connect).and_return(client)
provider.save!
diff --git a/src/spec/utils/repository_manager_spec.rb
b/src/spec/utils/repository_manager_spec.rb
index 98ff157..8a4bf01 100644
--- a/src/spec/utils/repository_manager_spec.rb
+++ b/src/spec/utils/repository_manager_spec.rb
@@ -37,7 +37,7 @@ describe RepositoryManager do
it 'should return a list of packagegroups' do
rep = @rmanager.repositories.first
- rep.groups.first[:id].should == 'deltacloud'
+ rep.groups.first[:id].should == 'aeolus'
end
it 'should return a list of categories' do
diff --git a/src/test/unit/provider_test.rb b/src/test/unit/provider_test.rb
index 877fd9c..5c2334c 100644
--- a/src/test/unit/provider_test.rb
+++ b/src/test/unit/provider_test.rb
@@ -20,7 +20,7 @@ class ProviderTest < ActiveSupport::TestCase
end
test "fails with invalid provider url" do
- @provider.url = "http://dcloud.awesome/api"
+ @provider.url = "http://conductor.awesome/api"
flunk "Invalid url passed validation" unless @provider.invalid?
end
--
1.7.3.5