diff --git a/.gitignore b/.gitignore deleted file mode 100755 index dd9ba76..0000000 --- a/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/onvm/conf/nodes.conf.yml -/onvm/conf/ids.conf.yml -/onvm/conf/hosts -/onvm/lampstack/openrc -*.out -*/**/*.log -*/**/.DS_Store -*/**/._ -*/**/*.tfstate* -.tox -site.retry \ No newline at end of file diff --git a/.gitreview b/.gitreview deleted file mode 100644 index 6473c68..0000000 --- a/.gitreview +++ /dev/null @@ -1,4 +0,0 @@ -[gerrit] -host=review.opendev.org -port=29418 -project=x/osops-tools-contrib.git diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 5c304d1..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ -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 - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - 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. diff --git a/README.rst b/README.rst deleted file mode 100644 index ee6d9c2..0000000 --- a/README.rst +++ /dev/null @@ -1,35 +0,0 @@ -================================== -osops-tools-contrib -================================== - -This is not being tested on any deployment. - -This repository is a location for Operators to upload useful scripts and tooling -for the general Operating Community to use with their OpenStack Clouds. - -This place is also untested and unverified. - -For more details on how to contribute, please follow the Gerrit git-review process -described at http://docs.openstack.org/infra/manual/developers.html . - -If you would like some curated, tested, and verified code please look to the -`osops-tools-generic `_ repository. - -Please see the wiki page at https://wiki.openstack.org/wiki/Osops#Overview_moving_code -for more details about how code is promoted up to the generic repo. - -Please remember USE AT YOUR OWN RISK. - -The `nova/` directory has useful tools and scripts for nova. - -The `glance/` directory has useful tools and scripts for glance. - -The `neutron/` directory has useful tools and scripts for neutron. - -The `multi/` directory is a tool that crosses multiple projects. - -Licensing ---------- -All contributions will be licensed under the Apache 2.0 License unless you -state otherwise. Please see the LICENSE file for details about the Apache 2.0 -License. diff --git a/ansible/dockerswarm/.gitignore b/contrib/ansible/dockerswarm/.gitignore similarity index 100% rename from ansible/dockerswarm/.gitignore rename to contrib/ansible/dockerswarm/.gitignore diff --git a/ansible/dockerswarm/README.md b/contrib/ansible/dockerswarm/README.md similarity index 100% rename from ansible/dockerswarm/README.md rename to contrib/ansible/dockerswarm/README.md diff --git a/ansible/dockerswarm/ansible.cfg b/contrib/ansible/dockerswarm/ansible.cfg similarity index 100% rename from ansible/dockerswarm/ansible.cfg rename to contrib/ansible/dockerswarm/ansible.cfg diff --git a/ansible/dockerswarm/hosts b/contrib/ansible/dockerswarm/hosts similarity index 100% rename from ansible/dockerswarm/hosts rename to contrib/ansible/dockerswarm/hosts diff --git a/ansible/dockerswarm/roles/post_apply/tasks/main.yml b/contrib/ansible/dockerswarm/roles/post_apply/tasks/main.yml similarity index 100% rename from ansible/dockerswarm/roles/post_apply/tasks/main.yml rename to contrib/ansible/dockerswarm/roles/post_apply/tasks/main.yml diff --git a/ansible/dockerswarm/roles/post_destroy/tasks/main.yml b/contrib/ansible/dockerswarm/roles/post_destroy/tasks/main.yml similarity index 100% rename from ansible/dockerswarm/roles/post_destroy/tasks/main.yml rename to contrib/ansible/dockerswarm/roles/post_destroy/tasks/main.yml diff --git a/ansible/dockerswarm/roles/prep_apply/tasks/main.yml b/contrib/ansible/dockerswarm/roles/prep_apply/tasks/main.yml similarity index 100% rename from ansible/dockerswarm/roles/prep_apply/tasks/main.yml rename to contrib/ansible/dockerswarm/roles/prep_apply/tasks/main.yml diff --git a/ansible/dockerswarm/roles/prep_apply/templates/cloudinit.j2 b/contrib/ansible/dockerswarm/roles/prep_apply/templates/cloudinit.j2 similarity index 100% rename from ansible/dockerswarm/roles/prep_apply/templates/cloudinit.j2 rename to contrib/ansible/dockerswarm/roles/prep_apply/templates/cloudinit.j2 diff --git a/ansible/dockerswarm/roles/prep_destroy/tasks/main.yml b/contrib/ansible/dockerswarm/roles/prep_destroy/tasks/main.yml similarity index 100% rename from ansible/dockerswarm/roles/prep_destroy/tasks/main.yml rename to contrib/ansible/dockerswarm/roles/prep_destroy/tasks/main.yml diff --git a/ansible/dockerswarm/roles/prov_apply/tasks/main.yml b/contrib/ansible/dockerswarm/roles/prov_apply/tasks/main.yml similarity index 100% rename from ansible/dockerswarm/roles/prov_apply/tasks/main.yml rename to contrib/ansible/dockerswarm/roles/prov_apply/tasks/main.yml diff --git a/ansible/dockerswarm/roles/prov_apply/templates/bootstrap1.j2 b/contrib/ansible/dockerswarm/roles/prov_apply/templates/bootstrap1.j2 similarity index 100% rename from ansible/dockerswarm/roles/prov_apply/templates/bootstrap1.j2 rename to contrib/ansible/dockerswarm/roles/prov_apply/templates/bootstrap1.j2 diff --git a/ansible/dockerswarm/roles/prov_apply/templates/bootstrap2.j2 b/contrib/ansible/dockerswarm/roles/prov_apply/templates/bootstrap2.j2 similarity index 100% rename from ansible/dockerswarm/roles/prov_apply/templates/bootstrap2.j2 rename to contrib/ansible/dockerswarm/roles/prov_apply/templates/bootstrap2.j2 diff --git a/ansible/dockerswarm/roles/prov_apply/templates/dockerservice.j2 b/contrib/ansible/dockerswarm/roles/prov_apply/templates/dockerservice.j2 similarity index 100% rename from ansible/dockerswarm/roles/prov_apply/templates/dockerservice.j2 rename to contrib/ansible/dockerswarm/roles/prov_apply/templates/dockerservice.j2 diff --git a/ansible/dockerswarm/roles/prov_apply/templates/openssl.cnf b/contrib/ansible/dockerswarm/roles/prov_apply/templates/openssl.cnf similarity index 100% rename from ansible/dockerswarm/roles/prov_apply/templates/openssl.cnf rename to contrib/ansible/dockerswarm/roles/prov_apply/templates/openssl.cnf diff --git a/ansible/dockerswarm/roles/prov_destroy/tasks/main.yml b/contrib/ansible/dockerswarm/roles/prov_destroy/tasks/main.yml similarity index 100% rename from ansible/dockerswarm/roles/prov_destroy/tasks/main.yml rename to contrib/ansible/dockerswarm/roles/prov_destroy/tasks/main.yml diff --git a/ansible/dockerswarm/roles/vm_apply/tasks/main.yml b/contrib/ansible/dockerswarm/roles/vm_apply/tasks/main.yml similarity index 100% rename from ansible/dockerswarm/roles/vm_apply/tasks/main.yml rename to contrib/ansible/dockerswarm/roles/vm_apply/tasks/main.yml diff --git a/ansible/dockerswarm/roles/vm_destroy/tasks/main.yml b/contrib/ansible/dockerswarm/roles/vm_destroy/tasks/main.yml similarity index 100% rename from ansible/dockerswarm/roles/vm_destroy/tasks/main.yml rename to contrib/ansible/dockerswarm/roles/vm_destroy/tasks/main.yml diff --git a/ansible/dockerswarm/site.yml b/contrib/ansible/dockerswarm/site.yml similarity index 100% rename from ansible/dockerswarm/site.yml rename to contrib/ansible/dockerswarm/site.yml diff --git a/ansible/dockerswarm/vars/bluebox.yml b/contrib/ansible/dockerswarm/vars/bluebox.yml similarity index 100% rename from ansible/dockerswarm/vars/bluebox.yml rename to contrib/ansible/dockerswarm/vars/bluebox.yml diff --git a/ansible/dockerswarm/vars/dreamhost.yml b/contrib/ansible/dockerswarm/vars/dreamhost.yml similarity index 100% rename from ansible/dockerswarm/vars/dreamhost.yml rename to contrib/ansible/dockerswarm/vars/dreamhost.yml diff --git a/ansible/dockerswarm/vars/leap.yml b/contrib/ansible/dockerswarm/vars/leap.yml similarity index 100% rename from ansible/dockerswarm/vars/leap.yml rename to contrib/ansible/dockerswarm/vars/leap.yml diff --git a/ansible/dockerswarm/vars/osic.yml b/contrib/ansible/dockerswarm/vars/osic.yml similarity index 100% rename from ansible/dockerswarm/vars/osic.yml rename to contrib/ansible/dockerswarm/vars/osic.yml diff --git a/ansible/dockerswarm/vars/ovh.yml b/contrib/ansible/dockerswarm/vars/ovh.yml similarity index 100% rename from ansible/dockerswarm/vars/ovh.yml rename to contrib/ansible/dockerswarm/vars/ovh.yml diff --git a/ansible/lampstack/.gitignore b/contrib/ansible/lampstack/.gitignore similarity index 100% rename from ansible/lampstack/.gitignore rename to contrib/ansible/lampstack/.gitignore diff --git a/ansible/lampstack/README.md b/contrib/ansible/lampstack/README.md similarity index 100% rename from ansible/lampstack/README.md rename to contrib/ansible/lampstack/README.md diff --git a/ansible/lampstack/ansible.cfg b/contrib/ansible/lampstack/ansible.cfg similarity index 100% rename from ansible/lampstack/ansible.cfg rename to contrib/ansible/lampstack/ansible.cfg diff --git a/ansible/lampstack/group_vars/all.yml b/contrib/ansible/lampstack/group_vars/all.yml similarity index 100% rename from ansible/lampstack/group_vars/all.yml rename to contrib/ansible/lampstack/group_vars/all.yml diff --git a/ansible/lampstack/hosts b/contrib/ansible/lampstack/hosts similarity index 100% rename from ansible/lampstack/hosts rename to contrib/ansible/lampstack/hosts diff --git a/ansible/lampstack/roles/apply/tasks/main.yml b/contrib/ansible/lampstack/roles/apply/tasks/main.yml similarity index 100% rename from ansible/lampstack/roles/apply/tasks/main.yml rename to contrib/ansible/lampstack/roles/apply/tasks/main.yml diff --git a/ansible/lampstack/roles/apply/templates/userdata.j2 b/contrib/ansible/lampstack/roles/apply/templates/userdata.j2 similarity index 100% rename from ansible/lampstack/roles/apply/templates/userdata.j2 rename to contrib/ansible/lampstack/roles/apply/templates/userdata.j2 diff --git a/ansible/lampstack/roles/balancer/tasks/main.yml b/contrib/ansible/lampstack/roles/balancer/tasks/main.yml similarity index 100% rename from ansible/lampstack/roles/balancer/tasks/main.yml rename to contrib/ansible/lampstack/roles/balancer/tasks/main.yml diff --git a/ansible/lampstack/roles/balancer/templates/haproxy.cfg.j2 b/contrib/ansible/lampstack/roles/balancer/templates/haproxy.cfg.j2 similarity index 100% rename from ansible/lampstack/roles/balancer/templates/haproxy.cfg.j2 rename to contrib/ansible/lampstack/roles/balancer/templates/haproxy.cfg.j2 diff --git a/ansible/lampstack/roles/balancer/templates/haproxy_fedora.cfg.j2 b/contrib/ansible/lampstack/roles/balancer/templates/haproxy_fedora.cfg.j2 similarity index 100% rename from ansible/lampstack/roles/balancer/templates/haproxy_fedora.cfg.j2 rename to contrib/ansible/lampstack/roles/balancer/templates/haproxy_fedora.cfg.j2 diff --git a/ansible/lampstack/roles/cleaner/tasks/apply.yml b/contrib/ansible/lampstack/roles/cleaner/tasks/apply.yml similarity index 100% rename from ansible/lampstack/roles/cleaner/tasks/apply.yml rename to contrib/ansible/lampstack/roles/cleaner/tasks/apply.yml diff --git a/ansible/lampstack/roles/cleaner/tasks/destroy.yml b/contrib/ansible/lampstack/roles/cleaner/tasks/destroy.yml similarity index 100% rename from ansible/lampstack/roles/cleaner/tasks/destroy.yml rename to contrib/ansible/lampstack/roles/cleaner/tasks/destroy.yml diff --git a/ansible/lampstack/roles/common/tasks/main.yml b/contrib/ansible/lampstack/roles/common/tasks/main.yml similarity index 100% rename from ansible/lampstack/roles/common/tasks/main.yml rename to contrib/ansible/lampstack/roles/common/tasks/main.yml diff --git a/ansible/lampstack/roles/database/tasks/main.yml b/contrib/ansible/lampstack/roles/database/tasks/main.yml similarity index 100% rename from ansible/lampstack/roles/database/tasks/main.yml rename to contrib/ansible/lampstack/roles/database/tasks/main.yml diff --git a/ansible/lampstack/roles/destroy/tasks/main.yml b/contrib/ansible/lampstack/roles/destroy/tasks/main.yml similarity index 100% rename from ansible/lampstack/roles/destroy/tasks/main.yml rename to contrib/ansible/lampstack/roles/destroy/tasks/main.yml diff --git a/ansible/lampstack/roles/webserver/tasks/main.yml b/contrib/ansible/lampstack/roles/webserver/tasks/main.yml similarity index 100% rename from ansible/lampstack/roles/webserver/tasks/main.yml rename to contrib/ansible/lampstack/roles/webserver/tasks/main.yml diff --git a/ansible/lampstack/roles/wordpress/tasks/main.yml b/contrib/ansible/lampstack/roles/wordpress/tasks/main.yml similarity index 100% rename from ansible/lampstack/roles/wordpress/tasks/main.yml rename to contrib/ansible/lampstack/roles/wordpress/tasks/main.yml diff --git a/ansible/lampstack/site.yml b/contrib/ansible/lampstack/site.yml similarity index 100% rename from ansible/lampstack/site.yml rename to contrib/ansible/lampstack/site.yml diff --git a/ansible/lampstack/vars/bluebox.yml b/contrib/ansible/lampstack/vars/bluebox.yml similarity index 100% rename from ansible/lampstack/vars/bluebox.yml rename to contrib/ansible/lampstack/vars/bluebox.yml diff --git a/ansible/lampstack/vars/dreamhost.yml b/contrib/ansible/lampstack/vars/dreamhost.yml similarity index 100% rename from ansible/lampstack/vars/dreamhost.yml rename to contrib/ansible/lampstack/vars/dreamhost.yml diff --git a/ansible/lampstack/vars/hos4.yml b/contrib/ansible/lampstack/vars/hos4.yml similarity index 100% rename from ansible/lampstack/vars/hos4.yml rename to contrib/ansible/lampstack/vars/hos4.yml diff --git a/ansible/lampstack/vars/leap.yml b/contrib/ansible/lampstack/vars/leap.yml similarity index 100% rename from ansible/lampstack/vars/leap.yml rename to contrib/ansible/lampstack/vars/leap.yml diff --git a/ansible/lampstack/vars/osic.yml b/contrib/ansible/lampstack/vars/osic.yml similarity index 100% rename from ansible/lampstack/vars/osic.yml rename to contrib/ansible/lampstack/vars/osic.yml diff --git a/ansible/lampstack/vars/otc.yml b/contrib/ansible/lampstack/vars/otc.yml similarity index 100% rename from ansible/lampstack/vars/otc.yml rename to contrib/ansible/lampstack/vars/otc.yml diff --git a/ansible/lampstack/vars/ovh.yml b/contrib/ansible/lampstack/vars/ovh.yml similarity index 100% rename from ansible/lampstack/vars/ovh.yml rename to contrib/ansible/lampstack/vars/ovh.yml diff --git a/ansible/lampstack/vars/trystack.yml b/contrib/ansible/lampstack/vars/trystack.yml similarity index 100% rename from ansible/lampstack/vars/trystack.yml rename to contrib/ansible/lampstack/vars/trystack.yml diff --git a/ansible_requirements.txt b/contrib/ansible_requirements.txt similarity index 100% rename from ansible_requirements.txt rename to contrib/ansible_requirements.txt diff --git a/heat/cleanup_stacks.py b/contrib/heat/cleanup_stacks.py similarity index 100% rename from heat/cleanup_stacks.py rename to contrib/heat/cleanup_stacks.py diff --git a/heat/lamp/AppWG_3Tier.yaml b/contrib/heat/lamp/AppWG_3Tier.yaml similarity index 100% rename from heat/lamp/AppWG_3Tier.yaml rename to contrib/heat/lamp/AppWG_3Tier.yaml diff --git a/heat/lamp/AppWG_3Tier_AutoScale.yaml b/contrib/heat/lamp/AppWG_3Tier_AutoScale.yaml similarity index 100% rename from heat/lamp/AppWG_3Tier_AutoScale.yaml rename to contrib/heat/lamp/AppWG_3Tier_AutoScale.yaml diff --git a/heat/lamp/README.rst b/contrib/heat/lamp/README.rst similarity index 100% rename from heat/lamp/README.rst rename to contrib/heat/lamp/README.rst diff --git a/heat/lamp/lib/heat_app_tier.yaml b/contrib/heat/lamp/lib/heat_app_tier.yaml similarity index 100% rename from heat/lamp/lib/heat_app_tier.yaml rename to contrib/heat/lamp/lib/heat_app_tier.yaml diff --git a/heat/lamp/lib/heat_sql_tier.yaml b/contrib/heat/lamp/lib/heat_sql_tier.yaml similarity index 100% rename from heat/lamp/lib/heat_sql_tier.yaml rename to contrib/heat/lamp/lib/heat_sql_tier.yaml diff --git a/heat/lamp/lib/heat_web_tier.yaml b/contrib/heat/lamp/lib/heat_web_tier.yaml similarity index 100% rename from heat/lamp/lib/heat_web_tier.yaml rename to contrib/heat/lamp/lib/heat_web_tier.yaml diff --git a/heat/lamp/lib/setup_net_sg.yaml b/contrib/heat/lamp/lib/setup_net_sg.yaml similarity index 100% rename from heat/lamp/lib/setup_net_sg.yaml rename to contrib/heat/lamp/lib/setup_net_sg.yaml diff --git a/lib/openstackapi.py b/contrib/lib/openstackapi.py similarity index 100% rename from lib/openstackapi.py rename to contrib/lib/openstackapi.py diff --git a/multi/Readme.md b/contrib/multi/Readme.md similarity index 100% rename from multi/Readme.md rename to contrib/multi/Readme.md diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/0-liberty-aio-ipadd.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/0-liberty-aio-ipadd.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/0-liberty-aio-ipadd.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/0-liberty-aio-ipadd.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/1-liberty-aio-prepare.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/1-liberty-aio-prepare.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/1-liberty-aio-prepare.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/1-liberty-aio-prepare.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/2-liberty-aio-keystone.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/2-liberty-aio-keystone.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/2-liberty-aio-keystone.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/2-liberty-aio-keystone.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/3-liberty-aio-glance.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/3-liberty-aio-glance.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/3-liberty-aio-glance.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/3-liberty-aio-glance.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/4-liberty-aio-nova.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/4-liberty-aio-nova.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/4-liberty-aio-nova.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/4-liberty-aio-nova.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/5-liberty-aio-config-ip-neutron.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/5-liberty-aio-config-ip-neutron.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/5-liberty-aio-config-ip-neutron.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/5-liberty-aio-config-ip-neutron.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/6-liberty-aio-install-neutron.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/6-liberty-aio-install-neutron.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/6-liberty-aio-install-neutron.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/6-liberty-aio-install-neutron.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/7-liberty-aio-install-horizon.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/7-liberty-aio-install-horizon.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/7-liberty-aio-install-horizon.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/7-liberty-aio-install-horizon.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/AIO-LIBERTY-1.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/AIO-LIBERTY-1.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/AIO-LIBERTY-1.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/AIO-LIBERTY-1.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/AIO-LIBERTY-2.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/AIO-LIBERTY-2.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/AIO-LIBERTY-2.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/AIO-LIBERTY-2.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/README.md b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/README.md similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/README.md rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/README.md diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/config.cfg b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/config.cfg similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/config.cfg rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-AIO/config.cfg diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/README.md b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/README.md similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/README.md rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/README.md diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/com1-ipdd.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/com1-ipdd.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/com1-ipdd.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/com1-ipdd.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/com1-prepare.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/com1-prepare.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/com1-prepare.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/com1-prepare.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/config.cfg b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/config.cfg similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/config.cfg rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/config.cfg diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-1-ipadd.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-1-ipadd.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-1-ipadd.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-1-ipadd.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-2-prepare.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-2-prepare.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-2-prepare.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-2-prepare.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-3.keystone.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-3.keystone.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-3.keystone.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-3.keystone.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-4-glance.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-4-glance.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-4-glance.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-4-glance.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-5-nova.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-5-nova.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-5-nova.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-5-nova.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-6-neutron.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-6-neutron.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-6-neutron.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-6-neutron.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-horizon.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-horizon.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-horizon.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-LB/ctl-horizon.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/README.md b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/README.md similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/README.md rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/README.md diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/com1-ipdd.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/com1-ipdd.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/com1-ipdd.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/com1-ipdd.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/com1-prepare.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/com1-prepare.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/com1-prepare.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/com1-prepare.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/config.cfg b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/config.cfg similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/config.cfg rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/config.cfg diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-1-ipadd.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-1-ipadd.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-1-ipadd.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-1-ipadd.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-10-ceilometer.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-10-ceilometer.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-10-ceilometer.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-10-ceilometer.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-2-prepare.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-2-prepare.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-2-prepare.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-2-prepare.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-3.keystone.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-3.keystone.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-3.keystone.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-3.keystone.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-4-glance.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-4-glance.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-4-glance.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-4-glance.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-5-nova.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-5-nova.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-5-nova.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-5-nova.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-6-neutron.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-6-neutron.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-6-neutron.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-6-neutron.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-7-cinder.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-7-cinder.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-7-cinder.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-7-cinder.sh diff --git a/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-horizon.sh b/contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-horizon.sh similarity index 100% rename from multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-horizon.sh rename to contrib/multi/openstack-liberty-multinode-scripts/LIBERTY-U14.04-OVS/ctl-horizon.sh diff --git a/multi/superhaproxy b/contrib/multi/superhaproxy similarity index 100% rename from multi/superhaproxy rename to contrib/multi/superhaproxy diff --git a/multi/tenant.py b/contrib/multi/tenant.py similarity index 100% rename from multi/tenant.py rename to contrib/multi/tenant.py diff --git a/multi/user-info.py b/contrib/multi/user-info.py similarity index 100% rename from multi/user-info.py rename to contrib/multi/user-info.py diff --git a/neutron/README.md b/contrib/neutron/README.md similarity index 100% rename from neutron/README.md rename to contrib/neutron/README.md diff --git a/neutron/count_routers_on_host.sh b/contrib/neutron/count_routers_on_host.sh similarity index 100% rename from neutron/count_routers_on_host.sh rename to contrib/neutron/count_routers_on_host.sh diff --git a/neutron/dhcp_agents_balancer.py b/contrib/neutron/dhcp_agents_balancer.py similarity index 100% rename from neutron/dhcp_agents_balancer.py rename to contrib/neutron/dhcp_agents_balancer.py diff --git a/neutron/get_floating_pools.sh b/contrib/neutron/get_floating_pools.sh similarity index 100% rename from neutron/get_floating_pools.sh rename to contrib/neutron/get_floating_pools.sh diff --git a/neutron/l3-agent-evacuate.py b/contrib/neutron/l3-agent-evacuate.py similarity index 100% rename from neutron/l3-agent-evacuate.py rename to contrib/neutron/l3-agent-evacuate.py diff --git a/neutron/net_blame.sh b/contrib/neutron/net_blame.sh similarity index 100% rename from neutron/net_blame.sh rename to contrib/neutron/net_blame.sh diff --git a/neutron/orphaned_ports.py b/contrib/neutron/orphaned_ports.py similarity index 100% rename from neutron/orphaned_ports.py rename to contrib/neutron/orphaned_ports.py diff --git a/nova/README.md b/contrib/nova/README.md similarity index 100% rename from nova/README.md rename to contrib/nova/README.md diff --git a/nova/antiaffinitycheck.py b/contrib/nova/antiaffinitycheck.py similarity index 100% rename from nova/antiaffinitycheck.py rename to contrib/nova/antiaffinitycheck.py diff --git a/nova/livemigrate_instances.py b/contrib/nova/livemigrate_instances.py similarity index 100% rename from nova/livemigrate_instances.py rename to contrib/nova/livemigrate_instances.py diff --git a/nova/nova-libvirt-compare.py b/contrib/nova/nova-libvirt-compare.py similarity index 100% rename from nova/nova-libvirt-compare.py rename to contrib/nova/nova-libvirt-compare.py diff --git a/nova/nova-vms-on-host.py b/contrib/nova/nova-vms-on-host.py similarity index 100% rename from nova/nova-vms-on-host.py rename to contrib/nova/nova-vms-on-host.py diff --git a/openstack-ansible/cleanup_host.sh b/contrib/openstack-ansible/cleanup_host.sh similarity index 100% rename from openstack-ansible/cleanup_host.sh rename to contrib/openstack-ansible/cleanup_host.sh diff --git a/rabbitmq/check_rabbtimq_file_descriptors.sh b/contrib/rabbitmq/check_rabbtimq_file_descriptors.sh similarity index 100% rename from rabbitmq/check_rabbtimq_file_descriptors.sh rename to contrib/rabbitmq/check_rabbtimq_file_descriptors.sh diff --git a/terraform/README.md b/contrib/terraform/README.md similarity index 100% rename from terraform/README.md rename to contrib/terraform/README.md diff --git a/terraform/cicd/.gitignore b/contrib/terraform/cicd/.gitignore similarity index 100% rename from terraform/cicd/.gitignore rename to contrib/terraform/cicd/.gitignore diff --git a/terraform/cicd/README.md b/contrib/terraform/cicd/README.md similarity index 100% rename from terraform/cicd/README.md rename to contrib/terraform/cicd/README.md diff --git a/terraform/cicd/Vagrantfile b/contrib/terraform/cicd/Vagrantfile similarity index 100% rename from terraform/cicd/Vagrantfile rename to contrib/terraform/cicd/Vagrantfile diff --git a/terraform/cicd/gerrit.tf b/contrib/terraform/cicd/gerrit.tf similarity index 100% rename from terraform/cicd/gerrit.tf rename to contrib/terraform/cicd/gerrit.tf diff --git a/terraform/cicd/gerrit.tpl b/contrib/terraform/cicd/gerrit.tpl similarity index 100% rename from terraform/cicd/gerrit.tpl rename to contrib/terraform/cicd/gerrit.tpl diff --git a/terraform/cicd/gerrit/postinstall.sh b/contrib/terraform/cicd/gerrit/postinstall.sh similarity index 100% rename from terraform/cicd/gerrit/postinstall.sh rename to contrib/terraform/cicd/gerrit/postinstall.sh diff --git a/terraform/cicd/jenkins.tf b/contrib/terraform/cicd/jenkins.tf similarity index 100% rename from terraform/cicd/jenkins.tf rename to contrib/terraform/cicd/jenkins.tf diff --git a/terraform/cicd/jenkins.tpl b/contrib/terraform/cicd/jenkins.tpl similarity index 100% rename from terraform/cicd/jenkins.tpl rename to contrib/terraform/cicd/jenkins.tpl diff --git a/terraform/cicd/jenkins/postinstall.sh b/contrib/terraform/cicd/jenkins/postinstall.sh similarity index 100% rename from terraform/cicd/jenkins/postinstall.sh rename to contrib/terraform/cicd/jenkins/postinstall.sh diff --git a/terraform/cicd/main.tf b/contrib/terraform/cicd/main.tf similarity index 100% rename from terraform/cicd/main.tf rename to contrib/terraform/cicd/main.tf diff --git a/terraform/cicd/network.tf b/contrib/terraform/cicd/network.tf similarity index 100% rename from terraform/cicd/network.tf rename to contrib/terraform/cicd/network.tf diff --git a/terraform/cicd/redmine.tf b/contrib/terraform/cicd/redmine.tf similarity index 100% rename from terraform/cicd/redmine.tf rename to contrib/terraform/cicd/redmine.tf diff --git a/terraform/cicd/redmine/postinstall_db.sh b/contrib/terraform/cicd/redmine/postinstall_db.sh similarity index 100% rename from terraform/cicd/redmine/postinstall_db.sh rename to contrib/terraform/cicd/redmine/postinstall_db.sh diff --git a/terraform/cicd/redmine/postinstall_web.sh b/contrib/terraform/cicd/redmine/postinstall_web.sh similarity index 100% rename from terraform/cicd/redmine/postinstall_web.sh rename to contrib/terraform/cicd/redmine/postinstall_web.sh diff --git a/terraform/cicd/redmine_db.tpl b/contrib/terraform/cicd/redmine_db.tpl similarity index 100% rename from terraform/cicd/redmine_db.tpl rename to contrib/terraform/cicd/redmine_db.tpl diff --git a/terraform/cicd/redmine_web.tpl b/contrib/terraform/cicd/redmine_web.tpl similarity index 100% rename from terraform/cicd/redmine_web.tpl rename to contrib/terraform/cicd/redmine_web.tpl diff --git a/terraform/cicd/variables.tf b/contrib/terraform/cicd/variables.tf similarity index 100% rename from terraform/cicd/variables.tf rename to contrib/terraform/cicd/variables.tf diff --git a/terraform/deis-coreos/.gitignore b/contrib/terraform/deis-coreos/.gitignore similarity index 100% rename from terraform/deis-coreos/.gitignore rename to contrib/terraform/deis-coreos/.gitignore diff --git a/terraform/deis-coreos/LICENSE b/contrib/terraform/deis-coreos/LICENSE similarity index 100% rename from terraform/deis-coreos/LICENSE rename to contrib/terraform/deis-coreos/LICENSE diff --git a/terraform/deis-coreos/README.md b/contrib/terraform/deis-coreos/README.md similarity index 100% rename from terraform/deis-coreos/README.md rename to contrib/terraform/deis-coreos/README.md diff --git a/terraform/deis-coreos/deis.tf b/contrib/terraform/deis-coreos/deis.tf similarity index 100% rename from terraform/deis-coreos/deis.tf rename to contrib/terraform/deis-coreos/deis.tf diff --git a/terraform/deis-coreos/files/cloud-init b/contrib/terraform/deis-coreos/files/cloud-init similarity index 100% rename from terraform/deis-coreos/files/cloud-init rename to contrib/terraform/deis-coreos/files/cloud-init diff --git a/terraform/deis-coreos/keys/.gitignore b/contrib/terraform/deis-coreos/keys/.gitignore similarity index 100% rename from terraform/deis-coreos/keys/.gitignore rename to contrib/terraform/deis-coreos/keys/.gitignore diff --git a/terraform/deis-coreos/variables.tf b/contrib/terraform/deis-coreos/variables.tf similarity index 100% rename from terraform/deis-coreos/variables.tf rename to contrib/terraform/deis-coreos/variables.tf diff --git a/terraform/docker-registry/.gitignore b/contrib/terraform/docker-registry/.gitignore similarity index 100% rename from terraform/docker-registry/.gitignore rename to contrib/terraform/docker-registry/.gitignore diff --git a/terraform/docker-registry/LICENSE b/contrib/terraform/docker-registry/LICENSE similarity index 100% rename from terraform/docker-registry/LICENSE rename to contrib/terraform/docker-registry/LICENSE diff --git a/terraform/docker-registry/README.md b/contrib/terraform/docker-registry/README.md similarity index 100% rename from terraform/docker-registry/README.md rename to contrib/terraform/docker-registry/README.md diff --git a/terraform/docker-registry/files/ssl/generate-ssl.sh b/contrib/terraform/docker-registry/files/ssl/generate-ssl.sh similarity index 100% rename from terraform/docker-registry/files/ssl/generate-ssl.sh rename to contrib/terraform/docker-registry/files/ssl/generate-ssl.sh diff --git a/terraform/docker-registry/files/ssl/openssl.cnf b/contrib/terraform/docker-registry/files/ssl/openssl.cnf similarity index 100% rename from terraform/docker-registry/files/ssl/openssl.cnf rename to contrib/terraform/docker-registry/files/ssl/openssl.cnf diff --git a/terraform/docker-registry/registry.tf b/contrib/terraform/docker-registry/registry.tf similarity index 100% rename from terraform/docker-registry/registry.tf rename to contrib/terraform/docker-registry/registry.tf diff --git a/terraform/docker-registry/templates/local_vars.env b/contrib/terraform/docker-registry/templates/local_vars.env similarity index 100% rename from terraform/docker-registry/templates/local_vars.env rename to contrib/terraform/docker-registry/templates/local_vars.env diff --git a/terraform/docker-registry/templates/registry_vars.env b/contrib/terraform/docker-registry/templates/registry_vars.env similarity index 100% rename from terraform/docker-registry/templates/registry_vars.env rename to contrib/terraform/docker-registry/templates/registry_vars.env diff --git a/terraform/docker-registry/templates/swift_vars.env b/contrib/terraform/docker-registry/templates/swift_vars.env similarity index 100% rename from terraform/docker-registry/templates/swift_vars.env rename to contrib/terraform/docker-registry/templates/swift_vars.env diff --git a/terraform/docker-registry/variables.tf b/contrib/terraform/docker-registry/variables.tf similarity index 100% rename from terraform/docker-registry/variables.tf rename to contrib/terraform/docker-registry/variables.tf diff --git a/terraform/dockerswarm-coreos/.gitignore b/contrib/terraform/dockerswarm-coreos/.gitignore similarity index 100% rename from terraform/dockerswarm-coreos/.gitignore rename to contrib/terraform/dockerswarm-coreos/.gitignore diff --git a/terraform/dockerswarm-coreos/LICENSE.md b/contrib/terraform/dockerswarm-coreos/LICENSE.md similarity index 100% rename from terraform/dockerswarm-coreos/LICENSE.md rename to contrib/terraform/dockerswarm-coreos/LICENSE.md diff --git a/terraform/dockerswarm-coreos/README.md b/contrib/terraform/dockerswarm-coreos/README.md similarity index 100% rename from terraform/dockerswarm-coreos/README.md rename to contrib/terraform/dockerswarm-coreos/README.md diff --git a/terraform/dockerswarm-coreos/_securitygroups.tf b/contrib/terraform/dockerswarm-coreos/_securitygroups.tf similarity index 100% rename from terraform/dockerswarm-coreos/_securitygroups.tf rename to contrib/terraform/dockerswarm-coreos/_securitygroups.tf diff --git a/terraform/dockerswarm-coreos/files/ssl/generate-ssl.sh b/contrib/terraform/dockerswarm-coreos/files/ssl/generate-ssl.sh similarity index 100% rename from terraform/dockerswarm-coreos/files/ssl/generate-ssl.sh rename to contrib/terraform/dockerswarm-coreos/files/ssl/generate-ssl.sh diff --git a/terraform/dockerswarm-coreos/files/ssl/openssl.cnf b/contrib/terraform/dockerswarm-coreos/files/ssl/openssl.cnf similarity index 100% rename from terraform/dockerswarm-coreos/files/ssl/openssl.cnf rename to contrib/terraform/dockerswarm-coreos/files/ssl/openssl.cnf diff --git a/terraform/dockerswarm-coreos/swarm.tf b/contrib/terraform/dockerswarm-coreos/swarm.tf similarity index 100% rename from terraform/dockerswarm-coreos/swarm.tf rename to contrib/terraform/dockerswarm-coreos/swarm.tf diff --git a/terraform/dockerswarm-coreos/templates/10-docker-service.conf b/contrib/terraform/dockerswarm-coreos/templates/10-docker-service.conf similarity index 100% rename from terraform/dockerswarm-coreos/templates/10-docker-service.conf rename to contrib/terraform/dockerswarm-coreos/templates/10-docker-service.conf diff --git a/terraform/dockerswarm-coreos/templates/cloud-init b/contrib/terraform/dockerswarm-coreos/templates/cloud-init similarity index 100% rename from terraform/dockerswarm-coreos/templates/cloud-init rename to contrib/terraform/dockerswarm-coreos/templates/cloud-init diff --git a/terraform/dockerswarm-coreos/vars-coreos.tf b/contrib/terraform/dockerswarm-coreos/vars-coreos.tf similarity index 100% rename from terraform/dockerswarm-coreos/vars-coreos.tf rename to contrib/terraform/dockerswarm-coreos/vars-coreos.tf diff --git a/terraform/dockerswarm-coreos/vars-openstack.tf b/contrib/terraform/dockerswarm-coreos/vars-openstack.tf similarity index 100% rename from terraform/dockerswarm-coreos/vars-openstack.tf rename to contrib/terraform/dockerswarm-coreos/vars-openstack.tf diff --git a/terraform/dockerswarm-coreos/vars-swarm.tf b/contrib/terraform/dockerswarm-coreos/vars-swarm.tf similarity index 100% rename from terraform/dockerswarm-coreos/vars-swarm.tf rename to contrib/terraform/dockerswarm-coreos/vars-swarm.tf diff --git a/terraform/kubernetes-coreos/.gitignore b/contrib/terraform/kubernetes-coreos/.gitignore similarity index 100% rename from terraform/kubernetes-coreos/.gitignore rename to contrib/terraform/kubernetes-coreos/.gitignore diff --git a/terraform/kubernetes-coreos/LICENSE b/contrib/terraform/kubernetes-coreos/LICENSE similarity index 100% rename from terraform/kubernetes-coreos/LICENSE rename to contrib/terraform/kubernetes-coreos/LICENSE diff --git a/terraform/kubernetes-coreos/README.md b/contrib/terraform/kubernetes-coreos/README.md similarity index 100% rename from terraform/kubernetes-coreos/README.md rename to contrib/terraform/kubernetes-coreos/README.md diff --git a/terraform/kubernetes-coreos/_securitygroups.tf b/contrib/terraform/kubernetes-coreos/_securitygroups.tf similarity index 100% rename from terraform/kubernetes-coreos/_securitygroups.tf rename to contrib/terraform/kubernetes-coreos/_securitygroups.tf diff --git a/terraform/kubernetes-coreos/files/install_kube.sh b/contrib/terraform/kubernetes-coreos/files/install_kube.sh similarity index 100% rename from terraform/kubernetes-coreos/files/install_kube.sh rename to contrib/terraform/kubernetes-coreos/files/install_kube.sh diff --git a/terraform/kubernetes-coreos/files/weave-kube.yml b/contrib/terraform/kubernetes-coreos/files/weave-kube.yml similarity index 100% rename from terraform/kubernetes-coreos/files/weave-kube.yml rename to contrib/terraform/kubernetes-coreos/files/weave-kube.yml diff --git a/terraform/kubernetes-coreos/kubernetes.tf b/contrib/terraform/kubernetes-coreos/kubernetes.tf similarity index 100% rename from terraform/kubernetes-coreos/kubernetes.tf rename to contrib/terraform/kubernetes-coreos/kubernetes.tf diff --git a/terraform/kubernetes-coreos/terraform.tfvars b/contrib/terraform/kubernetes-coreos/terraform.tfvars similarity index 100% rename from terraform/kubernetes-coreos/terraform.tfvars rename to contrib/terraform/kubernetes-coreos/terraform.tfvars diff --git a/terraform/kubernetes-coreos/variables.tf b/contrib/terraform/kubernetes-coreos/variables.tf similarity index 100% rename from terraform/kubernetes-coreos/variables.tf rename to contrib/terraform/kubernetes-coreos/variables.tf diff --git a/terraform/lampstack/README.md b/contrib/terraform/lampstack/README.md similarity index 100% rename from terraform/lampstack/README.md rename to contrib/terraform/lampstack/README.md diff --git a/terraform/lampstack/lampstack.tf b/contrib/terraform/lampstack/lampstack.tf similarity index 100% rename from terraform/lampstack/lampstack.tf rename to contrib/terraform/lampstack/lampstack.tf diff --git a/terraform/lampstack/onvm/app/index.php b/contrib/terraform/lampstack/onvm/app/index.php similarity index 100% rename from terraform/lampstack/onvm/app/index.php rename to contrib/terraform/lampstack/onvm/app/index.php diff --git a/terraform/lampstack/onvm/scripts/installapache.sh b/contrib/terraform/lampstack/onvm/scripts/installapache.sh similarity index 100% rename from terraform/lampstack/onvm/scripts/installapache.sh rename to contrib/terraform/lampstack/onvm/scripts/installapache.sh diff --git a/terraform/lampstack/onvm/scripts/installdb.sh b/contrib/terraform/lampstack/onvm/scripts/installdb.sh similarity index 100% rename from terraform/lampstack/onvm/scripts/installdb.sh rename to contrib/terraform/lampstack/onvm/scripts/installdb.sh diff --git a/terraform/lampstack/vars_lampstack.tf b/contrib/terraform/lampstack/vars_lampstack.tf similarity index 100% rename from terraform/lampstack/vars_lampstack.tf rename to contrib/terraform/lampstack/vars_lampstack.tf diff --git a/tox.ini b/tox.ini deleted file mode 100644 index f3b0e9a..0000000 --- a/tox.ini +++ /dev/null @@ -1,40 +0,0 @@ -[tox] -envlist = py27 -minversion = 2.3.1 -skip_install = True -skipsdist = True - -[testenv] -sitepackages = False -setenv = - VIRTUAL_ENV={envdir} - LAMPSTACK_DIR = {toxinidir}/ansible/lampstack - ANSIBLE_HOST_KEY_CHECKING = False - ANSIBLE_SSH_CONTROL_PATH = /tmp/%%h-%%r - ANSIBLE_INVENTORY = {env:LAMPSTACK_DIR}/hosts - ANSIBLE_CONFIG = {env:LAMPSTACK_DIR}/ansible.cfg - ANSIBLE_LOCAL_TEMP = {envtmpdir} -deps = - setuptools - -r{toxinidir}/ansible_requirements.txt - -[testenv:lampstack] -setenv = - {[testenv]setenv} -commands = ansible-playbook -e "action=apply {posargs}" {env:LAMPSTACK_DIR}/site.yml -passenv = - OS_USERNAME - OS_PASSWORD - OS_PROJECT_NAME - -[testenv:profile] -setenv = - {[testenv]setenv} - ANSIBLE_CALLBACK_WHITELIST = profile_tasks -commands = ansible-playbook -e "action=apply {posargs}" {env:LAMPSTACK_DIR}/site.yml - -[testenv:lampstack-syntax] -setenv = - {[testenv]setenv} -commands = ansible-playbook --syntax-check {env:LAMPSTACK_DIR}/site.yml -e "action=apply {posargs}" - ansible-playbook --syntax-check {env:LAMPSTACK_DIR}/site.yml -e "action=destroy {posargs}"