Skip to content
This repository has been archived by the owner on Mar 6, 2024. It is now read-only.

Commit

Permalink
Changing the license from BSD-2-Clause to BSD-2-Clause or GPLv3
Browse files Browse the repository at this point in the history 
The change is specifically to add an additional license under which the
code will be licensed (going forward it will be dual licensed),
specifically to add GPLv3 in addition to it's existing license.  This
change is being done to better align the code with upstream Ansible.

Signed-off-by: John 'Warthog9' Hawley <jhawley@vmware.com>
Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net>
  • Loading branch information
@warthog9
warthog9 committed Apr 26, 2019
1 parent f7cdc85 commit a9435e1
Show file tree
Hide file tree
Showing 98 changed files with 868 additions and 141 deletions.
688 changes: 683 additions & 5 deletions LICENSE.txt
View file

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions NOTICE.txt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ ansible-module-vcloud-director is a set of ansible modules that manage a VMware
The ansible-module-vcloud-director project team welcomes contributions from the community. Before you start working with ansible-module-vcloud-director, please read our [Developer Certificate of Origin](https://cla.vmware.com/dco). All contributions to this repository must be signed as described on that page. Your signature certifies that you wrote the patch or have the right to pass it on as an open-source patch. For more detailed information, refer to [CONTRIBUTING.md](CONTRIBUTING.md).

## License
[BSD-2 License](LICENSE.txt)
[BSD-2 License or GPLv3](LICENSE.txt)
2 changes: 1 addition & 1 deletion ansible.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

[defaults]
library = modules
Expand Down
2 changes: 1 addition & 1 deletion docs/_layouts/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--/*****************************************************************
* terraform-provider-vcloud-director
* Copyright (c) 2017 VMware, Inc. All Rights Reserved.
* SPDX-License-Identifier: BSD-2-Clause
* SPDX-License-Identifier: BSD-2-Clause or GPL-3.0-only
******************************************************************/ -->
<!doctype html>
<html>
Expand Down
6 changes: 2 additions & 4 deletions main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause

# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only
---

- name: vCloudDirectorAnsible
hosts: localhost
environment:
Expand All @@ -20,4 +18,4 @@
- vdc
- disk
- org
- catalog_item
- catalog_item
2 changes: 1 addition & 1 deletion module_utils/vcd.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

import os
from lxml import etree
Expand Down
2 changes: 1 addition & 1 deletion module_utils/vcd_errors.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only


class VCDVappCreationError(Exception):
Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_catalog.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_catalog_item.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_disk.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_org.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_org_vdc.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_user.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_vapp.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_vapp_network.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_vapp_vm.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_vapp_vm_disk.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_vapp_vm_nic.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_vdc_gateway.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion modules/vcd_vdc_network.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# !/usr/bin/python

Expand Down
2 changes: 1 addition & 1 deletion roles/catalog_item/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Including an example of how to use your role (for instance, with variables passe
License
-------

BSD
BSD 2-Clause or GPLv3

Author Information
------------------
Expand Down
2 changes: 1 addition & 1 deletion roles/catalog_item/defaults/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
# defaults file for roles/catalog_item
2 changes: 1 addition & 1 deletion roles/catalog_item/handlers/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
# handlers file for roles/catalog_item
8 changes: 4 additions & 4 deletions roles/catalog_item/meta/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause

# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only
---
galaxy_info:
author: your name
description: your description
Expand All @@ -17,7 +17,7 @@ galaxy_info:
# - GPLv3
# - Apache
# - CC-BY
license: license (GPLv2, CC-BY, etc)
license: license (BSD, GPLv3)

min_ansible_version: 1.2

Expand Down Expand Up @@ -57,4 +57,4 @@ galaxy_info:

dependencies: []
# List your role dependencies here, one per line. Be sure to remove the '[]' above,
# if you add dependencies to this list.
# if you add dependencies to this list.
2 changes: 1 addition & 1 deletion roles/catalog_item/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
# tasks file for roles/catalog_item
Expand Down
2 changes: 1 addition & 1 deletion roles/catalog_item/tests/inventory
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

localhost

2 changes: 1 addition & 1 deletion roles/catalog_item/tests/test.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
- hosts: localhost
Expand Down
2 changes: 1 addition & 1 deletion roles/catalog_item/vars/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
# vars file for roles/catalog_item
Expand Down
2 changes: 1 addition & 1 deletion roles/catalogs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Including an example of how to use your role (for instance, with variables passe
License
-------

BSD
BSD 2-Clause or GPLv3

Author Information
------------------
Expand Down
2 changes: 1 addition & 1 deletion roles/catalogs/defaults/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
# defaults file for roles/catalogs
2 changes: 1 addition & 1 deletion roles/catalogs/handlers/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
# handlers file for roles/catalogs
2 changes: 1 addition & 1 deletion roles/catalogs/meta/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

galaxy_info:
author: your name
Expand Down
2 changes: 1 addition & 1 deletion roles/catalogs/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
#tasks file for roles/catalogs
Expand Down
2 changes: 1 addition & 1 deletion roles/catalogs/tests/test.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
- hosts: localhost
Expand Down
2 changes: 1 addition & 1 deletion roles/catalogs/vars/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
# vars file for roles/catalogs
Expand Down
2 changes: 1 addition & 1 deletion roles/disk/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Including an example of how to use your role (for instance, with variables passe
License
-------

BSD
BSD 2-Clause or GPLv3

Author Information
------------------
Expand Down
7 changes: 5 additions & 2 deletions roles/disk/meta/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only
---
galaxy_info:
author: your name
description: your description
Expand All @@ -14,7 +17,7 @@ galaxy_info:
# - GPLv3
# - Apache
# - CC-BY
license: license (GPLv2, CC-BY, etc)
license: license (BSD, GPLv3)

min_ansible_version: 1.2

Expand Down Expand Up @@ -54,4 +57,4 @@ galaxy_info:

dependencies: []
# List your role dependencies here, one per line. Be sure to remove the '[]' above,
# if you add dependencies to this list.
# if you add dependencies to this list.
2 changes: 2 additions & 0 deletions roles/disk/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only
---
# tasks file for roles/disk

Expand Down
4 changes: 3 additions & 1 deletion roles/disk/tests/test.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only
---
- hosts: localhost
remote_user: root
roles:
- roles/disk
- roles/disk
4 changes: 3 additions & 1 deletion roles/disk/vars/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only
---
# vars file for roles/disk

disk_name: "test_disk"
updated_disk_name: "test_disk_2"
updated_disk_name: "test_disk_2"
2 changes: 1 addition & 1 deletion roles/org/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Including an example of how to use your role (for instance, with variables passe
License
-------

BSD
BSD 2-Clause or GPLv3

Author Information
------------------
Expand Down
2 changes: 1 addition & 1 deletion roles/org/defaults/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
# defaults file for roles/org
2 changes: 1 addition & 1 deletion roles/org/handlers/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

---
# handlers file for roles/org
9 changes: 4 additions & 5 deletions roles/org/meta/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause


# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only
---
galaxy_info:
author: your name
description: your description
Expand All @@ -18,7 +17,7 @@ galaxy_info:
# - GPLv3
# - Apache
# - CC-BY
license: license (GPLv2, CC-BY, etc)
license: license (BSD, GPLv3)

min_ansible_version: 1.2

Expand Down Expand Up @@ -58,4 +57,4 @@ galaxy_info:

dependencies: []
# List your role dependencies here, one per line. Be sure to remove the '[]' above,
# if you add dependencies to this list.
# if you add dependencies to this list.
2 changes: 1 addition & 1 deletion roles/org/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause
# SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-only

# ---
# tasks file for roles/org
Expand Down
Loading

0 comments on commit a9435e1

Please sign in to comment.