Merge pull request #183 from fasrc/fix_oned_peer

replace oned_peer with one_host

Author: rwaffen

lib/puppet/provider/oned_peer.rb

@@ -28,8 +28,9 @@
 class one::compute_node(
   $puppetdb = $one::puppetdb,
   $oneid    = $one::oneid,
-  $vtype    = $one::vtype,
-  $ntype    = $one::ntype,
+  $im_mad   = $one::im_mad,
+  $vm_mad   = $one::vm_mad,
+  $vn_mad   = $one::vn_mad,
 ) {
   include one::prerequisites
   include one::install
@@ -48,11 +49,12 @@
   Class['one::service']
 
   if ($puppetdb == true) {
-    # Register the node in the puppetdb
-    @@one::oned::peer { $::fqdn :
-      tag   => $oneid,
-      vtype => $vtype,
-      ntype => $ntype,
+    # Register the node as a onehost in the puppetdb
+    @@onehost { $::fqdn :
+      tag    => $oneid,
+      im_mad => $im_mad,
+      vm_mad => $vm_mad,
+      vn_mad => $vn_mad,
     }
   }
 }

lib/puppet/type/oned_peer.rb

@@ -22,25 +22,35 @@
 # $node true|false - default true
 #  defines whether the host is node (virtualization host/worker)
 #
-# $vtype - default kvm
+# $im_mad - default kvm
+#  set Information Manager driver for opennebula compute node
+#  supported types:
+#   - kvm
+#   - xen
+#   - vmware
+#   - ec2
+#   - ganglia
+#   - dummy
+#
+# $vm_mad - default kvm
 #  set virtualization type for opennebula compute node
-#  supported vtypes:
+#  supported types:
 #   - kvm
-#   - xen3
-#   - xen4
+#   - xen
 #   - vmware
 #   - ec2
 #   - dummy
 #   - qemu
 #
-# $ntype - default 802.1Q
+# $vn_mad - default 802.1Q
 #  set network type for opennebula compute node
-#  supported tyes
+#  supported types:
 #   - 802.1Q
 #   - ebtables
 #   - firewall
 #   - ovswitch
 #   - vmware
+#   - dummy
 #
 # $oned true|false - default false
 #   defines whether OpenNebula-Daemon should be installed.
@@ -77,7 +87,7 @@
 #   defines whether the oneflow service should be installed
 #
 # $puppetdb true|false - default false
-#   defines to use puppetDB to discover peer nodes
+#   defines to use puppetDB to discover peer nodes (hypervisors)
 #
 # $debug_level - default 0
 #   defines the debug level under which oned and sunstone are running
@@ -321,8 +331,9 @@
 class one (
             $oneid              = 'one-cloud',
             $node               = true,
-            $vtype              = 'kvm',
-            $ntype              = '802.1Q',
+            $im_mad             = 'kvm',
+            $vm_mad             = 'kvm',
+            $vn_mad             = '802.1Q',
             $oned               = false,
             $sunstone           = false,
             $sunstone_passenger = false,
@@ -441,14 +452,18 @@
   Class['one::service']
 
   if ($oned) {
-    if ( member(['kvm','xen3','xen4','vmware','ec2', 'qemu'], $vtype) ) {
-      if ( member(['802.1Q','ebtables','firewall','ovswitch'], $ntype) ) {
-        include one::oned
+    if ( member(['kvm','xen','vmware','ec2', 'ganglia','dummy'], $im_mad) ) {
+      if ( member(['kvm','xen','vmware','ec2', 'qemu', 'dummy'], $vm_mad) ) {
+        if ( member(['802.1Q','ebtables','firewall','ovswitch','vmware','dummy'], $vn_mad) ) {
+          include one::oned
+        } else {
+          fail("Network Type: ${vn_mad} is not supported.")
+        }
       } else {
-        fail("Network Type: ${ntype} is not supported.")
+        fail("Virtualization type: ${vm_mad} is not supported")
       }
     } else {
-      fail("Virtualization type: ${vtype} is not supported")
+      fail("Information Manager type: ${im_mad} is not supported")
     }
   }
   if ($node) {

manifests/compute_node.pp

@@ -62,7 +62,7 @@
 
   if ($puppetdb == true) {
     # Realize all the known nodes
-    One::Oned::Peer <<| tag == $oneid |>> {
+    Onehost <<| tag == $oneid |>> {
       require => Class[one::oned::service],
     }
   }