Fix broken dep between fb_systemd and fb_networkd (facebook#258)

jaymzh · facebook-github-bot · commit ac723c51aa14 · 2025-02-07T09:24:22.000-08:00
Differential Revision: D69275131

fbshipit-source-id: 0cb03d101d64e6fa272890b32e306c84c1749ac6
diff --git a/cookbooks/fb_init_sample/recipes/default.rb b/cookbooks/fb_init_sample/recipes/default.rb
@@ -79,7 +79,9 @@
 include_recipe 'fb_hostconf'
 include_recipe 'fb_sysctl'
 # HERE: networking
-include_recipe 'fb_users'
+# until we defined a UID_MAP that works with testing, this can't
+# run in kitchen tests
+# include_recipe 'fb_users'
 if node.centos?
   # We turn this off because the override causes intermittent failures in
   # Travis when rsyslog is restarted
diff --git a/cookbooks/fb_systemd/recipes/networkd.rb b/cookbooks/fb_systemd/recipes/networkd.rb
@@ -19,7 +19,7 @@
 #
 
 fb_helpers_gated_template '/etc/systemd/networkd.conf' do
-  only_if { node['fb_systemd']['networkd']['enable'] }
+  only_if { defined?(FB::Networkd) && node['fb_systemd']['networkd']['enable'] }
   allow_changes node.nw_changes_allowed?
   source 'systemd.conf.erb'
   owner node.root_user

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#`
`20`	`20`
`21`	`21`	`fb_helpers_gated_template '/etc/systemd/networkd.conf' do`
`22`		`- only_if { node['fb_systemd']['networkd']['enable'] }`
	`22`	`+ only_if { defined?(FB::Networkd) && node['fb_systemd']['networkd']['enable'] }`
`23`	`23`	`allow_changes node.nw_changes_allowed?`
`24`	`24`	`source 'systemd.conf.erb'`
`25`	`25`	`owner node.root_user`