Merge pull request #126 from tuxmea/types_providers_4_10

rwaffen · rwaffen · commit fb6454da8f7a · 2015-02-05T10:35:59.000+01:00
Types providers 4 10
diff --git a/lib/puppet/provider/onecluster/cli.rb b/lib/puppet/provider/onecluster/cli.rb
@@ -8,7 +8,7 @@
 #
 # Copyright
 # initial provider had no copyright
-# Deutsche Post E-POST Development GmbH - 2014
+# Deutsche Post E-POST Development GmbH - 2014,2015
 #
 
 require 'rexml/document'
@@ -73,7 +73,8 @@ def exists?
 
 
   def self.instances
-    REXML::Document.new(onecluster('list', '-x')).elements.collect("CLUSTER_POOL/CLUSTER") do |cluster|
+    clusters = REXML::Document.new(onecluster('list', '-x')).elements.collect("CLUSTER_POOL/CLUSTER")
+    clusters.collect do |cluster|
       datastores = cluster.elements.collect("DATASTORES/ID") do |id|
         REXML::Document.new(onedatastore('show', id.text, '-x')).elements["DATASTORE/NAME"].text
       end
diff --git a/lib/puppet/provider/onedatastore/cli.rb b/lib/puppet/provider/onedatastore/cli.rb
@@ -8,9 +8,10 @@
 #
 # Copyright
 # initial provider had no copyright
-# Deutsche Post E-POST Development GmbH - 2014
+# Deutsche Post E-POST Development GmbH - 2014, 2015
 #
 
+require 'rubygems'
 require 'nokogiri'
 
 Puppet::Type.type(:onedatastore).provide(:cli) do
@@ -55,7 +56,8 @@ def exists?
   end
 
   def self.instances
