Merge pull request #14 from hmeiland/not_if_mount.lustre

run _search_manager without mountpoint specified and find myself if mds
hmeiland · May 25, 2020 · 5a96be9 · 5a96be9
2 parents 5d780c6 + 358269d
commit 5a96be9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/specs/default/chef/site-cookbooks/lustre/recipes/default.rb b/specs/default/chef/site-cookbooks/lustre/recipes/default.rb
@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+include_recipe '::_search_manager'
 node.override['cyclecloud']['maintenance_converge']['enabled'] = false
 
 yum_repository 'lustre' do

diff --git a/specs/default/chef/site-cookbooks/lustre/recipes/oss.rb b/specs/default/chef/site-cookbooks/lustre/recipes/oss.rb
@@ -5,12 +5,13 @@
 #%w{lustre kmod-lustre-osd-ldiskfs lustre-dkms lustre-osd-ldiskfs-mount lustre-resource-agents e2fsprogs lustre-tests}.each { |p| package p }
 package %w(lustre kmod-lustre-osd-ldiskfs lustre-osd-ldiskfs-mount lustre-resource-agents e2fsprogs lustre-tests)
 
-manager_ipaddress = node["lustre"]["manager_ipaddress"]
 
 if node["recipes"].include? "lustre::mds"
   ost_index = (0).to_s
+  manager_ipaddress = node["ipaddress"]
 else
   ost_index = (node[:azure][:metadata][:compute][:name].split('_')[1].to_i + 1).to_s
+  manager_ipaddress = node["lustre"]["manager_ipaddress"]
 end
 
 if File.read('/etc/mtab').lines.grep(/ lustre /)[0]