Allow bypassing curl package ensure if needed

Author: esalberg

README.md

@@ -240,6 +240,14 @@ class { 'docker':
 }
 ```
 
+If the curl package is being managed elsewhere and the curl ensure in this module is conflicting,
+ it can be disabled by setting the following parameter globally or in compose / machine resources:
+```puppet
+class { 'docker':
+  curl_ensure => false
+}
+```
+
 ### Proxy on Windows
 
 To use docker through a proxy on Windows, a System Environment Variable HTTP_PROXY/HTTPS_PROXY must be set. See [Docker Engine on Windows](https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-docker/configure-docker-daemon#proxy-configuration)

manifests/compose.pp

@@ -20,11 +20,16 @@
 # [*proxy*]
 #   Proxy to use for downloading Docker Compose.
 #
+# [*curl_ensure*]
+#   Whether or not the curl package is ensured by this module.
+#
+#
 class docker::compose(
   Optional[Pattern[/^present$|^absent$/]] $ensure          = 'present',
   Optional[String] $version                                = $docker::params::compose_version,
   Optional[String] $install_path                           = $docker::params::compose_install_path,
-  Optional[String] $proxy                                  = undef
+  Optional[String] $proxy                                  = undef,
+  Optional[Boolean] $curl_ensure                           = $docker::curl_ensure,
 ) inherits docker::params {
 
   if $proxy != undef {
@@ -68,7 +73,9 @@
         require => Exec["Install Docker Compose ${version}"]
       }
     } else {
-      ensure_packages(['curl'])
+      if $curl_ensure {
+        ensure_packages(['curl'])
+      }
       exec { "Install Docker Compose ${version}":
         path    => '/usr/bin/',
         cwd     => '/tmp',

manifests/init.pp

@@ -379,6 +379,10 @@
 #   Sets the prefered container registry mirror.
 #   Default: undef
 #
+# [*curl_ensure*]
+#   Whether or not the curl package is ensured by this module.
+#   Default: true
+#
 # [*nuget_package_provider_version*]
 #   The version of the NuGet Package provider
 #   Default: undef
@@ -502,6 +506,7 @@
   Optional[Boolean] $service_hasstatus                      = $docker::params::service_hasstatus,
   Optional[Boolean] $service_hasrestart                     = $docker::params::service_hasrestart,
   Optional[String] $registry_mirror                         = $docker::params::registry_mirror,
+  Optional[Boolean] $curl_ensure                            = $docker::params::curl_ensure,
   # Windows specific parameters
   Optional[String] $docker_msft_provider_version            = $docker::params::docker_msft_provider_version,
   Optional[String] $nuget_package_provider_version          = $docker::params::nuget_package_provider_version,

manifests/machine.pp

@@ -20,11 +20,15 @@
 # [*proxy*]
 #   Proxy to use for downloading Docker Machine.
 #
+# [*curl_ensure*]
+#   Whether or not the curl package is ensured by this module.
+#
 class docker::machine(
   Optional[Pattern[/^present$|^absent$/]] $ensure          = 'present',
   Optional[String] $version                                = $docker::params::machine_version,
   Optional[String] $install_path                           = $docker::params::machine_install_path,
-  Optional[String] $proxy                                  = undef
+  Optional[String] $proxy                                  = undef,
+  Optional[Boolean] $curl_ensure                           = $docker::curl_ensure,
 ) inherits docker::params {
 
   if $proxy != undef {
@@ -68,7 +72,9 @@
         require => Exec["Install Docker Machine ${version}"]
       }
     } else {
-      ensure_packages(['curl'])
+      if $curl_ensure {
+        ensure_packages(['curl'])
+      }
       exec { "Install Docker Machine ${version}":
         path    => '/usr/bin/',
         cwd     => '/tmp',

manifests/params.pp

@@ -107,6 +107,7 @@
   $storage_pool_autoextend_percent   = undef
   $storage_config_template           = 'docker/etc/sysconfig/docker-storage.erb'
   $registry_mirror                   = undef
+  $curl_ensure                       = true
   $os_lc                             = downcase($::operatingsystem)
   $docker_msft_provider_version      = undef
   $nuget_package_provider_version    = undef