rename virtual_host to hypervisor

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

3 files changed, 11 insertions, 11 deletions

diff --git a/chef-utils/README.md b/chef-utils/README.md
index 976634cb69..668739c9c1 100644
--- a/chef-utils/README.md
+++ b/chef-utils/README.md
@@ -148,8 +148,8 @@ Architecture Helpers allow you to determine the processor architecture of your n
 * `openvz?` - if the node is an openvz guest
 * `openvz_host?` - if the node is an openvz host
 * `guest?` - if the node is detected as any kind of guest
-* `virtual_host?` - if the node is detected as being any kind of virtual host
-* `physical?` - strictly the logical opposite of `guest?`
+* `hypervisor?` - if the node is detected as being any kind of hypervisor
+* `physical?` - the node is not running as a guest (may be a hypervisor or may be plain metal)
 * `vagrant?` - attempts to identify the node as a vagrant guest (this check may be error prone)
 
 ### Train Helpers
diff --git a/chef-utils/lib/chef-utils/dsl/virtualization.rb b/chef-utils/lib/chef-utils/dsl/virtualization.rb
index f84ee37044..df3a1ac3eb 100644
--- a/chef-utils/lib/chef-utils/dsl/virtualization.rb
+++ b/chef-utils/lib/chef-utils/dsl/virtualization.rb
@@ -160,17 +160,17 @@ module ChefUtils
 
       alias_method :virtual?, :guest?
 
-      # Determine if the current node is running under any virutalization environment
+      # Determine if the current node supports running guests under any virtualization environment
       #
       # @param [Chef::Node] node
       #
       # @return [Boolean]
       #
-      def virtual_host?(node = __getnode)
+      def hypervisor?(node = __getnode)
         node.dig("virtualization", "role") == "host"
       end
 
-      # Determine if the current node is NOT running under any virutalization environment (virtual hosts or just plain on metal)
+      # Determine if the current node is NOT running under any virtualization environment (plain metal or hypervisor on metal)
       #
       # @param [Chef::Node] node
       #
diff --git a/chef-utils/spec/unit/dsl/virtualization_spec.rb b/chef-utils/spec/unit/dsl/virtualization_spec.rb
index 5b8f7d86ad..84daa9e162 100644
--- a/chef-utils/spec/unit/dsl/virtualization_spec.rb
+++ b/chef-utils/spec/unit/dsl/virtualization_spec.rb
@@ -46,27 +46,27 @@ RSpec.describe ChefUtils::DSL::Virtualization do
 
   context "on kvm" do
     virtualization_reports_true_for(:guest?, :virtual?, :kvm?, node: { "virtualization" => { "system" => "kvm",  "role" => "guest" } })
-    virtualization_reports_true_for(:virtual_host?, :physical?, :kvm_host?, node: { "virtualization" => { "system" => "kvm", "role" => "host" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :kvm_host?, node: { "virtualization" => { "system" => "kvm", "role" => "host" } })
   end
   context "on lxc" do
     virtualization_reports_true_for(:guest?, :virtual?, :lxc?, node: { "virtualization" => { "system" => "lxc", "role" => "guest" } })
-    virtualization_reports_true_for(:virtual_host?, :physical?, :lxc_host?, node: { "virtualization" => { "system" => "lxc", "role" => "host" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :lxc_host?, node: { "virtualization" => { "system" => "lxc", "role" => "host" } })
   end
   context "on parallels" do
     virtualization_reports_true_for(:guest?, :virtual?, :parallels?, node: { "virtualization" => { "system" => "parallels", "role" => "guest" } })
-    virtualization_reports_true_for(:virtual_host?, :physical?, :parallels_host?, node: { "virtualization" => { "system" => "parallels", "role" => "host" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :parallels_host?, node: { "virtualization" => { "system" => "parallels", "role" => "host" } })
   end
   context "on virtualbox" do
     virtualization_reports_true_for(:guest?, :virtual?, :virtualbox?, :vbox?, node: { "virtualization" => { "system" => "vbox", "role" => "guest" } })
-    virtualization_reports_true_for(:virtual_host?, :physical?, :vbox_host?, node: { "virtualization" => { "system" => "vbox", "role" => "host" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :vbox_host?, node: { "virtualization" => { "system" => "vbox", "role" => "host" } })
   end
   context "on vmware" do
     virtualization_reports_true_for(:guest?, :virtual?, :vmware?, node: { "virtualization" => { "system" => "vmware", "role" => "guest" } })
-    virtualization_reports_true_for(:virtual_host?, :physical?, :vmware_host?, node: { "virtualization" => { "system" => "vmware", "role" => "host" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :vmware_host?, node: { "virtualization" => { "system" => "vmware", "role" => "host" } })
   end
   context "on openvz" do
     virtualization_reports_true_for(:guest?, :virtual?, :openvz?, node: { "virtualization" => { "system" => "openvz", "role" => "guest" } })
-    virtualization_reports_true_for(:virtual_host?, :physical?, :openvz_host?, node: { "virtualization" => { "system" => "openvz", "role" => "host" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :openvz_host?, node: { "virtualization" => { "system" => "openvz", "role" => "host" } })
   end
   context "on metal which is not a virt host" do
     virtualization_reports_true_for(:physical?, node: {} )