Chris Lalancette
2008-Sep-10 06:42 UTC
[Ovirt-devel] [PATCH-node 0/2]: Allow the WUI to manage the hardware it is running on
Node patches for allowing the WUI to manage the hardware it is running on.
Chris Lalancette
2008-Sep-10 06:42 UTC
[Ovirt-devel] [PATCH-node 1/2] Add ovirt-listen-awake daemon. This is a very small daemon that oVirt
Signed-off-by: Chris Lalancette <clalance at redhat.com>
---
:100644 100644 0ae494d... fad3fb5... M Makefile.am
:100644 100644 453d015... e6ba7e3... M configure.ac
:000000 100644 0000000... d511905... A ovirt-listen-awake/COPYING
:000000 100644 0000000... b7f299c... A ovirt-listen-awake/Makefile.am
:000000 100644 0000000... 7ecd0a7... A ovirt-listen-awake/ovirt-listen-awake.c
:100644 100644 5c092b4... 736338d... M ovirt-node.spec
Makefile.am | 2 +-
configure.ac | 2 +-
ovirt-listen-awake/COPYING | 339 +++++++++++++++++++++++++++++++
ovirt-listen-awake/Makefile.am | 22 ++
ovirt-listen-awake/ovirt-listen-awake.c | 225 ++++++++++++++++++++
ovirt-node.spec | 7 +-
6 files changed, 594 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0ae494d..fad3fb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@
# MA 02110-1301, USA. A copy of the GNU General Public License is
# also available at http://www.gnu.org/copyleft/gpl.html.
-SUBDIRS = ovirt-identify-node
+SUBDIRS = ovirt-identify-node ovirt-listen-awake
EXTRA_DIST = \
.gitignore \
diff --git a/configure.ac b/configure.ac
index 453d015..e6ba7e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,5 +13,5 @@ PKG_CHECK_MODULES([VIRT], [libvirt >= 0.4.4])
test x"$ac_ct_CC:$CFLAGS" = 'xgcc:-g -O2' \
&& CFLAGS="$CFLAGS -Wshadow -Wall -Werror"
-AC_CONFIG_FILES([Makefile ovirt-identify-node/Makefile])
+AC_CONFIG_FILES([Makefile ovirt-identify-node/Makefile
ovirt-listen-awake/Makefile])
AC_OUTPUT
diff --git a/ovirt-listen-awake/COPYING b/ovirt-listen-awake/COPYING
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/ovirt-listen-awake/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/ovirt-listen-awake/Makefile.am b/ovirt-listen-awake/Makefile.am
new file mode 100644
index 0000000..b7f299c
--- /dev/null
+++ b/ovirt-listen-awake/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright (C) 2008 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.
+
+bin_PROGRAMS = ovirt-listen-awake
+
+EXTRA_DIST = ovirt-listen-awake.init ovirt-convert-host ovirt-unconvert-host
+
+ovirt_listen_awake_SOURCES = ovirt-listen-awake.c
diff --git a/ovirt-listen-awake/ovirt-listen-awake.c
b/ovirt-listen-awake/ovirt-listen-awake.c
new file mode 100644
index 0000000..7ecd0a7
--- /dev/null
+++ b/ovirt-listen-awake/ovirt-listen-awake.c
@@ -0,0 +1,225 @@
+/* ovirt-listen-awake: daemon to listen for and respond to AWAKE requests
+ *
+ * Copyright (C) 2008 Red Hat, Inc.
+ * Written by Chris Lalancette <clalance at 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <error.h>
+#include <string.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <ctype.h>
+
+// We only ever expect to receive the strings "AWAKE" or
"IDENTIFY", so
+// 20 bytes is more than enough
+#define BUFLEN 20
+#define LOGFILE "/var/log/ovirt-host.log"
+
+static int streq(char *first, char *second)
+{
+ int first_len, second_len;
+
+ first_len = strlen(first);
+ second_len = strlen(second);
+
+ if (first_len == second_len && strncmp(first, second, first_len) ==
0)
+ return 1;
+ return 0;
+}
+
+// Given a buffer, find the first whitespace character, replace it with \0,
+// and return
+static void find_first_whitespace(char *buffer)
+{
+ int i;
+
+ i = 0;
+ while (buffer[i] != '\0') {
+ if (isspace(buffer[i])) {
+ // once we see the first whitespace character, we are done
+ buffer[i] ='\0';
+ break;
+ }
+ i++;
+ }
+}
+
+static int listenSocket(int listen_port)
+{
+ struct sockaddr_in a;
+ int s,yes;
+
+ if (listen_port < 0) {
+ error(0, 0, "Invalid listen_port %d", listen_port);
+ return -1;
+ }
+
+ s = socket(AF_INET, SOCK_STREAM, 0);
+ if (s < 0) {
+ error(0, errno, "Failed creating socket");
+ return -1;
+ }
+
+ yes = 1;
+ if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,(char *)&yes, sizeof (yes))
< 0) {
+ error(0, errno, "Failed setsockopt");
+ close(s);
+ return -1;
+ }
+
+ memset (&a, 0, sizeof (a));
+ a.sin_port = htons (listen_port);
+ a.sin_family = AF_INET;
+ if (bind(s, (struct sockaddr *) &a, sizeof (a)) < 0) {
+ error(0, errno, "Error binding to port %d", listen_port);
+ close(s);
+ return -1;
+ }
+
+ if (listen(s, 10) < 0) {
+ error(0, errno, "Error listening on port %d", listen_port);
+ close(s);
+ return -1;
+ }
+ return s;
+}
+
+static void usage(int exitcode)
+{
+ printf("Usage: ovirt-listen-awake [OPTIONS]\n");
+ printf("OPTIONS:\n");
+ printf(" -h\t\tShow this help message\n");
+ printf(" -n\t\tDo not daemonize (useful for debugging)\n");
+ exit(exitcode);
+}
+
+int main(int argc, char *argv[])
+{
+ int listen_socket, conn;
+ struct sockaddr_in client_address;
+ unsigned int addrlen;
+ FILE *conn_stream;
+ FILE *logfile;
+ char buffer[BUFLEN];
+ int c;
+ int do_daemon;
+ int i;
+
+ do_daemon = 1;
+
+ while ((c=getopt(argc, argv, ":hn")) != -1) {
+ switch(c) {
+ case 'h':
+ usage(0);
+ break;
+ case 'n':
+ do_daemon = 0;
+ break;
+ default:
+ usage(1);
+ }
+ }
+
+ if ((argc-optind) != 0) {
+ for (i = optind; i < argc ; i ++) {
+ fprintf(stderr, "Extra operand %s\n", argv[i]);
+ }
+ error(1, 0, "Try --help for more information");
+ }
+
+ listen_socket = listenSocket(7777);
+ if (listen_socket < 0)
+ return 2;
+
+ if (do_daemon) {
+ logfile = fopen(LOGFILE,"a+");
+ if (logfile == NULL)
+ error(3, errno, "Error opening logfile %s", LOGFILE);
+
+ // NOTE: this closes stdout and stderr
+ if (daemon(0, 0) < 0)
+ error(4, errno, "Error daemonizing");
+
+ // so re-open them to the logfile here
+ dup2(fileno(logfile), STDOUT_FILENO);
+ dup2(fileno(logfile), STDERR_FILENO);
+ }
+
+ while (1) {
+ addrlen = sizeof(client_address);
+ memset(&client_address, 0, addrlen);
+ memset(buffer, 0, BUFLEN);
+ conn = accept(listen_socket, (struct sockaddr *)&client_address,
&addrlen);
+ if (conn < 0) {
+ error(0, errno, "Error accepting socket");
+ continue;
+ }
+
+ conn_stream = fdopen(conn, "r");
+ if (conn_stream == NULL) {
+ error(0, errno, "Error converting fd to stream");
+ close(conn);
+ continue;
+ }
+
+ if (fgets(buffer, BUFLEN, conn_stream) == NULL) {
+ error(0, errno, "Error receiving data");
+ fclose(conn_stream);
+ continue;
+ }
+
+ find_first_whitespace(buffer);
+
+ if (streq(buffer, "IDENTIFY")) {
+ // run ovirt-identify-node against 192.168.50.2 (the WUI node)
+ fprintf(stderr, "Doing identify\n");
+ // FIXME: it would be best to call the "find_srv" shell script
here to
+ // find out where we should contact. However, we would still have to
+ // hardcode which DNS server to use (192.168.50.2), and which domain
+ // name to use "priv.ovirt.org" to get this to work. I
don't have
+ // a good idea how to solve this at the moment.
+ system("ovirt-identify-node -s 192.168.50.2 -p 12120");
+ }
+ else if (streq(buffer, "AWAKE")) {
+ // run ovirt-awake against 192.168.50.2
+ fprintf(stderr, "Doing awake\n");
+ // FIXME: I hate to duplicate this stuff here, but I can't use the
+ // ovirt init scripts as-is; they depend too much on the environment
+ // (in particular, which DNS server to use to resolve, and which
+ // domainname). Until I come up with a good solution for that, I'll
+ // have to leave this as-is.
+ system("wget -q http://192.168.50.2:80/ipa/config/krb5.ini -O
/etc/krb5.conf");
+ system("ovirt-awake start 192.168.50.2 12120
/etc/libvirt/krb5.tab");
+ }
+ else {
+ error(0, 0, "Unknown command %s", buffer);
+ }
+
+ fclose(conn_stream);
+ }
+
+ close(listen_socket);
+ fclose(logfile);
+
+ return 0;
+}
diff --git a/ovirt-node.spec b/ovirt-node.spec
index 5c092b4..736338d 100644
--- a/ovirt-node.spec
+++ b/ovirt-node.spec
@@ -43,6 +43,7 @@ make
%{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
%{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node
%{buildroot}%{_sbindir}
+%{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake
%{buildroot}%{_sbindir}
%{__install} -p -m0644 scripts/ovirt-functions %{buildroot}%{_initrddir}
%{__install} -p -m0755 scripts/ovirt-early %{buildroot}%{_initrddir}
@@ -130,6 +131,7 @@ fi
%defattr(-,root,root,0755)
%{_sbindir}/ovirt-awake
%{_sbindir}/ovirt-identify-node
+%{_sbindir}/ovirt-listen-awake
%{_initrddir}/ovirt-early
%{_initrddir}/ovirt
%{_initrddir}/ovirt-post
@@ -147,9 +149,12 @@ fi
%doc ovirt-identify-node/COPYING
%changelog
-* Mon Sep 8 2008 Jim Meyering <meyering at redhat.com> - 0.92 0.4
+* Mon Sep 8 2008 Jim Meyering <meyering at redhat.com> - 0.92 0.6
- Update ovirt-identify-node's build rule.
+* Fri Aug 22 2008 Chris Lalancette <clalance at redhat.com> - 0.92 0.5
+- Add the ovirt-listen-awake daemon to the RPM
+
* Fri Aug 22 2008 Chris Lalancette <clalance at redhat.com> - 0.92 0.4
- Re-arrange the directory layout, in preparation for ovirt-listen-awake
--
1.5.4.1
Chris Lalancette
2008-Sep-10 06:42 UTC
[Ovirt-devel] [PATCH-node 2/2] A rather large re-write of the ovirt-node.spec file. The reason
Signed-off-by: Chris Lalancette <clalance at redhat.com>
---
:000000 100644 0000000... 584291a... A ovirt-listen-awake/ovirt-convert-host
:000000 100644 0000000... a6bb78a... A
ovirt-listen-awake/ovirt-listen-awake.init
:000000 100644 0000000... 4f0b02d... A ovirt-listen-awake/ovirt-unconvert-host
:100644 100644 736338d... 3274a3f... M ovirt-node.spec
:100644 100644 083e13d... 6ea034a... M scripts/ovirt-functions
ovirt-listen-awake/ovirt-convert-host | 58 +++++++++++++++++++
ovirt-listen-awake/ovirt-listen-awake.init | 49 ++++++++++++++++
ovirt-listen-awake/ovirt-unconvert-host | 32 ++++++++++
ovirt-node.spec | 86 ++++++++++++++++-----------
scripts/ovirt-functions | 26 ++++++++
5 files changed, 216 insertions(+), 35 deletions(-)
diff --git a/ovirt-listen-awake/ovirt-convert-host
b/ovirt-listen-awake/ovirt-convert-host
new file mode 100644
index 0000000..584291a
--- /dev/null
+++ b/ovirt-listen-awake/ovirt-convert-host
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+. /etc/init.d/ovirt-functions
+
+PATH=$PATH:/sbin:/usr/sbin
+
+if [ $# -ne 0 ]; then
+ echo "Usage: ovirt-convert-host"
+ exit 1
+fi
+
+backup_file() {
+ dir=$(dirname "$1")
+ case $dir in /*);; *) die "unexpected non-absolute dir: $dir";;
esac
+ mkdir -p "$OVIRT_BACKUP_DIR/${dir:1}"
+ cp -pf "$1" "$OVIRT_BACKUP_DIR/${dir:1}"
+}
+
+add_if_not_exist() {
+ string="$1"
+ file="$2"
+
+ grep -qE "^[[:space:]]*$string($|#|[[:space:]])"
"$file" \
+ || echo "$string" >> "$file"
+}
+
+echo "This script will make a number of changes to your system to enable
it to"
+echo "work as an oVirt node. You can later undo these changes by"
+echo "running /usr/sbin/ovirt-unconvert-host. Do you want to proceed?
[y/N]?"
+read yesno
+
+if [ "$yesno" != "y" -a "$yesno" != "Y"
]; then
+ exit 2
+fi
+
+mkdir -p $OVIRT_BACKUP_DIR
+
+backup_file /etc/sysconfig/network
+sed -i -e 's/^HOSTNAME=.*/HOSTNAME=physical.priv.ovirt.org/'
/etc/sysconfig/network
+
+backup_file /etc/hosts
+add_if_not_exist "192.168.50.1 physical.priv.ovirt.org" /etc/hosts
+add_if_not_exist "192.168.50.2 management.priv.ovirt.org" /etc/hosts
+
+chkconfig ovirt-listen-awake on
+chkconfig collectd on
+
+backup_file /etc/sysconfig/libvirtd
+backup_file /etc/libvirt/qemu.conf
+backup_file /etc/libvirt/libvirtd.conf
+backup_file /etc/sasl2/libvirt.conf
+ovirt_setup_libvirtd
+
+backup_file /etc/sysconfig/iptables
+lokkit -n -t ovirtbr0
+
+echo "Setup complete. To make the changes take effect, shut down any
running
+guests and reboot the host"
diff --git a/ovirt-listen-awake/ovirt-listen-awake.init
b/ovirt-listen-awake/ovirt-listen-awake.init
new file mode 100644
index 0000000..a6bb78a
--- /dev/null
+++ b/ovirt-listen-awake/ovirt-listen-awake.init
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+#
+# ovirt-listen-awake startup script for ovirt-listen-awake
+#
+# chkconfig: - 97 03
+# description: ovirt-listen-awake is a daemon to listen for requests from
+# the ovirt VM manager. When it receives one, it contacts the machine
+# back with details so that it is added to the ovirt host pool.
+
+DAEMON=/usr/sbin/ovirt-listen-awake
+
+. /etc/init.d/functions
+
+start() {
+ echo -n "Starting ovirt-listen-awake: "
+ daemon $DAEMON
+ RETVAL=$?
+ echo
+}
+
+stop() {
+ echo -n "Shutting down ovirt-listen-awake: "
+ killproc ovirt-listen-awake
+ RETVAL=$?
+ echo
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ status)
+ status $DAEMON
+ RETVAL=$?
+ ;;
+ *)
+ echo "Usage: ovirt-listen-awake {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+exit $RETVAL
diff --git a/ovirt-listen-awake/ovirt-unconvert-host
b/ovirt-listen-awake/ovirt-unconvert-host
new file mode 100644
index 0000000..4f0b02d
--- /dev/null
+++ b/ovirt-listen-awake/ovirt-unconvert-host
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. /etc/init.d/ovirt-functions
+
+PATH=$PATH:/sbin:/usr/sbin
+
+if [ $# -ne 0 ]; then
+ echo "Usage: ovirt-unconvert-host"
+ exit 1
+fi
+
+if [ ! -d $OVIRT_BACKUP_DIR ]; then
+ echo "The oVirt backup directory $OVIRT_BACKUP_DIR doesn't exist;
can't"
+ echo "unconvert the host"
+ exit 2
+fi
+
+unbackup_file() {
+ # note that $1 will have a / on the front, so we don't need to add our
own
+ cp -pf "$OVIRT_BACKUP_DIR$1" "$1"
+}
+
+chkconfig ovirt-listen-awake off
+chkconfig collectd off
+
+unbackup_file /etc/sysconfig/network
+unbackup_file /etc/hosts
+unbackup_file /etc/sysconfig/libvirtd
+unbackup_file /etc/libvirt/qemu.conf
+unbackup_file /etc/libvirt/libvirtd.conf
+unbackup_file /etc/sasl2/libvirt.conf
+unbackup_file /etc/sysconfig/iptables
diff --git a/ovirt-node.spec b/ovirt-node.spec
index 736338d..3274a3f 100644
--- a/ovirt-node.spec
+++ b/ovirt-node.spec
@@ -15,6 +15,8 @@ BuildRequires: libvirt-devel
BuildRequires: dbus-devel hal-devel
Requires: libvirt
Requires: hal
+Requires: collectd
+Requires: cyrus-sasl-gssapi
ExclusiveArch: %{ix86} x86_64
%define app_root %{_datadir}/%{name}
@@ -23,6 +25,20 @@ ExclusiveArch: %{ix86} x86_64
Provides a series of daemons and support utilities to allow an
oVirt Node to interact with the oVirt server.
+%package stateless
+Summary: The oVirt Node scripts for stateless
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+%description stateless
+This package does configuration for a stateless oVirt Node.
+
+%package stateful
+Summary: The oVirt node scripts for existing machines
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+%description stateful
+This package does configuration for a stateful oVirt node.
+
%prep
%setup -q
@@ -44,6 +60,9 @@ make
%{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
%{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node
%{buildroot}%{_sbindir}
%{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake
%{buildroot}%{_sbindir}
+%{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init
%{buildroot}%{_initrddir}/ovirt-listen-awake
+%{__install} -Dp -m0755 ovirt-listen-awake/ovirt-convert-host
%{buildroot}%{_sbindir}
+%{__install} -Dp -m0755 ovirt-listen-awake/ovirt-unconvert-host
%{buildroot}%{_sbindir}
%{__install} -p -m0644 scripts/ovirt-functions %{buildroot}%{_initrddir}
%{__install} -p -m0755 scripts/ovirt-early %{buildroot}%{_initrddir}
@@ -52,8 +71,6 @@ make
%{__install} -p -m0644 scripts/collectd %{buildroot}%{_sysconfdir}/chkconfig.d
%{__install} -p -m0644 scripts/collectd.conf.in %{buildroot}%{_sysconfdir}
-%{__install} -p -m0755 scripts/kvm-ifup %{buildroot}%{_sysconfdir}
-%{__install} -p -m0755 scripts/dhclient-exit-hooks %{buildroot}%{_sysconfdir}
%{__install} -p -m0755 logrotate/ovirt-logrotate
%{buildroot}%{_sysconfdir}/cron.hourly
%{__install} -p -m0644 logrotate/ovirt-logrotate.conf
%{buildroot}%{_sysconfdir}/logrotate.d
@@ -63,40 +80,26 @@ echo "oVirt Node release %{version}-%{release}"
> %{buildroot}%{_sysconfdir}/ovi
%clean
%{__rm} -rf %{buildroot}
-%post
+%post stateful
+/sbin/chkconfig --add ovirt-listen-awake
+# this is ugly; we need collectd to start *after* libvirtd, so we own the
+# /etc/chkconfig.d/collectd file, and then have to re-define collectd here
+/sbin/chkconfig --add collectd
+
+%post stateless
/sbin/chkconfig --add ovirt-early
/sbin/chkconfig ovirt-early on
/sbin/chkconfig --add ovirt
/sbin/chkconfig ovirt on
/sbin/chkconfig --add ovirt-post
/sbin/chkconfig ovirt-post on
-/sbin/chkconfig --add collectd
-/sbin/chkconfig collectd on
-
-# just to get a boot warning to shut up
-touch /etc/resolv.conf
-
-# make libvirtd listen on the external interfaces
-sed -i -e "s/^#\(LIBVIRTD_ARGS=\"--listen\"\).*/\1/"
/etc/sysconfig/libvirtd
-# set up qemu daemon to allow outside VNC connections
-sed -i -e "s/^[[:space:]]*#[[:space:]]*\(vnc_listen =
\"0.0.0.0\"\).*/\1/" \
- /etc/libvirt/qemu.conf
-
-# set up libvirtd to listen on TCP (for kerberos)
-sed -i -e "s/^[[:space:]]*#[[:space:]]*\(listen_tcp\)\>.*/\1 = 1/"
\
- -e "s/^[[:space:]]*#[[:space:]]*\(listen_tls\)\>.*/\1 = 0/" \
- /etc/libvirt/libvirtd.conf
+. /etc/init.d/ovirt-functions
+ovirt_setup_libvirtd
# make sure we don't autostart virbr0 on libvirtd startup
rm -f /etc/libvirt/qemu/networks/autostart/default.xml
-# with the new libvirt (0.4.0), make sure we we setup gssapi in the mech_list
-if [ `egrep -c "^mech_list: gssapi" /etc/sasl2/libvirt.conf` -eq 0 ];
then
- sed -i -e "s/^\([[:space:]]*mech_list.*\)/#\1/"
/etc/sasl2/libvirt.conf
- echo "mech_list: gssapi" >> /etc/sasl2/libvirt.conf
-fi
-
# remove the /etc/krb5.conf file; it will be fetched on bootup
rm -f /etc/krb5.conf
@@ -120,25 +123,22 @@ cat <<EOF > /etc/issue
EOF
cp -p /etc/issue /etc/issue.net
-%preun
+%preun stateless
if [ "$1" = 0 ] ; then
/sbin/chkconfig --del ovirt-early
/sbin/chkconfig --del ovirt
/sbin/chkconfig --del ovirt-post
fi
+%preun stateful
+if [ "$1" = 0 ] ; then
+ /sbin/chkconfig --del ovirt-listen-awake
+fi
+
%files
%defattr(-,root,root,0755)
%{_sbindir}/ovirt-awake
%{_sbindir}/ovirt-identify-node
-%{_sbindir}/ovirt-listen-awake
-%{_initrddir}/ovirt-early
-%{_initrddir}/ovirt
-%{_initrddir}/ovirt-post
-%{_sysconfdir}/kvm-ifup
-%{_sysconfdir}/dhclient-exit-hooks
-%config %{_sysconfdir}/logrotate.d/ovirt-logrotate.conf
-%config %{_sysconfdir}/cron.hourly/ovirt-logrotate
%defattr(-,root,root,0644)
%{_initrddir}/ovirt-functions
%{_sysconfdir}/collectd.conf.in
@@ -148,10 +148,26 @@ fi
%doc ovirt-identify-node/AUTHOR ovirt-identify-node/ChangeLog
%doc ovirt-identify-node/COPYING
+%files stateful
+%{_initrddir}/ovirt-listen-awake
+%{_sbindir}/ovirt-listen-awake
+%{_sbindir}/ovirt-convert-host
+%{_sbindir}/ovirt-unconvert-host
+
+%files stateless
+%config %{_sysconfdir}/logrotate.d/ovirt-logrotate.conf
+%config %{_sysconfdir}/cron.hourly/ovirt-logrotate
+%{_initrddir}/ovirt-early
+%{_initrddir}/ovirt
+%{_initrddir}/ovirt-post
+
%changelog
-* Mon Sep 8 2008 Jim Meyering <meyering at redhat.com> - 0.92 0.6
+* Mon Sep 8 2008 Jim Meyering <meyering at redhat.com> - 0.92 0.7
- Update ovirt-identify-node's build rule.
+* Thu Aug 28 2008 Chris Lalancette <clalance at redhat.com> - 0.92 0.6
+- Rewrite the whole spec to make sub-packages for stateless vs. stateful
+
* Fri Aug 22 2008 Chris Lalancette <clalance at redhat.com> - 0.92 0.5
- Add the ovirt-listen-awake daemon to the RPM
diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions
index 083e13d..6ea034a 100644
--- a/scripts/ovirt-functions
+++ b/scripts/ovirt-functions
@@ -5,6 +5,8 @@ OVIRT_LOGFILE=/var/log/ovirt.log
# label of the oVirt partition
OVIRT_LABEL=OVIRT
+OVIRT_BACKUP_DIR=/var/lib/ovirt-backup
+
find_srv()
{
local dnsreply
@@ -21,3 +23,27 @@ die()
{
echo "$@" 1>&2; failure; echo 1>&2; exit 1
}
+
+ovirt_setup_libvirtd() {
+ # just to get a boot warning to shut up
+ touch /etc/resolv.conf
+
+ # make libvirtd listen on the external interfaces
+ sed -i -e 's/^#\(LIBVIRTD_ARGS="--listen"\).*/\1/' \
+ /etc/sysconfig/libvirtd
+
+ # set up qemu daemon to allow outside VNC connections
+ sed -i -e 's/^[[:space:]]*#[[:space:]]*\(vnc_listen =
"0.0.0.0"\).*/\1/' \
+ /etc/libvirt/qemu.conf
+ # set up libvirtd to listen on TCP (for kerberos)
+ sed -i -e "s/^[[:space:]]*#[[:space:]]*\(listen_tcp\)\>.*/\1 =
1/" \
+ -e "s/^[[:space:]]*#[[:space:]]*\(listen_tls\)\>.*/\1 = 0/" \
+ /etc/libvirt/libvirtd.conf
+
+ # with libvirt (0.4.0), make sure we we setup gssapi in the mech_list
+ sasl_conf=/etc/sasl2/libvirt.conf
+ if ! grep -qE "^mech_list: gssapi" $sasl_conf ; then
+ sed -i -e "s/^\([[:space:]]*mech_list.*\)/#\1/" $sasl_conf
+ echo "mech_list: gssapi" >> $sasl_conf
+ fi
+}
--
1.5.4.1