Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

Run systemd-modules-load on NC; same for source builds #379

Open
wants to merge 2 commits into
base: euca-4.3
Choose a base branch
from
Open

Run systemd-modules-load on NC; same for source builds #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08966ef
Run systemd-modules-load on NC; same for source builds
Dec 13, 2016
202249b
Revert replace echo bridge info to ifcfg-br0 on NC with sed
Jan 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes/eucanetd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
if node["eucalyptus"]["network"]["mode"] != "VPCMIDO"
execute "Configure kernel parameters from 70-eucanetd.conf" do
command "/usr/lib/systemd/systemd-sysctl 70-eucanetd.conf"
notifies :run, "execute[Ensure bridge modules loaded into the kernel on NC]", :before
notifies :run, "execute[Run systemd-modules-load to load modules in 70-eucalyptus-node.conf on NC]", :before
end
end
end
Expand Down
11 changes: 11 additions & 0 deletions recipes/install-source.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,3 +343,14 @@
command 'modprobe kvm_intel'
only_if { ::File.exist? "/usr/lib/udev/rules.d/80-kvm.rules" }
end

if Chef::VersionConstraint.new("~> 7.0").include?(node['platform_version'])
exp_run_list = node['expanded_run_list']
exp_run_list.each do |listitem|
if listitem.include? "node-controller"
execute "Run systemd-modules-load to load modules in 70-eucalyptus-node.conf on NC" do
command '/usr/lib/systemd/systemd-modules-load'
end
end
end
end
9 changes: 5 additions & 4 deletions recipes/node-controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@

## Setup Bridge EDGE mode only
execute "network-restart" do
command "service network restart"
command "systemctl restart network.service"
action :nothing
end

Expand Down Expand Up @@ -166,6 +166,7 @@

# Do not attach bridge to physical NIC in VPCMIDO mode (Issue #314)
if node["eucalyptus"]["network"]["mode"] != "VPCMIDO"

execute "Copy existing interface config to bridge config" do
command "cp #{bridged_nic_file} #{bridge_file}"
not_if "ls #{bridge_file}"
Expand Down Expand Up @@ -196,9 +197,9 @@

## use a different notifier to setup bridge in VPCMIDO mode
if node["eucalyptus"]["network"]["mode"] != "VPCMIDO"
if Chef::VersionConstraint.new("~> 7.3").include?(node['platform_version'])
execute "Ensure bridge modules loaded into the kernel on NC" do
command "modprobe bridge"
if Chef::VersionConstraint.new("~> 7.0").include?(node['platform_version'])
execute "Run systemd-modules-load to load modules in 70-eucalyptus-node.conf on NC" do
command '/usr/lib/systemd/systemd-modules-load'
notifies :run, "execute[network-restart]", :immediately
notifies :run, "execute[brctl setfd]", :delayed
notifies :run, "execute[brctl sethello]", :delayed
Expand Down