x
/
puppet-n1k-vsm
Code Issues Proposed changes

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
This commit is contained in:
Shiva Prasad Rao 2015-06-01 13:51:59 -07:00
parent 2a42723f5a
commit ed391d3d9b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/pkgprep_ovscfg.pp
View File

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

2
templates/vsm_vm.xml.erb
View File

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