Add option to install from kubic

hashicorp · Apr 3, 2020 · 82614cf · 82614cf
1 parent 42785cb
commit 82614cf
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 19 deletions.
diff --git a/plugins/provisioners/podman/cap/redhat/podman_install.rb b/plugins/provisioners/podman/cap/redhat/podman_install.rb
@@ -3,22 +3,24 @@ module PodmanProvisioner
     module Cap
       module Redhat
         module PodmanInstall
-          def self.podman_install(machine)
-            # Official install instructions for podman
-            # https://podman.io/getting-started/installation.html
-            case machine.guest.capability("flavor")
-            when :rhel_7
-              machine.communicate.tap do |comm|
-                comm.sudo("curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_7/devel:kubic:libcontainers:stable.repo")
-                comm.sudo("yum -q -y install podman")
-              end
-            when :rhel_8
-              machine.communicate.tap do |comm|
-                comm.sudo("dnf -y module disable container-tools")
-                comm.sudo("dnf -y install 'dnf-command(copr)'")
-                comm.sudo("dnf -y copr enable rhcontainerbot/container-selinux")
-                comm.sudo("curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8/devel:kubic:libcontainers:stable.repo")
-                comm.sudo("dnf -y install podman")
+          def self.podman_install(machine, kubic)
+            if kubic
+              # Official install instructions for podman
+              # https://podman.io/getting-started/installation.html
+              case machine.guest.capability("flavor")
+              when :rhel_7
+                machine.communicate.tap do |comm|
+                  comm.sudo("curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_7/devel:kubic:libcontainers:stable.repo")
+                  comm.sudo("yum -q -y install podman")
+                end
+              when :rhel_8
+                machine.communicate.tap do |comm|
+                  comm.sudo("dnf -y module disable container-tools")
+                  comm.sudo("dnf -y install 'dnf-command(copr)'")
+                  comm.sudo("dnf -y copr enable rhcontainerbot/container-selinux")
+                  comm.sudo("curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8/devel:kubic:libcontainers:stable.repo")
+                  comm.sudo("dnf -y install podman")
+                end
               end
             else
               machine.communicate.tap do |comm|

diff --git a/plugins/provisioners/podman/config.rb b/plugins/provisioners/podman/config.rb
@@ -3,6 +3,18 @@
 module VagrantPlugins
   module PodmanProvisioner
     class Config < VagrantPlugins::ContainerProvisioner::Config
+      attr_accessor :kubic
+
+      def initialize
+        super()
+        @kubic = UNSET_VALUE
+      end
+
+      def finalize!
+        super()
+        @kubic = false if @kubic == UNSET_VALUE
+      end
+
       def post_install_provision(name, **options, &block)
         # Abort
         raise PodmanError, :wrong_provisioner if options[:type] == "podman"

diff --git a/plugins/provisioners/podman/installer.rb b/plugins/provisioners/podman/installer.rb
@@ -8,15 +8,15 @@ class Installer < VagrantPlugins::ContainerProvisioner::Installer
       # wrong.
       # @return [Boolean] - false if podman cannot be detected on machine, else
       #                     true if podman installs correctly or is installed
-      def ensure_installed
+      def ensure_installed(kubic)
         if !@machine.guest.capability?(:podman_installed)
           @machine.ui.warn("Podman can not be installed")
           return false
         end
 
         if !@machine.guest.capability(:podman_installed)
           @machine.ui.detail("Podman installing")
-          @machine.guest.capability(:podman_install)
+          @machine.guest.capability(:podman_install, kubic)
         end
 
         if !@machine.guest.capability(:podman_installed)

diff --git a/plugins/provisioners/podman/provisioner.rb b/plugins/provisioners/podman/provisioner.rb
@@ -20,7 +20,8 @@ def initialize(machine, config, installer = nil, client = nil)
 
       def provision
         @logger.info("Checking for Podman installation...")
-        if @installer.ensure_installed
+
+        if @installer.ensure_installed(config.kubic)
           if !config.post_install_provisioner.nil?
             @logger.info("Running post setup provision script...")
             env = {