RFC: My git patch workflow (for wiki)
by Matt Wagner
Hi all,
We have a wiki page or two talking about using git, but one is fairly
out of date (it, for example, warns that you shouldn't ever push to
master). Another one was written by me some time ago, and needs some
changing.
What I'd really like is to write up some super-clear documentation
allowing those new to the project and/or git to get up to speed pretty
quickly. I'd like to send some draft content here, based on my workflow.
But I was hoping for feedback on it, both in terms of technical
suggestions and advice on wording/ordering/etc.
For setup, I'd like to recycle some of the content from
https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Git_Workflow
(but without the erratic indentation that exists today).
For normal workflow, I think something like the following:
1.) Update master, with "git pull master".
2.) Check out a local topic branch for your work, with "git checkout -b
my_new_feature"
3.) Do your work, commit your changes to your branch. (Maybe a section
on "git add", "git commit" practices, etc.)
4.) With your changes committed on your branch, rebase against master to
pull in any updates since you started -- "git rebase master" (I normally
run "git checkout master; git pull" first)
5.) Format your patches, with "git format-patch HEAD..master" (or the
500 different ways you can express something equivalent). Send them to
the list with git send-email.
6.) Do other work on other branches, perhaps, until you receive an ACK.
7.) Switch back to your branch (if needed), and rebase against master
again.
8.) Switch to master, and run "git merge my_new_feature" to merge in
your changes.
9.) Push with "git push"
I'd also like to have a section on *applying* patches from the list, but
I'm not sure how other people do this. I create a topic branch from
master, and then use mutt to pipe the message body to "git am -s". How
do other people handle this?
-- Matt
10 years, 11 months
[PATCH] Correct configserver-setup keep_going prompt
by James Laska
Previously, the prompt would not recognize invalid input. You could
press <Enter> and the setup process would continue. I've adjusted the
prompt to check whether we are running on a tty first, and to reprompt
when a invalid response is received. Checking for the presence of a
tty, will allow aeolus-configserver-setup to be called by a
non-interactive script (or deployable).
---
configserver/configure/bin/config_httpd.sh | 33 ++++++++++++++++++++++------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/configserver/configure/bin/config_httpd.sh b/configserver/configure/bin/config_httpd.sh
index be28715..0792e4c 100755
--- a/configserver/configure/bin/config_httpd.sh
+++ b/configserver/configure/bin/config_httpd.sh
@@ -28,6 +28,17 @@ secure pages on port 443, then this tool should not be used.
"""
+# Determine whether running on an interactive tty (or a pipe)
+isatty(){
+ stdin="$(ls -l /proc/self/fd/0)"
+ stdin="${stdin/*-> /}"
+
+ if [[ "$stdin" =~ ^/dev/pts/[0-9] ]]; then
+ return 0 # terminal
+ else
+ return 1 # pipe
+ fi
+}
usage()
{
@@ -68,15 +79,23 @@ fi
echo "$PREAMBLE"
echo -n "Do you wish to continue [y/N]: "
-read keep_going
-if [ "x$keep_going" == "x" ]; then
- keep_going="Y"
-fi
-keep_going=$(echo "$keep_going" | tr a-z A-Z)
-if [ "Y" != "$keep_going" ]; then
- exit 1
+if isatty ; then
+ keep_going="n"
+ while read keep_going ; do
+ if [[ $keep_going == [Yy] ]]; then
+ break
+ elif [[ $keep_going == [Nn] ]]; then
+ exit 1
+ else
+ echo -n "Do you wish to continue [y/N]: "
+ continue
+ fi
+ done
+else
+ echo y
fi
+
PREAMBLE2="""
There are a few pieces of information to collect. Some of the information
provides default values. The default values are enclosed in square brackets
--
1.7.7.6
10 years, 11 months
[PATCH conductor] BZ #810404: Some GPL files that should be ASL
by Jason Guiditta
https://bugzilla.redhat.com/show_bug.cgi?id=810404
---
COPYING | 660 ++++++++++++++++++++++------------------------
aeolus-conductor.spec.in | 4 +-
2 files changed, 323 insertions(+), 341 deletions(-)
diff --git a/COPYING b/COPYING
index d511905..aac62ce 100644
--- a/COPYING
+++ b/COPYING
@@ -1,339 +1,321 @@
- 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.
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+DELTACLOUD SERVER SUBCOMPONENTS
+
+The Deltacloud Server includes a number of subcomponents with separate
+copyrights and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+For the jQuery and jQuery mobile components in
+public/javascripts/jquery.*.js:
+
+ /*!
+ * jQuery JavaScript Library v1.6.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Jun 30 14:16:56 2011 -0400
+ */
+
+Deltacloud uses jQuery and jQuery mobile under the MIT license.
+
+For the lib/sinatra/accept_media_types.rb component:
+
+ # Copyright (C) 2009 Martin Aumont (mynyml)
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a
+ # copy of this software and associated documentation files (the
+ # "Software"), to deal in the Software without restriction, including
+ # without limitation the rights to use, copy, modify, merge, publish,
+ # distribute, sublicense, and/or sell copies of the Software, and to permit
+ # persons to whom the Software is furnished to do so, subject to the
+ # following conditions:
+ #
+ # The above copyright notice and this permission notice shall be included
+ # in all copies or substantial portions of the Software.
+ #
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ # NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ # USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the lib/sinatra/body_proxy.rb and lib/sinatra/rack_syslog.rb components:
+
+ Copyright (c) 2007, 2008, 2009, 2010 Christian Neukirchen
+ <purl.org/net/chneukirchen>
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the lib/sinatra/rack_accept.rb component:
+
+ (The MIT License)
+
+ Copyright (c) 2009-2010 Chris Hoffman
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ 'Software'), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the
+ following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the lib/sinatra/rack_date.rb, lib/sinatra/rack_etag.rb, and
+lib/sinatra/rack_runtime.rb components:
+
+ Copyright (c) 2008 The Committers
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the lib/sinatra/url_for.rb component:
+
+ Copyright (C) 2009 Eric Kidd
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the
+ following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index ba26ee3..93af028 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -7,7 +7,7 @@ Release: 0%{?dist}
Summary: The Aeolus Conductor
Group: Applications/System
-License: GPLv2+ and MIT and BSD
+License: ASL 2.0 and MIT and BSD
URL: http://aeolusproject.org
# to build source tarball
@@ -55,7 +55,7 @@ The Aeolus Conductor, a web UI for managing cloud instances.
%package daemons
Summary: Aeolus Conductor daemons
Group: Applications/Internet
-License: GPLv2+
+License: ASL 2.0
Requires: %{name} = %{version}-%{release}
Requires: httpd >= 2.0
Requires: rubygem(thin) >= 1.2.5
--
1.7.7.6
10 years, 11 months
Conductor API versioning
by Maros Zatko
Good news everyone!
we held a meeting, and besides other things we've been discussing API
and it's versions too.
We haven't decided if we're going to support versioned API in the sense that
the client could make a choice what version of API is going to be used
in communication
with Conductor.
My opinion is that we should not support versioned API, but we should
include Conductor
version (and/or API version as well) in API entrypoint at least, so that
the client would know
to which version of API is talking to atm and all API breakage would be
documented.
This might prevent some really old clients talking to Conductor but in
general my thought was
that we will support whole stack of components (including clients) as a
bundle of some version,
and when you update, everything would change at once so that there will
be new client version
in case of API breakage. I don't think that API will change that much
with Conductor
versions (changes in routes can be managed by HATEOAS).
I'd love to hear your opinion on this.
- maros
10 years, 11 months
RFC: Launching deployments with interdependent instances
by Jan Provazník
Copied from
https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Launching_depl...
Summary
It's possible to launch multi-instance deployments in Conductor. A user
can define parameters for each instance in deployable XML, there are 3
types of parameters:
* constant values - param value is defined directly in the XML
* user defined - a user passes value through Conductor UI when launching
a deployment
* output from other instance service - value is generated by other
instance/service
Things get complicated with the last one - if a service of an instance
depends on a value produced by other service running on other instance,
we get dependencies between these instances and we have to make sure
that services are launched in proper order.
Owner
Owner(s) of the feature - name, possible contact info
Current status
Targeted release:
Last update:
Most of dependency stuff is handled by Audrey. Conductor launches all
instances at once, Audrey agent takes care of starting services in
proper order. With the 1.0 release, Audrey takes an "all-or nothing"
approach to starting services on an instance. This means that if one
service is still waiting for input parameters (e.g., instance "A" hasn't
yet report "hostname" to the config server), then none of the
audrey-ified services will start (this will change in post-1.0 release):
we're making services start independent from each other. So, in the case
where B.httpd is awaiting ${A.hostname}, all other services on instance
"B" can already be started.
Screencast Demo
* attempt to create a deployable with deadlock dependencies between
instances, the deployable should not be created, error should be displayed
* launch a deployment with instances I1 and I2, each with 2 services S1,
S2 and this dependencies: I1S1 depends on I2S2, I2S1 depends on I1S2.
Show that all services are launched.
* show a representation of instance relationships
Implementation tasks
* extend deployable XML format to define what params are returned by
each service - currently list of returned params is defined per
instance, not per service
* #3054 - add check if all params in a deployable can be satisfied and
if there are no deadlocks
* #3056 - Represent the relationships in complex deployables in the
Conductor UI
Detailed description
Conductor has to check:
*if there are no deadlocks between services in a deployable
*if all params which reference output values can be satisfied (there are
not references to not existing params)
This check can be done when creating or updating a deployable. We don't
have to take care about dependencies on Condcutor side when launching a
deployment, we can launch all instances at once - Audrey will take care
of launching instances in proper order.
Conductor can use Audrey API
(https://www.aeolusproject.org/redmine/projects/audrey/wiki/Audrey_Reporti...)
to get current state of services. There should be some (configurable)
timeout for all services startup, if a service is not started at this
time, the deployment should be considered as failed and
rollback/relaunch should be (optionally) initiated. TODO: should be
there be an additional instance state for representing an instance which
is running but not all services are started or should be there an
additional instance attribute to keep track of not running services?
High-level implementation details
Deadlock detection
Could be launched from deploayble's before_save callback. It's in fact
only about finding cycles in an oriented graph.
Reletionships representation
Might be represented by a graph, something like this:
http://www.adp-gmbh.ch/misc/tools/graphviz/cluster.html (this example is
generated by graphviz which is packaged in fedora together with graphviz
ruby lib)
Future plan
It's possible that Heat API will be used in future for launching
deployments, check "Future plan" on Robust_instance_launching
10 years, 11 months
RFC: Adding caching to Conductor
by Matt Wagner
Howdy,
The final feature description I have left to request feedback on is
adding caching support to Conductor, a la memcache:
https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Adding_Caching...
The idea is pretty simple -- enabled the built-in support for memcached
in Rails, cache stuff there, and benefit from a massive speedup. I ran
into two problems as I began to tinker with this, though:
- memcached is in Fedora, but rubygem-memcache-client is not. I think
there's benefit in getting there, but it means that we're taking on
another packaging obligation.
- All the things I think could benefit from a cache are tricky to cache.
I was going to look at caching permissions, but Scott's actively
working on that, so instead I looked at the pool statistics method,
which I know from past experience is fairly slow. But it's fairly
difficult to know when to invalidate, since an instance changing state
could change the state, and it's optionally scoped per-user. I started
playing around with the :touch attribute on associations, but I came to
decide that the pool statistics method was probably a terrible place to
start, since it got the point that changing nearly anything would update
the pool.
So I'm left thinking that using memcache, in the abstract, is a good
idea, but I'm struggling to articulate any specific use cases where
using it is a no-brainer right now. I do think that we can speed things
up by using memcached, but it brings the requirement of getting
rubygem-memcache-client into Fedora and RHEL, and also requires a fair
bit of work for the specific uses cases I had in mind, since it's not
trivial to cache. Does anyone have any specific methods come to mind
that are escaping me? I'm coming to the opinion that this should not be
at the top of our priority list.
-- Matt
10 years, 11 months
Deltacloud API revamp using modular Sinatra style
by Michal Fojtik
Hi,
Maybe you already know, but I started doing a small revamp of the DC code
we currently have. The idea is to make Deltacloud API done as a modular Sinatra
application[1], thus pluggable to as a Rack container to any other application.
Also this approach will allow to use Deltacloud drivers as standard Ruby libraries,
without need to run a REST server, which could be sometime limiting.
I started an revamp by extracting the Rabbit DSL (nothing to do with RabbitMQ) out
of Deltacloud API. Rabbit is a powerfull tool that helps you create REST routes and
application logic based on Sinatra framework. Rabbit is now available as regular
Ruby gem (gem install sinatra-rabbit[2]) that provides a Sinatra extension. It should be
fully compatible with the Rabbit we currently have in Deltacloud, however I made few
improvements, to keep the code more DRY. Like, with the 'new' Rabbit you don't need
to specify the :id parameters for the :show operations and also for 'actions' (action
is an alias for 'operation', with pre-set :id parameter and POST method predefined).
The extracted Rabbit is pretty successful, it has ~30 watchers on Github, few issues
and I got few emails from people that started using it.
The next big chunk of work was to fork() Deltacloud and rewrite the 'server.rb' to modular
style, that will use this Rabbit gem. I tried *very* hard to keep all drivers and other
tools we have 99% compatible, so currently all drivers are just copied over from the original
Deltacloud API source to this fork. The only modification I made to the drivers was that I removed
"require 'deltacloud/base_driver'", since this was unnecessary and repeated over all drivers.
There were two big challenges. The first one was to keep the DC driver 'features'. Since those
are very tied to the Sinatra app. The second one was the 'capabilities'. Those are for checking
if the current driver support the requested operations. The result looks like this[3].
With this approach you just define the lambda function that will be executed before request
and evaluated. So we can be sure that it works also when switching drivers dynamically.
I also created a small wrapper[4] and exmaple[5] to demonstrate the 'library' use case. I did not
spent too much time on this, but so far I tested EC2 and the mock driver and they both work perfectly.
Right know, I had couple minitest scenarios, that assure the API is fully backward compatible.
However there is a ton of work that needs to be done, like:
* Porting the unit-tests, cucumber and rspec tests (do we really need all those test suites? ;-)
* Porting the CIMI interface (should be easy, just wrap the CIMI server into CIMI class)
* Create minitest scenarios for the library functionality
* Merge the project with original Deltacloud API source
-- Michal
[1] http://www.sinatrarb.com/extensions.html
[2] https://github.com/mifo/sinatra-rabbit
[3] https://github.com/mifo/deltacloud-modular/blob/master/lib/deltacloud/col...
[4] https://github.com/mifo/deltacloud-modular/blob/master/lib/deltacloud.rb
[5] https://github.com/mifo/deltacloud-modular/blob/master/test_library.rb
PS: This whole revamp is just my insomnia-time side-project/POC and is not official DC. However any
help on getting things done is welcomed :-)
Michal Fojtik
http://deltacloud.org
mfojtik(a)redhat.com
10 years, 11 months
RFC Image Management Engine
by Martyn Taylor
Gents,
I've already sent this stuff around. Writing it up as an RFC: https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Image_Manageme...
In the next iteration Image Factory aim to make significant improvements and changes to its underlying model and its API. These changes will remove any conductor specific content from image factory altogether. See:https://www.aeolusproject.org/redmine/projects/image-factory/wiki/V2_... andhttps://www.aeolusproject.org/redmine/projects/aeolus/wiki/Imagefactor...
In order to allow conductor API implementation and new imagefactory API
integration to work in parallel we will we can implement image
management functionality as a rails engine:
http://guides.rubyonrails.org/engines.html
Using an engine for the integration gives us other benefits such as a
standalone UI for factory and also a pluggable engine that can be used
in other rails applications. It keeps a loose coupling between
conductor and factory. Which means there should be minimal disruption
to conductor on major releases of factory and the image management back
end service (factory) could be swapped in/out if we ever needed to do it.
The engine itself similar to a rails application which supplies all the
controllers, views, routes and generators for creating image factory
models. A prototype can be found here: git(a)github.com
<mailto:git@github.com>:aeolus-incubator/image-management-engine.git
The prototype includes generators for creating the image management
models, controllers and views for managing CRUD operations on the models
and also the routes. Under the test folder is a dummy app that shows how
this engine could be integrated with conductor. Showing a simple example
on how to extend the engine models.
The testing structure should consist of integration tests as well as
unit/behaviour. enginex (the tool that creates the skeleton engine -
now included in rails >3.1) creates an integration set test environment
using the dummy application. I suggest we stick to the testing
structure already in place in the prototype. However, we should use
RSpec as the testing framework for consistency.
We also have a feature page that outlines the expected behaviour here:
https://www.aeolusproject.org/redmine/projects/aeolus/wiki/V2_Conducot_AP...
Regards
Martyn
> Hi all,
>
> We have a wiki page or two talking about using git, but one is fairly
> out of date (it, for example, warns that you shouldn't ever push to
> master). Another one was written by me some time ago, and needs some
> changing.
>
> What I'd really like is to write up some super-clear documentation
> allowing those new to the project and/or git to get up to speed pretty
> quickly. I'd like to send some draft content here, based on my workflow.
> But I was hoping for feedback on it, both in terms of technical
> suggestions and advice on wording/ordering/etc.
>
> For setup, I'd like to recycle some of the content from
> https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Git_Workflow
> (but without the erratic indentation that exists today).
>
> For normal workflow, I think something like the following:
>
> 1.) Update master, with "git pull master".
>
> 2.) Check out a local topic branch for your work, with "git checkout -b
> my_new_feature"
>
> 3.) Do your work, commit your changes to your branch. (Maybe a section
> on "git add", "git commit" practices, etc.)
>
> 4.) With your changes committed on your branch, rebase against master to
> pull in any updates since you started -- "git rebase master" (I normally
> run "git checkout master; git pull" first)
>
> 5.) Format your patches, with "git format-patch HEAD..master" (or the
> 500 different ways you can express something equivalent). Send them to
> the list with git send-email.
>
> 6.) Do other work on other branches, perhaps, until you receive an ACK.
>
> 7.) Switch back to your branch (if needed), and rebase against master
> again.
>
> 8.) Switch to master, and run "git merge my_new_feature" to merge in
> your changes.
>
> 9.) Push with "git push"
>
> I'd also like to have a section on*applying* patches from the list, but
> I'm not sure how other people do this. I create a topic branch from
> master, and then use mutt to pipe the message body to "git am -s". How
> do other people handle this?
>
> -- Matt
I just want to jump in before this discussion gets too deep and let it
be known that I'm currently writing up a proposal for some pretty
drastic changes in our git/release workflow. I don't have anything to
share yet; I want to make sure to thoroughly explain and justify why I
think it should work this way. Hopefully tomorrow afternoon I'll have
my first draft up.
Carry on
10 years, 11 months