[PATCH] Allow setting the temporary scratch directory.
by Chris Lalancette
Imagefactory uses oz, which in turn uses libguestfs. By
default libguestfs use /tmp to hold the temporary files
that it uses to launch. There are 2 reasons why you might
want to change this directory:
1) To conform to SELinux policies
2) To use a directory/partition with more space on it
libguestfs allows you to change the temporary directory
by setting TMPDIR appropriately, so add a command-line
option for tmpdir and set the environment variable.
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
imagefactory/ApplicationConfiguration.py | 1 +
imgfac.py | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/imagefactory/ApplicationConfiguration.py b/imagefactory/ApplicationConfiguration.py
index 450665f..e813aea 100644
--- a/imagefactory/ApplicationConfiguration.py
+++ b/imagefactory/ApplicationConfiguration.py
@@ -72,6 +72,7 @@ class ApplicationConfiguration(object):
argparser.add_argument('--config', default='/etc/imagefactory.conf', help='Configuration file to use. (default: %(default)s)')
argparser.add_argument('--output', default='/tmp', help='Build image files in location specified. (default: %(default)s)')
argparser.add_argument('--timeout', type=int, default=3600, help='Set the timeout period for image building in seconds. (default: %(default)s)')
+ argparser.add_argument('--tmpdir', default='/tmp', help='Use the specified location for temporary files. (default: %(default)s)')
group_qmf = argparser.add_argument_group(title='QMF agent', description='Provide a QMFv2 agent interface.')
group_qmf.add_argument('--qmf', action='store_true', default=False, help='Turn on QMF agent interface. (default: %(default)s)')
group_qmf.add_argument('--qpidd', default='localhost', help='URL of qpidd to connect to. (default: %(default)s)')
diff --git a/imgfac.py b/imgfac.py
index 5fb2179..5bc0af1 100755
--- a/imgfac.py
+++ b/imgfac.py
@@ -52,6 +52,11 @@ class Application(object):
self.pid_file_path = "/var/run/imagefactory.pid"
signal.signal(signal.SIGTERM, self.signal_handler)
self.app_config = ApplicationConfiguration().configuration
+
+ # by setting TMPDIR here we make sure that libguestfs
+ # (imagefactory -> oz -> libguestfs) uses the temporary directory of
+ # the user's choosing
+ os.putenv('TMPDIR', self.app_config['tmpdir'])
def setup_logging(self):
if (self.app_config['foreground']):
--
1.7.4.2
13 years, 1 month
[PATCH] Add the GPLv2 COPYING file to the top-level.
by Chris Lalancette
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
COPYING | 339 +++++++++++++++++++++++++++++++++
imagefactory/ImageFactoryException.py | 17 ++
2 files changed, 356 insertions(+), 0 deletions(-)
create mode 100644 COPYING
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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; either version 2 of the License, or
+ (at your option) any later version.
+
+ 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.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/imagefactory/ImageFactoryException.py b/imagefactory/ImageFactoryException.py
index 3039857..4050b7d 100644
--- a/imagefactory/ImageFactoryException.py
+++ b/imagefactory/ImageFactoryException.py
@@ -1,3 +1,20 @@
+# Copyright (C) 2010-2011 Red Hat, Inc.
+#
+# 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.
+
class ImageFactoryException(Exception):
def __init__(self, msg):
self.msg = msg
--
1.7.4.2
13 years, 1 month
[PATCH] Add a spec file to the imagefactory top-level.
by Chris Lalancette
Unfortunately, using the "bdist_rpm" target for setup.py
isn't really expressive enough to generate all of the things
we might need to do with the spec file for imagefactory.
As one example, we might need to add additional dependencies
to the spec beyond the ones that bdist_rpm detected. It would
also be nice to have a package description and a changelog.
To fix all of that, maintain our own spec at the top of
the repository hierarchy. That way we have full control
over it.
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
imagefactory.spec.in | 45 +++++++++++++++++++++++++++++++++++++++++++++
setup.py | 14 +++++++++++++-
2 files changed, 58 insertions(+), 1 deletions(-)
create mode 100644 imagefactory.spec.in
diff --git a/imagefactory.spec.in b/imagefactory.spec.in
new file mode 100644
index 0000000..f929183
--- /dev/null
+++ b/imagefactory.spec.in
@@ -0,0 +1,45 @@
+Summary: Image Factory system image generation tool
+Name: imagefactory
+Version: @VERSION@
+Release: 1%{?dist}
+Source0: %{name}-%{version}.tar.gz
+License: GPLv2
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Url: http://www.aeolusproject.org/imagefactory.html
+BuildArch: noarch
+Requires: oz
+Requires: euca2ools
+Requires: python-qmf
+Requires: python-pycurl
+Requires: python-libguestfs
+Requires: python-zope-interface
+Requires: python-boto
+Requires: libxml2-python
+Requires: python-httplib2
+Requires: python-argparse
+BuildRequires: python
+
+%description
+imagefactory is a daemon that listens for build requests via QMF. When
+a build request is received, imagefactory will build the requested image
+for the requested target.
+
+%prep
+%setup -n %{name}-%{version}
+
+%build
+python setup.py build
+
+%install
+python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f INSTALLED_FILES
+%defattr(-,root,root)
+
+%changelog
+* Mon Apr 04 2011 Chris Lalancette <clalance(a)redhat.com> - 0.1.6-1
+- Initial spec file.
diff --git a/setup.py b/setup.py
index 6569b74..f73ed8e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
from distutils.core import setup, Extension
+from distutils.command.sdist import sdist as _sdist
import os
import os.path
import subprocess
@@ -6,7 +7,7 @@ import subprocess
version_file_name = "version.txt"
try:
if(not os.path.exists(version_file_name)):
- subprocess.call('/usr/bin/git describe > %s' % (version_file_name, ), shell=True)
+ subprocess.call('/usr/bin/git describe | tr - _ > %s' % (version_file_name, ), shell=True)
version_file = open(version_file_name, "r")
VERSION = version_file.read()[0:-1]
version_file.close()
@@ -15,6 +16,16 @@ except Exception, e:
datafiles=[('/etc', ['imagefactory.conf']), ('/etc/pki/imagefactory', ['cert-ec2.pem']), ('/etc/rc.d/init.d', ['scripts/imagefactory']), ('', ['version.txt'])]
+class sdist(_sdist):
+ """ custom sdist command to prepare imagefactory.spec file """
+
+ def run(self):
+ cmd = (""" sed -e "s/@VERSION@/%s/g" < imagefactory.spec.in """ %
+ VERSION) + " > imagefactory.spec"
+ os.system(cmd)
+
+ _sdist.run(self)
+
setup(name='imagefactory',
version=VERSION,
description='Image Factory system image generation tool',
@@ -25,4 +36,5 @@ setup(name='imagefactory',
packages=['imagefactory', 'imagefactory.builders', 'imagefactory.qmfagent'],
scripts=['imgfac.py'],
data_files = datafiles,
+ cmdclass = {'sdist': sdist}
)
--
1.7.4.2
13 years, 1 month
[PATCH conductor] Revamp daemon settings for connector.
by jason.guiditta
This patch attempts to:
* Clean up the connector startup script so it starts only one process
(and stops/restarts more reliably)
* fix the rackup file for proper daemonization
There are some first steps toward making it run as the aeolus user,
but we are not quite there yet, so that will have to be a later patch.
---
.../image_factory/image_factory_connector/Rakefile | 2 +-
.../image_factory_connector/aeolus-connector.init | 94 +++++++++-----------
.../image_factory_connector/lib/config.ru | 9 ++
.../image_factory_connector.rb | 6 --
4 files changed, 52 insertions(+), 59 deletions(-)
diff --git a/services/image_factory/image_factory_connector/Rakefile b/services/image_factory/image_factory_connector/Rakefile
index 9ae2773..eb2fe0a 100644
--- a/services/image_factory/image_factory_connector/Rakefile
+++ b/services/image_factory/image_factory_connector/Rakefile
@@ -31,7 +31,7 @@ RPM_SPEC = "rubygem-image_factory_connector.spec"
spec = Gem::Specification.new do |s|
s.name = 'image_factory_connector'
- s.version = '0.0.1'
+ s.version = '0.0.2'
s.has_rdoc = true
#s.extra_rdoc_files = ['README', 'LICENSE']
s.summary = 'Sinatra microapp to talk to Aeolus Image Factory QMF console'
diff --git a/services/image_factory/image_factory_connector/aeolus-connector.init b/services/image_factory/image_factory_connector/aeolus-connector.init
index 02fced4..9c8a9bb 100755
--- a/services/image_factory/image_factory_connector/aeolus-connector.init
+++ b/services/image_factory/image_factory_connector/aeolus-connector.init
@@ -1,61 +1,58 @@
#!/bin/bash
#
-# aeolus-connector startup script for aeolus-connector
+# aeolus-connector Start up the aeolus-connector daemon
#
# chkconfig: 2345 97 03
-# description: aeolus-connector is a microapp to talk to
-# Aeolus Image Factory QMF console
+# description: aeolus-connector is a microapp to talk to \
+# Aeolus Image Factory QMF console
+
+# source function library
+. /etc/rc.d/init.d/functions
RETVAL=0
prog="aeolus-connector"
-exec=/usr/bin/image_factory_connector
-lockfile=/var/lock/subsys/aeolus-connector
+lockfile=/var/lock/subsys/$prog
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-# Source function library.
-. /etc/rc.d/init.d/functions
+gemdir=$( ruby -rubygems -e 'puts Gem::dir' )
+CONNECTOR_ENV="${CONNECTOR_ENV:-production}"
+RACKUP_FILE="${RACKUP_FILE:-$gemdir/gems/image_factory_connector-0.0.2/lib/config.ru}"
+RUN_DIR="${RUN_DIR:-$gemdir/gems/image_factory_connector-0.0.2/bin}"
+LOG="${THIN_LOG:-/var/log/aeolus-connector.log}"
+PID="${THIN_PID:-/var/run/aeolus-connector.pid}"
+AEOLUS_USER="${AEOLUS_USER:-aeolus}"
+PORT="${PORT:-2003}"
+ADDR=127.0.0.1
-port=2003
-logfile=/var/log/aeolus-conductor/aeolus-connector.log
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+CONNECTOR=image_factory_connector
start() {
- if [ $UID -ne 0 ] ; then
- echo "User has insufficient privilege."
- exit 1
- fi
- if [ -e $lockfile ] ; then
- status image_factory_connector > /dev/null 2>&1
- retval=$?
- if [ $retval == 0 ] ; then
- echo $prog is currently running
- exit 2
- fi
- fi
- [ -x $exec ] || exit 3
echo -n $"Starting $prog: "
- daemon $exec -p $port start >> $logfile 2>&1 &
- retval=$?
- if [ $retval -eq 0 ] ; then
- touch $lockfile
- echo_success
- echo
- exit 0
+ if [ -f $PID ] && checkpid `cat $PID` ; then
+ echo_failure
+ echo
+ echo -n $"$prog is already running"
+ exit 1
+ fi
+
+ $CONNECTOR -l $LOG -P $PID -a $ADDR -e $CONNECTOR_ENV --chdir $RUN_DIR -d -p $PORT start
+ # FIXME: long term, the version below is what we want to run, but at this point have not been able to get it working
+ #daemon --user $AEOLUS_USER $CONNECTOR -l $LOG -P $PID -a $ADDR -e $ENV -p $PORT --chdir $RUN_DIR -d start
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] ; then
+ echo_success
+ echo
else
- echo_failure
- echo
- exit 3
+ echo_failure
+ echo
fi
}
stop() {
- if [ $UID -ne 0 ] ; then
- echo "User has insufficient privilege."
- exit 4
- fi
echo -n $"Stopping $prog: "
- killproc image_factory_connector
- retval=$?
- if [ $retval -eq 0 ] && rm -f $lockfile ; then
+ killproc -p $PID $CONNECTOR
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] && rm -f $lockfile ; then
echo_success
echo
else
@@ -63,15 +60,6 @@ stop() {
fi
}
-restart() {
- stop
- start
-}
-
-rh_status() {
- status -l $lockfile image_factory_connector
-}
-
case "$1" in
start)
$1
@@ -80,14 +68,16 @@ case "$1" in
$1
;;
restart)
- $1
+ stop
+ start
;;
status)
- rh_status
+ status -p $PID $CONNECTOR
+ RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|status|restart}"
exit 2
esac
-exit $?
+exit $RETVAL
diff --git a/services/image_factory/image_factory_connector/lib/config.ru b/services/image_factory/image_factory_connector/lib/config.ru
index 82a1a3d..ad3291a 100644
--- a/services/image_factory/image_factory_connector/lib/config.ru
+++ b/services/image_factory/image_factory_connector/lib/config.ru
@@ -1,4 +1,13 @@
$: << File.expand_path(File.dirname(__FILE__) + '.')
require 'image_factory_connector'
+@l = Logger.new(STDOUT)
+(a)l.level = Logger::DEBUG
+
+@console = ImageFactoryConsole.new({:handler=>FactoryRestHandler.new(@l), :logger =>@l})
+(a)console.start
+
run ImageFactoryConnector
+
+ImageFactoryConnector.set :console, @console
+ImageFactoryConnector.set :logger, @l
diff --git a/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb b/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
index 2ecbd58..f17b3e2 100644
--- a/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
+++ b/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
@@ -29,12 +29,6 @@ class ImageFactoryConnector < Sinatra::Base
set :port, 2003
set :app_file, __FILE__
set :views, File.dirname(__FILE__) + '/views'
- @l = Logger.new(STDOUT)
- @l.level = Logger::DEBUG
- @console = ImageFactoryConsole.new({:handler=>FactoryRestHandler.new(@l), :logger =>@l})
- @console.start
- set :console, @console
- set :logger, @l
end
# TODO: add validation for required params not being passed at all,
--
1.7.4.2
13 years, 1 month
#1192 - Create assembly for new templates
by Matt Wagner
This is a quick little patch to automatically create an assembly for
newly-created templates. It seems like a great number of tasks depend on
this happening.
-- Matt
13 years, 1 month
Update/Create new UI for creating pools
by Jirka Tomasek
Feature #1075: As an SA I want to create a pool
Task #1100 Update/Create new UI for creating pools
The Pool create/edit form must include setting the quota and the pool
family this pool is associated with.
13 years, 1 month
[PATCH conductor] BZ #696228. Builds stay in queued.
by Jason Guiditta
https://bugzilla.redhat.com/show_bug.cgi?id=696228
This adds a temporary fix to cover the race condition seen
in testing when a status update comes back before the build
request from conductor has completed and update the uuid in
conductor db.
---
.../factory_rest_handler.rb | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/services/image_factory/image_factory_connector/lib/image_factory_connector/factory_rest_handler.rb b/services/image_factory/image_factory_connector/lib/image_factory_connector/factory_rest_handler.rb
index 35e1366..2a0cead 100644
--- a/services/image_factory/image_factory_connector/lib/image_factory_connector/factory_rest_handler.rb
+++ b/services/image_factory/image_factory_connector/lib/image_factory_connector/factory_rest_handler.rb
@@ -50,6 +50,13 @@ class FactoryRestHandler < BaseHandler
:headers => {:Accepts => "application/xml"},
:params => {:uuid => e.uuid, :status => e.value})
hydra.queue(request)
+ # FIXME: this is a temporary hack to get around the case where
+ # updates are triggered before the initial request from conductor
+ # has completed, which can happen because this is all asynchronous.
+ # Once status is stored in warehouse rather than conductor, this
+ # will not be an issue, so it is not worth doing something more
+ # elegant right now.
+ sleep(5)
request.on_complete do |response|
# 3. Log errors
logger.debug "Return code is: #{response.code}"
--
1.7.4
13 years, 1 month
[PATCH] Bug #1194 / BZ695489 aeolus deltacloudd wrapper scripts report invalid status
by steve linabery
initscripts for deltacloud-core services were not checking process status in start() section.
Also reordered the killproc/RETVAL in the stop() method.
---
recipes/aeolus_recipe/templates/deltacloud-core | 24 ++++++++++++++--------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/recipes/aeolus_recipe/templates/deltacloud-core b/recipes/aeolus_recipe/templates/deltacloud-core
index 05e27bf..d5cd141 100644
--- a/recipes/aeolus_recipe/templates/deltacloud-core
+++ b/recipes/aeolus_recipe/templates/deltacloud-core
@@ -25,24 +25,30 @@ PROG=/usr/bin/deltacloudd
start() {
echo -n "Starting deltacloud-<%= name %>: "
- $PROG -i $DRIVER -e $ENV -p $PORT >> $LOGFILE 2>&1 &
- RETVAL=$?
- echo $! > $PIDFILE
- if [ $RETVAL -eq 0 ] && touch $LOCKFILE ; then
- echo_success
- echo
+ if test -f $LOCKFILE ; then
+ echo_success
+ echo
else
- echo_failure
- echo
+ $PROG -i $DRIVER -e $ENV -p $PORT >> $LOGFILE 2>&1 &
+ RETVAL=$?
+ echo $! > $PIDFILE
+ if [ $RETVAL -eq 0 ] && touch $LOCKFILE ; then
+ echo_success
+ echo
+ else
+ echo_failure
+ echo
+ fi
fi
}
stop() {
echo -n "Shutting down deltacloud-<%= name %>: "
- RETVAL=$?
+
# FIXME! we need to do a killproc -p <pidfile> here to ensure other deltacloud
# daemons are not killed as well
killproc -p $PIDFILE deltacloudd
+ RETVAL=$?
if [ $RETVAL -eq 0 ] && rm -f $LOCKFILE ; then
echo_success
echo
--
1.7.4.2
13 years, 1 month
[PATCH configure] BZ 692161 / Task 1142: Fix how /etc/init.d/solr reports status
by Richard Su
"service solr status" was reporting solr was not started because it was
looking for a rake process when solr runs in a java process. Rake is
used to initiate the java process. Changed status to use the pid file.
---
recipes/aeolus_recipe/files/solr.init | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes/aeolus_recipe/files/solr.init b/recipes/aeolus_recipe/files/solr.init
index 8bbddcd..f6bdb3c 100644
--- a/recipes/aeolus_recipe/files/solr.init
+++ b/recipes/aeolus_recipe/files/solr.init
@@ -12,7 +12,7 @@
LOCKFILE="${LOCKFILE:-/var/lock/subsys/solr}"
RAILS_ENV="${RAILS_ENV:-production}"
-
+PIDFILE=/usr/share/aeolus-conductor/tmp/pids/sunspot-solr-$RAILS_ENV.pid
PROG=/usr/bin/rake
. /etc/init.d/functions
@@ -20,7 +20,7 @@ PROG=/usr/bin/rake
start() {
echo -n "Starting solr: "
- cd /usr/share/aeolus-conductor; RAILS_ENV=$RAILS_ENV $PROG sunspot:solr:start
+ cd /usr/share/aeolus-conductor; RAILS_ENV=$RAILS_ENV daemon --pidfile=$PIDFILE $PROG sunspot:solr:start
RETVAL=$?
if [ $RETVAL -eq 0 ] && touch $LOCKFILE ; then
echo_success
@@ -62,7 +62,7 @@ case "$1" in
restart
;;
status)
- status $PROG
+ status -p $PIDFILE $PROG
RETVAL=$?
;;
*)
--
1.7.4.2
13 years, 1 month
[PATCH configure] Change default package handling behavior in configure
by Mike Orazi
This patchset removes the conditionalization of package installation and
leverages the fact that the rpm provider doesn't install packages without a
source attribute set.
Puppet will report failure if needed packages aren't already installed, but
by later parameterizing the default Package provider we can switch back
to the yum provider for a more 'installer' based feel as desired.
Quick verification can be done by removing an expected package such as
aeolus-conductor and running aeolus-configure. This will report a failure
given the current setup. Changing the package provider in defaults.pp to
'yum' will result in an installer type behavior.
13 years, 1 month
