Merge pull request #4 from tuxmea/rspec

rspec tests - lint cleanups thanks to @tuxmea

Author: ke4qqq

.fixtures.yml

@@ -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}"
+

.gitignore

@@ -8,3 +8,7 @@ tests
 environments
 .idea
 *~
+Gemfile.lock
+.bundle
+vendor
+spec/fixtures

.travis.yml

@@ -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

Gemfile

@@ -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'

Rakefile

@@ -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')

manifests/cluster.pp

@@ -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' ],
     }
 }

manifests/init.pp

@@ -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',
   }

manifests/mgmt.pp

@@ -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' ],
   }
 

manifests/nfs-common.pp renamed to manifests/nfs_common.pp

@@ -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':

manifests/pod.pp

@@ -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' ],
     }
 }