Docker provision to support centos guest, not RHEL guest

plugins/provisioners/docker/cap/redhat/docker_install.rb → plugins/provisioners/docker/cap/centos/docker_install.rb

@@ -1,17 +1,9 @@
 module VagrantPlugins
   module DockerProvisioner
     module Cap
-      module Redhat
+      module Centos
         module DockerInstall
           def self.docker_install(machine)
-            flavor = machine.guest.capability("flavor")
-            if flavor.to_s.include? "rhel"
-              # rhel is not supported by docker ce
-              # https://docs.docker.com/ee/docker-ee/rhel/
-              machine.ui.warn(I18n.t("vagrant.provisioners.docker.rhel_not_supported"))
-              raise DockerError, :install_failed
-            end
-
             machine.communicate.tap do |comm|
               comm.sudo("yum -q -y update")
               comm.sudo("yum -q -y remove docker-io* || true")
@@ -21,22 +13,22 @@ def self.docker_install(machine)
               comm.sudo("yum install -y -q docker-ce")
             end
 
-            case flavor
-            when :centos_7
-              docker_enable_centos7(machine)
+            case machine.guest.capability("flavor")
+            when :centos
+              docker_enable_service(machine)
             else
-              docker_enable_default(machine)
+              docker_enable_systemctl(machine)
             end
           end
 
-          def self.docker_enable_centos7(machine)
+          def self.docker_enable_systemctl(machine)
             machine.communicate.tap do |comm|
               comm.sudo("systemctl start docker.service")
               comm.sudo("systemctl enable docker.service")
             end
           end
 
-          def self.docker_enable_default(machine)
+          def self.docker_enable_service(machine)
             machine.communicate.tap do |comm|
               comm.sudo("service docker start")
               comm.sudo("chkconfig docker on")

plugins/provisioners/docker/cap/centos/docker_start_service.rb

@@ -0,0 +1,24 @@
+module VagrantPlugins
+  module DockerProvisioner
+    module Cap
+      module Centos
+        module DockerStartService
+          def self.docker_start_service(machine)
+            case machine.guest.capability("flavor")
+            when :centos
+              machine.communicate.tap do |comm|
+                comm.sudo("service docker start")
+                comm.sudo("chkconfig docker on")
+              end
+            else
+              machine.communicate.tap do |comm|
+                comm.sudo("systemctl start docker.service")
+                comm.sudo("systemctl enable docker.service")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

plugins/provisioners/docker/plugin.rb

@@ -29,14 +29,14 @@ class Plugin < Vagrant.plugin("2")
         Cap::Fedora::DockerInstall
       end
 
-      guest_capability("redhat", "docker_install") do
+      guest_capability("centos", "docker_install") do
         require_relative "cap/redhat/docker_install"
-        Cap::Redhat::DockerInstall
+        Cap::Centos::DockerInstall
       end
 
-      guest_capability("redhat", "docker_start_service") do
+      guest_capability("centos", "docker_start_service") do
         require_relative "cap/redhat/docker_start_service"
-        Cap::Redhat::DockerStartService
+        Cap::Centos::DockerStartService
       end
 
       guest_capability("linux", "docker_installed") do

templates/locales/en.yml

@@ -2821,9 +2821,6 @@ en:
           provisioner
         not_running: "Docker is not running on the guest VM."
         install_failed: "Docker installation failed."
-        rhel_not_supported: |-
-          RHEL is now only supported by Docker EE. Please install Docker EE or
-          switch to the Podman provisioner to run containers on RHEL.
 
       salt:
         minion_config_nonexist: |-