Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fixtures:
repositories:
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
"firewall": "git://github.com/puppetlabs/puppetlabs-firewall.git"
"mysql": "git://github.com/rochaporto/puppet-mysql.git"
symlinks:
"cloudstack": "#{source_dir}"

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ tests
environments
.idea
*~
Gemfile.lock
.bundle
vendor
spec/fixtures
30 changes: 30 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
language: ruby
rvm:
- 1.8.7
- 1.9.3
- 2.1.4
script:
- "bundle exec rake spec SPEC_OPTS='--format documentation'"
env:
- PUPPET_VERSION="~> 2.6.0"
- PUPPET_VERSION="~> 2.7.0"
- PUPPET_VERSION="~> 3.0.0"
- PUPPET_VERSION="~> 3.1.0"
- PUPPET_VERSION="~> 3.8.0"
- PUPPET_VERSION="~> 4.2"
matrix:
exclude:
- rvm: 1.8.7
env: PUPPET_VERSION="~> 4.2"
- rvm: 1.9.3
env: PUPPET_VERSION="~> 2.6.0"
- rvm: 2.1.4
env: PUPPET_VERSION="~> 2.6.0"
- rvm: 2.1.4
env: PUPPET_VERSION="~> 2.7.0"
- rvm: 2.1.4
env: PUPPET_VERSION="~> 3.0.0"
- rvm: 2.1.4
env: PUPPET_VERSION="~> 3.1.0"

sudo: false
7 changes: 7 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source 'https://rubygems.org'

puppetversion = ENV['PUPPET_VERSION']
gem 'puppet', puppetversion, :require => false
gem 'puppet-lint'
gem 'rspec', '~> 3.1.0', :platforms => :ruby_18
gem 'puppetlabs_spec_helper', '>= 0.1.0'
5 changes: 5 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rubygems'
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint'
PuppetLint.configuration.send("disable_80chars")
PuppetLint.configuration.send('disable_class_parameter_defaults')
2 changes: 1 addition & 1 deletion manifests/cluster.pp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
"/usr/bin/curl \'${teststring_pod}\' | grep ${podid}",
"/usr/bin/curl \'${teststring_cluster}\' | grep -v ${cluster}"
],
require => Exec[ 'cloud_setup_databases' ],
require => Exec[ 'cloudstack_setup_databases' ],
}
}
3 changes: 1 addition & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@


yumrepo{ 'cloudstack':
descr => 'Cloudstack repo 4.5',
descr => 'Cloudstack repo 4.5',
baseurl => 'http://cloudstack.apt-get.eu/rhel/4.5/',
# baseurl => 'http://cloudstack.apt-get.eu/rhel/4.4/',
enabled => '1',
gpgcheck => '0',
}
Expand Down
20 changes: 10 additions & 10 deletions manifests/mgmt.pp
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,20 @@


file { '/etc/cloudstack/management/tomcat6.conf':
ensure => 'link',
group => '0',
mode => '0777',
owner => '0',
target => 'tomcat6-nonssl.conf',
ensure => 'link',
group => '0',
mode => '0777',
owner => '0',
target => 'tomcat6-nonssl.conf',
require => Package[ 'cloudstack-management' ],
}

file { '/usr/share/cloudstack-management/conf/server.xml':
ensure => 'link',
group => '0',
mode => '0777',
owner => '0',
target => 'server-nonssl.xml',
ensure => 'link',
group => '0',
mode => '0777',
owner => '0',
target => 'server-nonssl.xml',
require => Package[ 'cloudstack-management' ],
}

