[aeolus-configure/f16] Update to aeolus-configure to add license files.
Chris Lalancette
clalance at fedoraproject.org
Thu Sep 15 15:21:32 UTC 2011
commit 96bf2343cb7fc725ac185bc4df2ec57e133dee87
Author: Chris Lalancette <clalance at redhat.com>
Date: Thu Sep 15 11:15:38 2011 -0400
Update to aeolus-configure to add license files.
Signed-off-by: Chris Lalancette <clalance at redhat.com>
add-license-files.patch | 993 +++++++++++++++++++++++++++++++++++++++++++++++
aeolus-configure.spec | 10 +-
2 files changed, 1001 insertions(+), 2 deletions(-)
---
diff --git a/add-license-files.patch b/add-license-files.patch
new file mode 100644
index 0000000..f6a971a
--- /dev/null
+++ b/add-license-files.patch
@@ -0,0 +1,993 @@
+diff -Nurp aeolus-configure-2.0.2.orig/bin/aeolus-check-services aeolus-configure-2.0.2/bin/aeolus-check-services
+--- aeolus-configure-2.0.2.orig/bin/aeolus-check-services 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/bin/aeolus-check-services 2011-09-15 11:07:25.268566412 -0400
+@@ -1,4 +1,19 @@
+ #!/usr/bin/ruby
++
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ init_scripts=%w(aeolus-conductor condor deltacloud-core deltacloud-ec2-us-east-1 deltacloud-ec2-us-west-1 deltacloud-mock httpd imagefactory iwhd libvirtd mongod ntpd postgresql qpidd)
+
+ init_scripts.each do |script|
+diff -Nurp aeolus-configure-2.0.2.orig/bin/aeolus-cleanup aeolus-configure-2.0.2/bin/aeolus-cleanup
+--- aeolus-configure-2.0.2.orig/bin/aeolus-cleanup 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/bin/aeolus-cleanup 2011-09-15 11:07:25.604581719 -0400
+@@ -1,4 +1,19 @@
+ #!/bin/sh
++
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ usage()
+ {
+ cat << EOF
+diff -Nurp aeolus-configure-2.0.2.orig/bin/aeolus-configure aeolus-configure-2.0.2/bin/aeolus-configure
+--- aeolus-configure-2.0.2.orig/bin/aeolus-configure 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/bin/aeolus-configure 2011-09-15 11:07:25.605581770 -0400
+@@ -1,4 +1,19 @@
+ #!/bin/sh
++
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ usage()
+ {
+ cat << EOF
+diff -Nurp aeolus-configure-2.0.2.orig/bin/aeolus-configure-image aeolus-configure-2.0.2/bin/aeolus-configure-image
+--- aeolus-configure-2.0.2.orig/bin/aeolus-configure-image 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/bin/aeolus-configure-image 2011-09-15 11:07:25.606581818 -0400
+@@ -1,6 +1,20 @@
+ #!/usr/bin/ruby
+ # helper script to generate aeolus images
+
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ require 'fileutils'
+
+ AEOLUS_IMAGE_VERSION='0.1.0'
+diff -Nurp aeolus-configure-2.0.2.orig/bin/aeolus-node aeolus-configure-2.0.2/bin/aeolus-node
+--- aeolus-configure-2.0.2.orig/bin/aeolus-node 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/bin/aeolus-node 2011-09-15 11:07:25.606581818 -0400
+@@ -1,5 +1,19 @@
+ #! /bin/sh
+
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ CAT=/bin/cat
+ NODE_DIR=/etc/aeolus-configure/nodes
+
+diff -Nurp aeolus-configure-2.0.2.orig/bin/aeolus-services aeolus-configure-2.0.2/bin/aeolus-services
+--- aeolus-configure-2.0.2.orig/bin/aeolus-services 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/bin/aeolus-services 2011-09-15 11:07:28.277703559 -0400
+@@ -1,5 +1,19 @@
+ #!/bin/sh
+
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ puppet /usr/share/aeolus-configure/aeolus_stop_services.pp \
+ --modulepath=/usr/share/aeolus-configure/modules/ \
+ --logdest=/var/log/aeolus-configure/aeolus-services.log \
+diff -Nurp aeolus-configure-2.0.2.orig/COPYING aeolus-configure-2.0.2/COPYING
+--- aeolus-configure-2.0.2.orig/COPYING 1969-12-31 19:00:00.000000000 -0500
++++ aeolus-configure-2.0.2/COPYING 2011-09-15 11:07:14.832091017 -0400
+@@ -0,0 +1,161 @@
++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:
++
++You must give any other recipients of the Work or Derivative Works a copy of
++this License; and
++
++You must cause any modified files to carry prominent notices stating that You
++changed the files; and
++
++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
++
++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
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/aeolus_stop_services.pp aeolus-configure-2.0.2/recipes/aeolus/aeolus_stop_services.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/aeolus_stop_services.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/aeolus_stop_services.pp 2011-09-15 11:07:33.203928147 -0400
+@@ -1,22 +1,16 @@
+-#--
+-# Copyright (C) 2010 Red Hat Inc.
++# Copyright 2011 Red Hat, Inc.
+ #
+-# This library is free software; you can redistribute it and/or
+-# modify it under the terms of the GNU Lesser General Public
+-# License as published by the Free Software Foundation; either
+-# version 2.1 of the License, or (at your option) any later version.
+-#
+-# This library 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
+-# Lesser General Public License for more details.
+-#
+-# You should have received a copy of the GNU Lesser General Public
+-# License along with this library; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+-#
+-# Author: Mohammed Morsi <mmorsi at redhat.com>
+-#--
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
+
+ #
+ # aeolus uninstallation recipe
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/cli.rb aeolus-configure-2.0.2/recipes/aeolus/cli.rb
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/cli.rb 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/cli.rb 2011-09-15 11:07:33.204928193 -0400
+@@ -2,6 +2,20 @@
+ # Prompt the user for provider account and instance values and write them
+ # to a new puppet config files
+
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ require 'rubygems'
+ require 'highline/import'
+
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/lib/puppet/provider/web_request/curl.rb aeolus-configure-2.0.2/recipes/aeolus/lib/puppet/provider/web_request/curl.rb
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/lib/puppet/provider/web_request/curl.rb 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/lib/puppet/provider/web_request/curl.rb 2011-09-15 11:07:33.205928238 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ require 'fileutils'
+
+ # Provides an interface to curl using the curb gem for puppet
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/lib/puppet/type/web_request.rb aeolus-configure-2.0.2/recipes/aeolus/lib/puppet/type/web_request.rb
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/lib/puppet/type/web_request.rb 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/lib/puppet/type/web_request.rb 2011-09-15 11:07:33.206928284 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ require 'uri'
+
+ # A puppet resource type used to access resources on the World Wide Web
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/conductor.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/conductor.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/conductor.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/conductor.pp 2011-09-15 11:07:33.208928377 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # Aeolus conductor puppet definitions
+
+ class aeolus::conductor inherits aeolus {
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/deltacloud.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/deltacloud.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/deltacloud.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/deltacloud.pp 2011-09-15 11:07:33.209928422 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # Aeolus deltacloud puppet definitions
+
+ class aeolus::deltacloud::core {
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/image-factory.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/image-factory.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/image-factory.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/image-factory.pp 2011-09-15 11:07:33.210928467 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # Aeolus image factory puppet definitions
+
+ class aeolus::image-factory inherits aeolus {
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/init.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/init.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/init.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/init.pp 2011-09-15 11:07:33.211928513 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # Aeolus puppet definitions
+
+ import "postgres"
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/iwhd.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/iwhd.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/iwhd.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/iwhd.pp 2011-09-15 11:07:33.212928559 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # aeolus iwhd puppet definitions
+
+ class aeolus::iwhd inherits aeolus {
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/conductor.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/conductor.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/conductor.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/conductor.pp 2011-09-15 11:07:33.212928559 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class aeolus::profiles::conductor {
+
+ aeolus::conductor::site_admin{"admin":
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/custom.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/custom.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/custom.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/custom.pp 2011-09-15 11:07:33.213928604 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class aeolus::profiles::custom {
+
+ aeolus::create_bucket{"aeolus":}
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/default.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/default.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/default.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/default.pp 2011-09-15 11:07:33.214928650 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class aeolus::profiles::default {
+
+ aeolus::create_bucket{"aeolus":}
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/deltacloud.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/deltacloud.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/deltacloud.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/deltacloud.pp 2011-09-15 11:07:33.215928696 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class aeolus::profiles::deltacloud {
+ aeolus::deltacloud{"mock": provider_type => "mock", port => 3002}
+ }
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/imagebuilder.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/imagebuilder.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/profiles/imagebuilder.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/profiles/imagebuilder.pp 2011-09-15 11:07:33.216928741 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class aeolus::profiles::imagebuilder {
+ aeolus::create_bucket{"aeolus":}
+ }
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/rails.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/rails.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/rails.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/rails.pp 2011-09-15 11:07:38.701178875 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # Some convenience routines for rails
+
+ define rails::create::db($cwd="", $rails_env=""){
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/rhevm.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/rhevm.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/rhevm.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/rhevm.pp 2011-09-15 11:10:08.913070244 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class aeolus::rhevm inherits aeolus {
+ file {"/etc/rhevm.json":
+ content => template("aeolus/rhevm.json"),
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/rhevm.pp~ aeolus-configure-2.0.2/recipes/aeolus/manifests/rhevm.pp~
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/rhevm.pp~ 1969-12-31 19:00:00.000000000 -0500
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/rhevm.pp~ 2011-09-08 16:20:28.000000000 -0400
+@@ -0,0 +1,51 @@
++class aeolus::rhevm inherits aeolus {
++ file {"/etc/rhevm.json":
++ content => template("aeolus/rhevm.json"),
++ mode => 755,
++ require => Package['aeolus-conductor-daemons'] }
++
++ file {"/etc/iwhd/conf.js":
++ content => template("aeolus/iwhd-conf.js"),
++ mode => 755,
++ require => Package['aeolus-conductor-daemons'] }
++
++ file {"$rhevm_nfs_mount_point":
++ ensure => 'directory'}
++
++ mount {"$rhevm_nfs_mount_point":
++ ensure => mounted,
++ device => "$rhevm_nfs_server:$rhevm_nfs_export",
++ fstype => "nfs",
++ options => "rw",
++ require => File["$rhevm_nfs_mount_point"]}
++
++ # give iwhd a restart to pick up new configuration files
++ # in the event iwhd had already initialized at /var/lib/iwhd
++ exec { "/sbin/service iwhd restart":
++ require => [Service['iwhd'],
++ Mount["$rhevm_nfs_mount_point"],
++ File["/etc/rhevm.json"],
++ File["/etc/iwhd/conf.js"]]}
++
++ aeolus::deltacloud{"rhevm":
++ provider_type => 'rhevm',
++ endpoint => "$rhevm_deltacloud_powershell_url",
++ port => $rhevm_deltacloud_port}
++
++ aeolus::conductor::provider{"rhevm":
++ type => "rhevm",
++ url => "http://localhost:${rhevm_deltacloud_port}/api",
++ require => Aeolus::Deltacloud["rhevm"]}
++
++ # TODO:
++ # 1. since we have credentials, create provider account
++ # 2. create a realm and mappings
++}
++
++class aeolus::rhevm::disabled {
++ aeolus::deltacloud::disabled{"rhevm": }
++
++ mount {"$rhevm_nfs_mount_point":
++ ensure => unmounted,
++ device => "$rhevm_nfs_server:$rhevm_nfs_export"}
++}
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/selinux.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/selinux.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/selinux.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/selinux.pp 2011-09-15 11:07:38.701178875 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # Some convenience routines for selinux
+
+ define selinux::mode(){
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/vmware.pp aeolus-configure-2.0.2/recipes/aeolus/manifests/vmware.pp
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/vmware.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/vmware.pp 2011-09-15 11:10:18.511513101 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class aeolus::vmware inherits aeolus {
+ file {"/etc/vmware.json":
+ content => template("aeolus/vmware.json"),
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/vmware.pp~ aeolus-configure-2.0.2/recipes/aeolus/manifests/vmware.pp~
+--- aeolus-configure-2.0.2.orig/recipes/aeolus/manifests/vmware.pp~ 1969-12-31 19:00:00.000000000 -0500
++++ aeolus-configure-2.0.2/recipes/aeolus/manifests/vmware.pp~ 2011-09-08 16:20:28.000000000 -0400
+@@ -0,0 +1,22 @@
++class aeolus::vmware inherits aeolus {
++ file {"/etc/vmware.json":
++ content => template("aeolus/vmware.json"),
++ mode => 755,
++ require => Package['aeolus-conductor-daemons'] }
++
++ aeolus::deltacloud{"vsphere":
++ provider_type => 'vsphere',
++ endpoint => "$vmware_api_endpoint",
++ port => $vmware_deltacloud_port}
++
++ aeolus::conductor::provider{"vsphere":
++ type => "vsphere",
++ url => "http://localhost:${vmware_deltacloud_port}/api",
++ require => [Aeolus::Deltacloud["vsphere"]]}
++
++}
++
++class aeolus::vmware::disabled {
++ aeolus::deltacloud::disabled{"vsphere": }
++
++}
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/apache/manifests/init.pp aeolus-configure-2.0.2/recipes/apache/manifests/init.pp
+--- aeolus-configure-2.0.2.orig/recipes/apache/manifests/init.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/apache/manifests/init.pp 2011-09-15 11:07:38.705179060 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class apache {
+ # require apache and mod_ssl
+ package { "httpd":
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/ntp/manifests/init.pp aeolus-configure-2.0.2/recipes/ntp/manifests/init.pp
+--- aeolus-configure-2.0.2.orig/recipes/ntp/manifests/init.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/ntp/manifests/init.pp 2011-09-15 11:07:38.707179149 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class ntp {
+ package { "ntp":
+ ensure => installed,
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/openssl/manifests/init.pp aeolus-configure-2.0.2/recipes/openssl/manifests/init.pp
+--- aeolus-configure-2.0.2.orig/recipes/openssl/manifests/init.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/openssl/manifests/init.pp 2011-09-15 11:07:38.708179194 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class openssl {
+ package { "openssl":
+ ensure => installed,
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/postgres/manifests/init.pp aeolus-configure-2.0.2/recipes/postgres/manifests/init.pp
+--- aeolus-configure-2.0.2.orig/recipes/postgres/manifests/init.pp 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/postgres/manifests/init.pp 2011-09-15 11:07:38.709179240 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ class postgres {
+ package { "postgresql":
+ ensure => installed,
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/provider/pgsql_database/pgsql.rb aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/provider/pgsql_database/pgsql.rb
+--- aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/provider/pgsql_database/pgsql.rb 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/provider/pgsql_database/pgsql.rb 2011-09-15 11:07:38.710179286 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ require 'puppet/provider/package'
+
+ Puppet::Type.type(:pgsql_database).provide(:pgsql,
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/provider/pgsql_grant/pgsql.rb aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/provider/pgsql_grant/pgsql.rb
+--- aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/provider/pgsql_grant/pgsql.rb 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/provider/pgsql_grant/pgsql.rb 2011-09-15 11:07:38.711179332 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # A grant is either global or per-db. This can be distinguished by the syntax
+ # of the name:
+ # user at host => global
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/provider/pgsql_user/pgsql.rb aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/provider/pgsql_user/pgsql.rb
+--- aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/provider/pgsql_user/pgsql.rb 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/provider/pgsql_user/pgsql.rb 2011-09-15 11:07:38.712179378 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ require 'puppet/provider/package'
+
+ Puppet::Type.type(:pgsql_user).provide(:pgsql,
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/type/pgsql_database.rb aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/type/pgsql_database.rb
+--- aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/type/pgsql_database.rb 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/type/pgsql_database.rb 2011-09-15 11:07:38.713179423 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # This has to be a separate type to enable collecting
+ Puppet::Type.newtype(:pgsql_database) do
+ @doc = "Manage a database."
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/type/pgsql_grant.rb aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/type/pgsql_grant.rb
+--- aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/type/pgsql_grant.rb 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/type/pgsql_grant.rb 2011-09-15 11:07:38.714179469 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # This has to be a separate type to enable collecting
+ Puppet::Type.newtype(:pgsql_grant) do
+ @doc = "Manage a database user's rights."
+diff -Nurp aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/type/pgsql_user.rb aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/type/pgsql_user.rb
+--- aeolus-configure-2.0.2.orig/recipes/postgres/plugins/puppet/type/pgsql_user.rb 2011-09-08 16:20:28.000000000 -0400
++++ aeolus-configure-2.0.2/recipes/postgres/plugins/puppet/type/pgsql_user.rb 2011-09-15 11:07:38.715179514 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ # This has to be a separate type to enable collecting
+
+ require 'digest/md5'
diff --git a/aeolus-configure.spec b/aeolus-configure.spec
index 7b164cd..b69a43f 100644
--- a/aeolus-configure.spec
+++ b/aeolus-configure.spec
@@ -6,10 +6,10 @@
Summary: Aeolus Configure Puppet Recipe
Name: aeolus-configure
Version: 2.0.2
-Release: 0.1%{alphatag}%{?dist}%{?extra_release}
+Release: 0.2%{alphatag}%{?dist}%{?extra_release}
Group: Applications/Internet
-License: GPLv2+
+License: ASL 2.0
URL: http://aeolusproject.org
# to build source tarball
# git clone git://git.fedorahosted.org/aeolus/configure.git
@@ -18,6 +18,7 @@ URL: http://aeolusproject.org
# rake package
# cp pkg/aeolus-configure-2.0.2.tgz ~/rpmbuild/SOURCES
Source0: %{name}-%{version}-%{alphatag}.tgz
+Patch1: add-license-files.patch
BuildArch: noarch
Requires: puppet >= 2.6.6
Requires: rubygem(uuidtools)
@@ -33,6 +34,7 @@ Aeolus Configure Puppet Recipe
%prep
%setup -q
+%patch1 -p1
%build
@@ -54,6 +56,7 @@ Aeolus Configure Puppet Recipe
%{__cp} -R %{pbuild}/bin/aeolus-node %{buildroot}/%{_sbindir}/\
%files
+%doc COPYING
%attr(0755, root, root) %{_sbindir}/aeolus-configure
%attr(0755, root, root) %{_sbindir}/aeolus-cleanup
%attr(0755, root, root) %{_sbindir}/aeolus-node
@@ -63,6 +66,9 @@ Aeolus Configure Puppet Recipe
%{_sbindir}/aeolus-configure-image
%changelog
+* Thu Sep 15 2011 Chris Lalancette <clalance at redhat.com> - 2.0.2-0.2gitb7ee8da278
+- Add the license files to the RPM
+
* Thu Sep 08 2011 Chris Lalancette <clalance at redhat.com> - 2.0.2-0.1gitb7ee8da278
- Update to latest upstream aeolus-configure
More information about the scm-commits
mailing list