Merge pull request #208 from endocode/master

Updates onetemplate_spec

Author: rwaffen

.travis.yml

@@ -1,4 +1,8 @@
 ---
+sudo: false
+
+cache: bundler
+
 rvm:
   - 1.8.7
   - 1.9.2

Gemfile

@@ -33,5 +33,5 @@ if puppetversion = ENV['PUPPET_GEM_VERSION']
     gem 'hiera-puppet', :require => false
   end
 else
-  gem 'puppet', :require => false
+  gem 'puppet', '< 4', :require => false
 end

Vagrantfile

@@ -45,7 +45,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.synced_folder '.', '/etc/puppet/modules/one/'
 
-  config.vm.define 'centos' do |centos|
+  config.vm.define 'centos-head' do |centos|
     centos.vm.box = 'puppetlabs/centos-6.6-64-puppet'
     config.vm.box_version = '1.0.1'
     centos.vm.provision 'shell', inline: '/usr/bin/yum -y install epel-release'
@@ -61,7 +61,23 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  config.vm.define 'debian' do |debian|
+  config.vm.define 'centos-node' do |centos|
+    centos.vm.box = 'puppetlabs/centos-6.6-64-puppet'
+    config.vm.box_version = '1.0.1'
+    centos.vm.provision 'shell', inline: '/usr/bin/yum -y install epel-release'
+    centos.vm.provision 'shell', inline: 'puppet module install puppetlabs-stdlib'
+    centos.vm.provision 'shell', inline: 'puppet module install puppetlabs-inifile'
+    centos.vm.provision 'puppet' do |puppet|
+      puppet.manifests_path = 'manifests'
+      puppet.manifest_file = 'init.pp'
+      puppet.options = [
+          '--verbose',
+          "-e 'class { one: }'"
+      ]
+    end
+  end
+
+  config.vm.define 'debian-head' do |debian|
     debian.vm.box = 'puppetlabs/debian-7.8-64-puppet'
     debian.vm.provision 'shell', inline: 'puppet module install puppetlabs-stdlib'
     debian.vm.provision 'shell', inline: 'puppet module install puppetlabs-inifile'
@@ -75,4 +91,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       ]
     end
   end
+
+  config.vm.define 'debian-node' do |debian|
+    debian.vm.box = 'puppetlabs/debian-7.8-64-puppet'
+    debian.vm.provision 'shell', inline: 'puppet module install puppetlabs-stdlib'
+    debian.vm.provision 'shell', inline: 'puppet module install puppetlabs-inifile'
+    debian.vm.provision 'shell', inline: 'puppet module install puppetlabs-apt'
+    debian.vm.provision 'puppet' do |puppet|
+      puppet.manifests_path = 'manifests'
+      puppet.manifest_file = 'init.pp'
+      puppet.options = [
+          '--verbose',
+          "-e 'class { one: }'"
+      ]
+    end
+  end
 end

manifests/params.pp

@@ -197,12 +197,10 @@
     'RedHat': {
       if $::operatingsystemmajrelease == '7' {
         $node_packages = ['opennebula-node-kvm',
-                          'sudo',
                           'ipset'
                           ]
       } else {
         $node_packages = ['opennebula-node-kvm',
-                          'sudo',
                           'python-virtinst',
                           'ipset'
                           ]
@@ -229,7 +227,6 @@
     'Debian': {
       $use_gems        = true
       $node_packages   = ['opennebula-node',
-                          'sudo',
                           'virtinst',
                           'ipset'
                           ]

spec/acceptance/onetemplate_spec.rb

@@ -6,43 +6,30 @@
     class { 'one':
       oned => true,
     }
-    onetemplate { 'test-vm':
+    onetemplate { 'test-template':
       ensure => absent,
     }
     EOS
     apply_manifest(pp, :catch_failures => true)
     apply_manifest(pp, :catch_changes => true)
   end
 
-  describe 'when creating a template with deprecated properties' do
+  after :all do
+    pp =<<-EOS
+    onetemplate { 'test-template':
+      ensure => absent,
+    }
+    EOS
+    apply_manifest(pp, :catch_failures => true)
+    apply_manifest(pp, :catch_changes => true)
+  end
+
+  describe 'when creating a template with default properties' do
     it 'should idempotently run' do
-      skip
       pp = <<-EOS
-        onetemplate { 'test-vm':
-          # Capacity
+        onetemplate { 'test-template':
           cpu    => 1,
           memory => 128,
-
-          # OS
-          os_kernel     => '/vmlinuz',
-          os_initrd     => '/initrd.img',
-          os_root       => 'sda1',
-          os_kernel_cmd => 'ro xencons=tty console=tty1',
-
-          # Features
-          acpi        => true,
-          pae         => true,
-
-          # Disks
-          disks  => [ 'Data', 'Experiments', ],
-
-          # Network
-          nics   => [ 'Blue', 'Red', ],
-
-          # I/O Devices
-          graphics_type   => 'vnc',
-          graphics_listen => '0.0.0.0',
-          graphics_port   => 5,
         }
       EOS
 
@@ -51,24 +38,11 @@ class { 'one':
     end
   end
 
-  describe 'when destroying a template' do
-    it 'should idempotently run' do
-      pp =<<-EOS
-      onetemplate { 'test-vm':
-        ensure => absent,
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-  end
-
-  describe 'when creating a template' do
+  describe 'when creating a template with custom properties' do
     it 'should idempotently run' do
       skip
       pp = <<-EOS
-        onetemplate { 'test-vm':
+        onetemplate { 'test-template':
           # Capacity
           cpu    => 1,
           memory => 128,
@@ -118,7 +92,7 @@ class { 'one':
   describe 'when destroying a template' do
     it 'should idempotently run' do
       pp =<<-EOS
-      onetemplate { 'test-vm':
+      onetemplate { 'test-template':
         ensure => absent,
       }
       EOS

spec/classes/opennebula_spec.rb

@@ -60,7 +60,7 @@
             elsif f[:osfamily] == 'Debian'
               it { should contain_package('opennebula-node') }
             end
-            it { should contain_package('sudo') }
+
             if f[:osfamily] == 'RedHat' and f[:operatingsystemmajrelease].to_i < 7
               it { should contain_package('python-virtinst') }
             elsif f[:osfamily] == 'Debian'