From ed391d3d9bdcccef3e2de3b0da98e654237d99a5 Mon Sep 17 00:00:00 2001
From: Shiva Prasad Rao <shivrao@cisco.com>
Date: Mon, 1 Jun 2015 13:51:59 -0700
Subject: [PATCH] Duplicate Declaration errors when adding n1k-vsm puppet
 module to controller host group

Changing the class names to avoid duplicate declaration error when adding n1k_vsm
puppet module to controller host group. The conflict is with ovs.pp

Change-Id: I5b49c7b2ec3fbb3a7078bc388c00b42f722f4081
---
 manifests/pkgprep_ovscfg.pp | 4 ++--
 templates/vsm_vm.xml.erb    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/pkgprep_ovscfg.pp b/manifests/pkgprep_ovscfg.pp
index 96253e0..577cd9f 100644
--- a/manifests/pkgprep_ovscfg.pp
+++ b/manifests/pkgprep_ovscfg.pp
@@ -53,13 +53,13 @@ class n1k_vsm::pkgprep_ovscfg
         unless  => '/usr/bin/virsh net-info default | /bin/grep -c \'Autostart: .* no\'',
       }
 
-      package { 'Package_openvswitch':
+      package { 'Package_ovs':
         ensure => installed,
         name   => 'openvswitch',
       }
 
       # bring up OVS and perform interface configuration
-      service { 'Service_openvswitch':
+      service { 'Service_ovs':
         ensure => running,
         name   => 'openvswitch',
         enable => true,
diff --git a/templates/vsm_vm.xml.erb b/templates/vsm_vm.xml.erb
index 9d6c500..82a2a01 100644
--- a/templates/vsm_vm.xml.erb
+++ b/templates/vsm_vm.xml.erb
@@ -4,7 +4,7 @@
      <vcpu placement='static'> <%= scope.lookupvar('n1k_vsm::vcpu') %></vcpu>
 
      <os>
-          <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type> 
+          <type arch='x86_64' machine='pc-i440fx-rhel7.1.0'>hvm</type> 
           <boot dev='hd'/>
           <boot dev='cdrom'/>
      </os>