Skip to content

Commit

Permalink
Merge pull request #180 from tbeckham/euca-4.2
Browse files Browse the repository at this point in the history
Perform a few tasks on NC's such as install eucanetd only if EDGE mode
  • Loading branch information
viglesiasce committed May 20, 2015
2 parents 00076d6 + 9bbdbbb commit b77c307
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions recipes/node-controller.rb
Expand Up @@ -30,19 +30,21 @@
include_recipe "eucalyptus::install-source"
end

# make sure libvirt is started
# when we want to delete its networks
service 'libvirtd' do
action [ :enable, :start ]
end
# Remove default virsh network which runs its own dhcp server
execute 'virsh net-destroy default' do
ignore_failure true
end
execute 'virsh net-autostart default --disable' do
ignore_failure true
if node["eucalyptus"]["network"]["mode"] == "EDGE"
# make sure libvirt is started
# when we want to delete its networks
service 'libvirtd' do
action [ :enable, :start ]
end
# Remove default virsh network which runs its own dhcp server
execute 'virsh net-destroy default' do
ignore_failure true
end
execute 'virsh net-autostart default --disable' do
ignore_failure true
end
include_recipe "eucalyptus::eucanetd"
end
include_recipe "eucalyptus::eucanetd"

## Setup Bridge
template "/etc/sysconfig/network-scripts/ifcfg-" + node["eucalyptus"]["network"]["bridged-nic"] do
Expand Down

0 comments on commit b77c307

Please sign in to comment.