Skip to content

Commit

Permalink
Removing yocto references from cookbooks
Browse files Browse the repository at this point in the history
Summary:

We no longer need yocto support in chef, so let's clean it up and remove it
from our cookbooks.

Reviewed By: zfjagann, davide125

Differential Revision: D7358053

fbshipit-source-id: a8407b2656655312cc2ad8ff16f4f67e35b11b47
  • Loading branch information
NaomiReeves authored and facebook-github-bot committed Mar 21, 2018
1 parent 1e39895 commit 7e6dd82
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 19 deletions.
1 change: 0 additions & 1 deletion cookbooks/fb_cron/metadata.rb
Expand Up @@ -14,5 +14,4 @@
supports 'redhat'
supports 'suse'
supports 'ubuntu'
supports 'yocto'
depends 'fb_helpers'
5 changes: 0 additions & 5 deletions cookbooks/fb_cron/recipes/default.rb
Expand Up @@ -23,11 +23,6 @@
package_name = 'cronie'
end
svc_name = 'crond'
when 'yocto'
# We may need to customize this in the future if we have some yocto images
# that use cronie and others that use crond.
package_name = 'cronie'
svc_name = 'crond'
end

if package_name # ~FC023
Expand Down
9 changes: 3 additions & 6 deletions cookbooks/fb_helpers/README.md
Expand Up @@ -41,16 +41,13 @@ your node.
* `node.windows?`
Is Windows

* `node.yocto?`
Is a Yocto platform

* `node.aristaeos?`
Is network switch running Arista EOS

* `node.embedded?`
Is embedded Linux, implies 'node.aristaeos? or node.yocto?'. These
devices likely have minimal packages installed, little space, and/or some
non-persistent filesystems.
Is embedded Linux, implies 'node.aristaeos?'. These devices likely have
minimal packages installed, little space, and/or some non-persistent
filesystems.

* `node.systemd?`
True if the node uses systemd as their init system.
Expand Down
6 changes: 1 addition & 5 deletions cookbooks/fb_helpers/libraries/node_methods.rb
Expand Up @@ -47,16 +47,12 @@ def windows?
return self['os'] == 'windows'
end

def yocto?
return self['platform_family'] == 'yocto'
end

def aristaeos?
return self['platform'] == 'arista_eos'
end

def embedded?
return self.yocto? || self.aristaeos?
return self.aristaeos?
end

def systemd?
Expand Down
1 change: 0 additions & 1 deletion cookbooks/fb_logrotate/recipes/default.rb
Expand Up @@ -30,7 +30,6 @@
end

package pkgs do
not_if { node.yocto? }
action :upgrade
end

Expand Down
1 change: 0 additions & 1 deletion cookbooks/fb_syslog/metadata.rb
Expand Up @@ -9,5 +9,4 @@
version '0.0.1'
supports 'centos'
supports 'mac_os_x'
supports 'yocto'
depends 'fb_helpers'

0 comments on commit 7e6dd82

Please sign in to comment.