-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
pushing a ton of changes upstream #1
Open
ke4qqq
wants to merge
54
commits into
CloudStack-extras:master
Choose a base branch
from
ke4qqq:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 37 commits
Commits
Show all changes
54 commits
Select commit
Hold shift + click to select a range
d2566cc
Split main init into multiple files, removed tabs, some space correct…
bad8a5e
Changes made for style guide pass, stopping to look at sudo options
274336c
Refactor to use stdlib, add more module files
45127f4
Added more module metadata
d9e1685
Removed network stuff from kvmagent for now
5d021e8
Testing inclusion of third party iptables and mysql modules
dbcffc6
Redefined zone as defined type, testing
583f8d3
Refactored zone
35583f3
Created pod
3b4ea8b
Moved declaration code into test manifest
a79b55f
Moved declaration code into test manifest
a63032d
setting resources to purge so that we don't have to worry about IPv6 …
ke4qqq e5a390b
reordering so that execs are all in one place - changing from iptable…
ke4qqq 4172fc7
cleaning up kvmagent a bit more
ke4qqq 2e344b6
moving core firewall rules to init.pp
ke4qqq ba533cd
adding the appropriate firewall ports to kvmagent
ke4qqq 9fcd683
foo
ke4qqq 7bbd403
fixing the README
ke4qqq 9414f0d
adding support for scientific linux
ke4qqq 8ffd69c
fixing a syntax issue
ke4qqq 098f1d4
fixing another syntax issue
ke4qqq d17cea5
fixing lots of syntax issues
ke4qqq ef37efb
adding the 4.0 yum repo, making mysql less of a requirement.
ke4qqq 3857be3
Pointed repo to correct location, renamed some services to map 4.1
1d1412f
Making puppet-lint happy
7839cde
Tomcat Changes
ce4f88d
nfs-common now actually is usable
74a70ee
Typo upon saving after testing :((
5e704ec
Fresher versions etc
e41052d
Merge pull request #1 from KrisBuytaert/master
ke4qqq 8886be9
Fixing this so it uses 4.2
ke4qqq 8b03cef
Update readme
ke4qqq a0be7fb
Initial commit
visibilityspots bdc8d04
Merge remote-tracking branch 'upstream/master'
visibilityspots f5d5da7
Refactored classes for puppet-lint compliance
visibilityspots e8e1f48
Removed intial commit
visibilityspots 9fc342b
Merge pull request #2 from visibilityspots/master
ke4qqq 9598db6
changed the system VM templates links to v4.5
TomRitserveldt a8dfd5a
added inherits from params.pp for class cloudstack
TomRitserveldt 5e2c175
updated yumrepo for cloudstack v4.5
TomRitserveldt 9ae2e6f
fixed the sudoers entries to include the requiretty(otherwise errors …
TomRitserveldt 12dc8a5
clean up
TomRitserveldt eeb115e
removed cloudstack include
TomRitserveldt c3996c5
removed cloudstack include
TomRitserveldt ffa3ec9
added require to cloudstack-management to ensure the tomcat6.conf is …
TomRitserveldt 81c5057
cloudstack_setup_databases requires the cloudstack-management package
TomRitserveldt 9733d7b
files require the cloudstack management package to be installed.
TomRitserveldt 39ffaf2
clean up text formatting.
TomRitserveldt ce9e2e5
removed cloudstack include
TomRitserveldt ea962c6
gitignore
TomRitserveldt 179ad1c
require the file server.xml or cloudstack-management will fail to start
TomRitserveldt 57355f4
Merge pull request #3 from TomRitserveldt/master
ke4qqq 9a24770
rspec tests - lint cleanups
75584f2
Merge pull request #4 from tuxmea/rspec
ke4qqq File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
--no-80chars-check |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,202 @@ | ||
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. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
name 'puppetlabs-cloudstack' | ||
version '0.0.1' | ||
source 'git://github.com/puppetlabs/puppetlabs-cloudstack' | ||
author 'puppetlabs' | ||
license 'Apache 2.0' | ||
summary 'CloudStack management module' | ||
description 'Installation and configuration of all CloudStack components' | ||
project_page 'https://github.com/puppetlabs/puppetlabs-cloudstack' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this source does also not exist |
||
|
||
## Add dependencies, if any: | ||
dependency 'puppetlabs/stdlib', '>= 2.0.0' | ||
dependency 'puppetlabs/firewall', '>= 0.0.4' | ||
dependency 'rocha/mysql' '>= 0.1.0' |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
* cloudstack-puppet | ||
|
||
This is the CloudStack puppet manifest. | ||
|
||
Original content herein licensed under the Apache 2.0 license. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
# Defined resource type: cloudstack::zone | ||
# | ||
# This defined type is used to identify a CloudStack zone | ||
# | ||
# Parameters: | ||
# zone_dns - The external DNS server | ||
# zone_internal_dns - Internal DNS server | ||
# networktype - Network type to use for zone. Valid options are | ||
# | ||
# Actions: | ||
# | ||
# Requires: | ||
# | ||
# | ||
# Sample Usage: | ||
# cloudstack::zone { 'samplezone': | ||
# zone_dns => 'myinternaldns', | ||
# } | ||
# | ||
define cloudstack::cluster( | ||
$zoneid, | ||
$podid, | ||
$clustertype = 'CloudManaged', | ||
$hypervisor = $hvtype, | ||
) { | ||
#### NEED TO VERIFY THAT ZONEID AND PODID ARE VALID! | ||
$teststring_zone = inline_template( "<%= \"http://localhost:\" + | ||
\"${cloudstack::params::mgmt_port}/?command=listZones&\" + | ||
\"available=true\" %>" ) | ||
$teststring_pod = inline_template( "<%= \"http://localhost:\" + | ||
\"${cloudstack::params::mgmt_port}/?command=listPods&\" + | ||
\"available=true\" %>" ) | ||
$teststring_cluster = inline_template( "<%= \"http://localhost:\" + | ||
\"${cloudstack::params::mgmt_port}/?command=listClusters&\" + | ||
\"available=true\" %>" ) | ||
$reststring = inline_template( "<%= \"http://localhost:\" + | ||
\"${cloudstack::params::mgmt_port}/?command=addCluster&\" + | ||
\"clustername=${name}&clustertype=${clustertype}&\" + | ||
\"hypervisor=${hypervisor}&zoneid=${zoneid}&\" + | ||
\"podid=${podid}\" %>" ) | ||
|
||
exec { "/usr/bin/curl \'${reststring}\'": | ||
onlyif => [ | ||
"/usr/bin/curl \'${teststring_zone}\' | grep ${zoneid}", | ||
"/usr/bin/curl \'${teststring_pod}\' | grep ${podid}", | ||
"/usr/bin/curl \'${teststring_cluster}\' | grep -v ${cluster}" | ||
], | ||
require => Exec[ 'cloud_setup_databases' ], | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this source does not exist