Expand Down
4 changes: 2 additions & 2 deletions manifests/nfs-common.pp → manifests/nfs_common.pp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Class: cloudstack::nfs-common
# Class: cloudstack::nfs_common
#
# this subclass provides NFS for primary and secondary storage
# on a single machine. this is not production quality - but useful
# for a POC/demo/dev/test environment.
# you will either want to significantly alter or use your own nfs class
class cloudstack::nfs-common {
class cloudstack::nfs_common {


package {'nfs-utils':
Expand Down
2 changes: 1 addition & 1 deletion manifests/pod.pp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@
"/usr/bin/curl \'${teststring_zone}\' | grep ${zoneid}",
"/usr/bin/curl \'${teststring_pod}\' | grep -v ${pod}",
],
require => Exec[ 'cloud_setup_databases' ],
require => Exec[ 'cloudstack_setup_databases' ],
}
}
2 changes: 1 addition & 1 deletion manifests/zone.pp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@

exec { "/usr/bin/curl \'${reststring}\'":
onlyif => "/usr/bin/curl \'${teststring}\' | grep -v ${name}",
require => Exec[ 'cloud_setup_databases' ],
require => Exec[ 'cloudstack_setup_databases' ],
}
}
15 changes: 15 additions & 0 deletions spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'spec_helper'

describe 'cloudstack' do
let(:node) { 'cloudstack.example42.com' }
let(:facts) {{
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:operatingsystemrelease => '12.10'
}}

describe 'generic test' do
it { should compile }
it { should contain_class('cloudstack') }
end
end
16 changes: 16 additions & 0 deletions spec/classes/kvmagent_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
require 'spec_helper'

describe 'cloudstack::kvmagent' do
let(:node) { 'cloudstack.example42.com' }
let(:pre_condition) { 'include cloudstack' }
let(:facts) {{
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:operatingsystemrelease => '12.10'
}}

describe 'generic test' do
it { should compile }
it { should contain_class('cloudstack::kvmagent') }
end
end
16 changes: 16 additions & 0 deletions spec/classes/mgmt_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
require 'spec_helper'

describe 'cloudstack::mgmt' do
let(:node) { 'cloudstack.example42.com' }
let(:pre_condition) { 'include cloudstack' }
let(:facts) {{
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:operatingsystemrelease => '12.10'
}}

describe 'generic test' do
it { should compile }
it { should contain_class('cloudstack::mgmt') }
end
end
15 changes: 15 additions & 0 deletions spec/classes/nfs_common_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'spec_helper'

describe 'cloudstack::nfs_common' do
let(:node) { 'cloudstack.example42.com' }
let(:facts) {{
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:operatingsystemrelease => '12.10'
}}

describe 'generic test' do
it { should compile }
it { should contain_class('cloudstack::nfs_common') }
end
end
18 changes: 18 additions & 0 deletions spec/defines/cluster_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
require 'spec_helper'

describe 'cloudstack::cluster', :type => :define do
let(:title) { 'example42' }
let(:facts) {{
:osfamily => 'RedHat',
:operatingsystem => 'CentOS'
}}
let(:params) {{
:zoneid => 'cloudstack',
:podid => 'example42'
}}
let(:pre_condition) {[
'include cloudstack',
'include cloudstack::mgmt',
]}
it { should compile }
end
21 changes: 21 additions & 0 deletions spec/defines/pod_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
require 'spec_helper'

describe 'cloudstack::pod', :type => :define do
let(:title) { 'example42' }
let(:facts) {{
:osfamily => 'RedHat',
:operatingsystem => 'CentOS'
}}
let(:params) {{
:gateway => '127.0.0.1',
:netmask => '255.255.0.0',
:startip => '10.0.2.0',
:endip => '10.2.0.3',
:zoneid => 'example42'
}}
let(:pre_condition) {[
'include cloudstack',
'include cloudstack::mgmt'
]}
it { should compile }
end
14 changes: 14 additions & 0 deletions spec/defines/zone_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
require 'spec_helper'

describe 'cloudstack::zone', :type => :define do
let(:title) { 'example42' }
let(:facts) {{
:osfamily => 'RedHat',
:operatingsystem => 'CentOS'
}}
let(:pre_condition) {[
'include cloudstack',
'include cloudstack::mgmt'
]}
it { should compile }
end
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require 'puppetlabs_spec_helper/module_spec_helper'