updating licensing information for the BGS components 47/447/2
authorDan Radez <dradez@redhat.com>
Thu, 30 Apr 2015 15:08:07 +0000 (11:08 -0400)
committerDan Radez <dradez@redhat.com>
Thu, 30 Apr 2015 15:25:45 +0000 (11:25 -0400)
JIRA: BGS-43
Change-Id: I3c5bcf040008138734ca448dd156a0c73a289377
Signed-off-by: Dan Radez <dradez@redhat.com>
LICENSE [deleted file]
LICENSE.rst [moved from fuel/LICENSE.rst with 72% similarity]

diff --git a/LICENSE b/LICENSE
deleted file mode 100644 (file)
index eab0924..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
-   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.
similarity index 72%
rename from fuel/LICENSE.rst
rename to LICENSE.rst
index 9537658..e8fa309 100644 (file)
@@ -26,7 +26,7 @@ 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.
 
-Other applicable upstream project Licenses relevant for Fuel@OPNFV
+Other applicable upstream project Licenses
 ==================================================================
 You may not use the content of this software bundle except in compliance with the
 Licenses as listed below:
@@ -58,8 +58,23 @@ Licenses as listed below:
 | Linux          | GPLv3                                               |
 |                | https://www.gnu.org/copyleft/gpl.html               |
 +----------------+-----------------------------------------------------+
+| Ceph           | GPL v2                                              |
+|                | https://www.gnu.org/licenses/gpl-2.0.html           |
++----------------+-----------------------------------------------------+
+| Puppet         | Apache License 2.0                                  |
+|                | https://www.apache.org/licenses/LICENSE-2.0         |
++----------------+-----------------------------------------------------+
+
+Other applicable upstream project Licenses used by Fuel ISO
+==================================================================
+You may not use the content of this software bundle except in compliance with the
+Licenses as listed below:
+
++----------------+-----------------------------------------------------+
+| **Component**  | **Licence**                                         |
++----------------+-----------------------------------------------------+
 | Docker         | Apache License 2.0                                  |
-|                | https://www.apache.org/licenses/LICENSE-2.0
+|                | https://www.apache.org/licenses/LICENSE-2.0         |
 +----------------+-----------------------------------------------------+
 | Fuel           | Apache License 2.0                                  |
 |                | https://www.apache.org/licenses/LICENSE-2.0         |
@@ -67,12 +82,6 @@ Licenses as listed below:
 | OpenJDK/JRE    | GPL v2                                              |
 |                | https://www.gnu.org/licenses/gpl-2.0.html           |
 +----------------+-----------------------------------------------------+
-| Ceph           | GPL v2                                              |
-|                | https://www.gnu.org/licenses/gpl-2.0.html           |
-+----------------+-----------------------------------------------------+
-| Puppet         | Apache License 2.0                                  |
-|                | https://www.apache.org/licenses/LICENSE-2.0         |
-+----------------+-----------------------------------------------------+
 | Cobbler        | GPL v2                                              |
 |                | https://www.gnu.org/licenses/gpl-2.0.html           |
 +----------------+-----------------------------------------------------+
@@ -83,3 +92,25 @@ Licenses as listed below:
 |                | https://www.apache.org/licenses/LICENSE-2.0         |
 +----------------+-----------------------------------------------------+
 
+Other applicable upstream project Licenses used by Foreman ISO
+==================================================================
+You may not use the content of this software bundle except in compliance with the
+Licenses as listed below:
+
++----------------+-----------------------------------------------------+
+| **Component**  | **Licence**                                         |
++----------------+-----------------------------------------------------+
+| Foreman        | Creative Commons Attribution-ShareAlike 3.0         |
+|                | http://creativecommons.org/licenses/by-sa/3.0/      |
++----------------+-----------------------------------------------------+
+| VirtualBox     | GPL v2                                              |
+|                | https://www.gnu.org/licenses/gpl-2.0.html           |
++----------------+-----------------------------------------------------+
+| Vagrant        | The MIT License
++----------------+-----------------------------------------------------+
+| Ansible        | GPL v3                                              |
+|                | https://www.gnu.org/licenses/gpl-3.0.html           |
++----------------+-----------------------------------------------------+
+| Khaleesi       | GPL v3                                              |
+|                | https://www.gnu.org/licenses/gpl-3.0.html           |
++----------------+-----------------------------------------------------+