-      Nokogiri::XML(onedatastore('list','-x')).root.xpath('/DATASTORE_POOL/DATASTORE').map do |datastore|
+      datastores = Nokogiri::XML(onedatastore('list','-x')).root.xpath('/DATASTORE_POOL/DATASTORE').map
+      datastores.collect do |datastore|
         new(
             :name      => datastore.xpath('./NAME').text,
             :ensure    => :present,
diff --git a/lib/puppet/provider/onehost/cli.rb b/lib/puppet/provider/onehost/cli.rb
@@ -1,3 +1,17 @@
+# OpenNebula Puppet provider for onehost
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
+
+require 'rubygems'
 require 'nokogiri'
 
 Puppet::Type.type(:onehost).provide(:cli) do
@@ -24,7 +38,8 @@ def exists?
   end
 
   def self.instances
-     Nokogiri::XML(onehost('list','-x')).root.xpath('/HOST_POOL/HOST') do | host|
+     hosts = Nokogiri::XML(onehost('list','-x')).root.xpath('/HOST_POOL/HOST')
+     hosts.collect do |host|
        new(
            :name   => host.xpath('./NAME').text,
            :ensure => :present,
diff --git a/lib/puppet/provider/oneimage/cli.rb b/lib/puppet/provider/oneimage/cli.rb
@@ -1,3 +1,17 @@
+# OpenNebula Puppet provider for oneimage
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
+
+require 'rubygems'
 require 'nokogiri'
 
 Puppet::Type.type(:oneimage).provide(:cli) do
@@ -67,7 +81,8 @@ def exists?
 
   # Return the full hash of all existing oneimage resources
   def self.instances
-    Nokogiri::XML(oneimage('list','-x')).root.xpath('/IMAGE_POOL/IMAGE').map do |image|
+    images = Nokogiri::XML(oneimage('list','-x')).root.xpath('/IMAGE_POOL/IMAGE').map
+    images.collect do |image|
         new(
             :name        => image.xpath('./NAME').text,
             :ensure      => :present,
diff --git a/lib/puppet/provider/onetemplate/cli.rb b/lib/puppet/provider/onetemplate/cli.rb
@@ -1,3 +1,17 @@
+# OpenNebula Puppet provider for onetemplate
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
+
+require 'rubygems'
 require 'nokogiri'
 
 Puppet::Type.type(:onetemplate).provide(:cli) do
@@ -75,7 +89,8 @@ def exists?
 
   # Return the full hash of all existing onevm resources
   def self.instances
-      Nokogiri::XML(onetemplate('list', '-x')).root.xpath('/VMTEMPLATE_POOL/VMTEMPLATE') do | template|
+      templates = Nokogiri::XML(onetemplate('list', '-x')).root.xpath('/VMTEMPLATE_POOL/VMTEMPLATE')
+      templates.collect do |template|
         new(
             :name     => template.xpath('./NAME').text,
             :ensure   => :present,
diff --git a/lib/puppet/provider/onevm/cli.rb b/lib/puppet/provider/onevm/cli.rb
@@ -1,4 +1,18 @@
-require 'rexml/document'
+# OpenNebula Puppet provider for onevm
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
+
+require 'rubygems'
+require 'nokogiri'
 require 'tempfile'
 require 'erb'
 
@@ -33,7 +47,8 @@ def exists?
 
   # Return the full hash of all existing onevm resources
   def self.instances
-    Nokogiri::XML(omevm('list','-x')).root.xpath('/VM_POOL/VM') do |vm|
+    vms = Nokogiri::XML(omevm('list','-x')).root.xpath('/VM_POOL/VM')
+    vms.collect do |vm|
         new(
             :name    => vm.xpath('./NAME').text,
             :ensure  => :present,
diff --git a/lib/puppet/provider/onevnet/cli.rb b/lib/puppet/provider/onevnet/cli.rb
@@ -8,13 +8,10 @@
 #
 # Copyright
 # initial provider had no copyright
-# Deutsche Post E-POST Development GmbH - 2014
+# Deutsche Post E-POST Development GmbH - 2014, 2015
 #
 
-# require section:
-# we read onevnet structure by using xml
-# we write tempfiles as erb templates for creating resources and setting properties
-#
+require 'rubygems'
 require 'nokogiri'
 
 Puppet::Type.type(:onevnet).provide(:cli) do
@@ -104,7 +101,8 @@ def exists?
 
   # Return the full hash of all existing onevnet resources
   def self.instances
-      Nokogiri::XML(onevnet('list','-x')).root.xpath('/VNET_POOL/VNET').map do |vnet|
+      vnets = Nokogiri::XML(onevnet('list','-x')).root.xpath('/VNET_POOL/VNET').map
+      vnets.collect do |vnet|
           hash = {
               :name         => vnet.xpath('./NAME').text,
               :ensure       => :present,
diff --git a/lib/puppet/type/onecluster.rb b/lib/puppet/type/onecluster.rb
@@ -1,3 +1,16 @@
+# OpenNebula Puppet type for onecluster
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
+
 Puppet::Type.newtype(:onecluster) do
   @doc = "Type for managing clusters in OpenNebula using the onecluster" +
          "wrapper command."
diff --git a/lib/puppet/type/onedatastore.rb b/lib/puppet/type/onedatastore.rb
@@ -1,3 +1,15 @@
+# OpenNebula Puppet type for onedatastore
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
 Puppet::Type.newtype(:onedatastore) do
   @doc = "Type for managing datastores in OpenNebula using the onedatastore" +
          "wrapper command."
diff --git a/lib/puppet/type/onehost.rb b/lib/puppet/type/onehost.rb
@@ -1,3 +1,15 @@
+# OpenNebula Puppet type for onehost
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
 Puppet::Type.newtype(:onehost) do
   @doc = <<-EOS
 Type for managing hypervisor hosts in OpenNebula using the onehost wrapper
@@ -22,7 +34,7 @@
   newproperty(:vm_mad) do
     desc "Virtualization Driver"
     defaultto :dummy
-    newvalues(:kvm, :xen, :vmware, :ec2, :dummy)
+    newvalues(:kvm, :xen, :vmware, :ec2, :dummy, :qemu)
   end
 
   newproperty(:vn_mad) do
diff --git a/lib/puppet/type/oneimage.rb b/lib/puppet/type/oneimage.rb
@@ -1,3 +1,15 @@
+# OpenNebula Puppet type for oneimage
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
 Puppet::Type.newtype(:oneimage) do
   @doc = "Type for managing Images, Files and Kernels in OpenNebula using the oneimage " +
          "wrapper command."
diff --git a/lib/puppet/type/onetemplate.rb b/lib/puppet/type/onetemplate.rb
@@ -1,3 +1,15 @@
+# OpenNebula Puppet type for onetemplate
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
 Puppet::Type.newtype(:onetemplate) do
   @doc = "Type for managing templates in OpenNebula using the onevm" +
          "wrapper command."
diff --git a/lib/puppet/type/onevm.rb b/lib/puppet/type/onevm.rb
@@ -1,3 +1,15 @@
+# OpenNebula Puppet type for onevm
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
 Puppet::Type.newtype(:onevm) do
   @doc = "Type for managing virtual machines in OpenNebula using the onevm" +
          "wrapper command."
diff --git a/lib/puppet/type/onevnet.rb b/lib/puppet/type/onevnet.rb
@@ -1,3 +1,15 @@
+# OpenNebula Puppet type for onevnet
+#
+# License: APLv2
+#
+# Authors:
+# Based upon initial work from Ken Barber
+# Modified by Martin Alfke
+#
+# Copyright
+# initial provider had no copyright
+# Deutsche Post E-POST Development GmbH - 2014, 2015
+#
 #require 'IPAddress'
 Puppet::Type.newtype(:onevnet) do
   @doc = "Type for managing networks in OpenNebula using the onevnet" +
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -29,6 +29,7 @@
 #   - vmware
 #   - ec2
 #   - dummy
+#   - qemu
 #
 # $ntype - default 802.1Q
 #  set network type for opennebula compute node
@@ -72,6 +73,9 @@
 # $puppetdb true|false - default false
 #   defines to use puppetDB to discover peer nodes
 #
+# $debug_level - default 0
+#   defines the debug level under which oned and sunstone are running
+#
 # === Usage
 #
 # install compute node
@@ -113,10 +117,11 @@
             $backend            = 'sqlite',
             $ha_setup           = false,
             $puppetdb           = false,
+            $debug_level        = '0',
             ) {
   include one::params
   if ($oned) {
-    if ( member(['kvm','xen3','xen4','vmware','ec2'], $vtype) ) {
+    if ( member(['kvm','xen3','xen4','vmware','ec2', 'qemu'], $vtype) ) {
       if ( member(['802.1Q','ebtables','firewall','ovswitch'], $ntype) ) {
         include one::oned
       } else {
diff --git a/manifests/oned/config.pp b/manifests/oned/config.pp
@@ -33,7 +33,8 @@
   $backup_db_password   = $one::params::backup_db_password,
   $backup_db_host       = $one::params::backup_db_host,
   $backup_intervall     = $one::params::backup_intervall,
-  $backup_keep          = $one::params::backup_keep
+  $backup_keep          = $one::params::backup_keep,
+  $debug_level          = $one::debug_level,
   ) {
 
   File {
diff --git a/manifests/oned/service.pp b/manifests/oned/service.pp
@@ -17,10 +17,17 @@
 # http://www.apache.org/licenses/LICENSE-2.0.html
 #
 class one::oned::service {
+  if ($one::ha_setup) {
+    $oned_enable = false
+    $oned_ensure = undef
+  } else {
+    $oned_enable = true
+    $oned_ensure = 'running'
+  }
   service {'opennebula':
-    ensure    => $one::params::oned_ensure,
+    ensure    => $oned_ensure,
     hasstatus => true,
-    enable    => $one::params::oned_enable,
+    enable    => $oned_enable,
     require   => Class['one::oned::install'],
     subscribe => Class['one::oned::config'],
   }
diff --git a/manifests/oned/sunstone/config.pp b/manifests/oned/sunstone/config.pp
@@ -17,7 +17,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0.html
 #
 class one::oned::sunstone::config (
-  $listen_ip = $::ipaddress
+  $listen_ip = $::one::params::sunstone_listen_ip,
 
 ){
   File {
diff --git a/manifests/params.pp b/manifests/params.pp
diff --git a/spec/support/shared_type_examples_spec.rb b/spec/support/shared_type_examples_spec.rb
diff --git a/templates/oned.conf.erb b/templates/oned.conf.erb
diff --git a/templates/sunstone-server.conf.erb b/templates/sunstone-server.conf.erb
