Merge pull request #605 from puppetlabs/release

Release Mergeback v.3.10.0

Author: carabasdaniel

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v3.10.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v3.10.0) (2020-04-23)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v3.9.1...v3.10.0)
+
+### Added
+
+- \[IAC-291\] Convert acceptance tests to Litmus [\#585](https://github.com/puppetlabs/puppetlabs-docker/pull/585) ([carabasdaniel](https://github.com/carabasdaniel))
+- Updated: Add Docker service \(create, remote, scale\) tasks [\#582](https://github.com/puppetlabs/puppetlabs-docker/pull/582) ([Flask](https://github.com/Flask))
+- Add after\_start and after\_stop options to docker::run define [\#580](https://github.com/puppetlabs/puppetlabs-docker/pull/580) ([jantman](https://github.com/jantman))
+- Make docker::machine::url configurable [\#569](https://github.com/puppetlabs/puppetlabs-docker/pull/569) ([baurmatt](https://github.com/baurmatt))
+- Let docker.service start docker services managed by puppetlabs/docker… [\#563](https://github.com/puppetlabs/puppetlabs-docker/pull/563) ([jhejl](https://github.com/jhejl))
+- Allow bypassing curl package ensure if needed [\#477](https://github.com/puppetlabs/puppetlabs-docker/pull/477) ([esalberg](https://github.com/esalberg))
+
+### Fixed
+
+- Enforce TLS1.2 on Windows; minor fixes for RH-based testing [\#603](https://github.com/puppetlabs/puppetlabs-docker/pull/603) ([carabasdaniel](https://github.com/carabasdaniel))
+- \[MODULES-10628\] Update documentation for docker volume and set options as parameter [\#599](https://github.com/puppetlabs/puppetlabs-docker/pull/599) ([carabasdaniel](https://github.com/carabasdaniel))
+- Allow module to work on SLES [\#591](https://github.com/puppetlabs/puppetlabs-docker/pull/591) ([npwalker](https://github.com/npwalker))
+- \(maint\) Fix missing stubs in docker\_spec.rb [\#589](https://github.com/puppetlabs/puppetlabs-docker/pull/589) ([Filipovici-Andrei](https://github.com/Filipovici-Andrei))
+- Add Hiera lookups for resources in init.pp [\#586](https://github.com/puppetlabs/puppetlabs-docker/pull/586) ([fe80](https://github.com/fe80))
+- Use standardized quote type to help tests pass [\#566](https://github.com/puppetlabs/puppetlabs-docker/pull/566) ([DLeich](https://github.com/DLeich))
+- Minimal changes to work with podman-docker [\#562](https://github.com/puppetlabs/puppetlabs-docker/pull/562) ([seriv](https://github.com/seriv))
+
 ## [v3.9.1](https://github.com/puppetlabs/puppetlabs-docker/tree/v3.9.1) (2020-01-17)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v3.9.0...v3.9.1)

REFERENCE.md

@@ -6,7 +6,7 @@
 **Classes**
 
 * [`docker`](#docker): 
-* [`docker::compose`](#dockercompose): 
+* [`docker::compose`](#dockercompose): [*curl_ensure*]   Whether or not the curl package is ensured by this module.   Defaults to true
 * [`docker::config`](#dockerconfig): == Class: docker::config
 * [`docker::images`](#dockerimages): docker::images
 * [`docker::install`](#dockerinstall): 
@@ -62,14 +62,15 @@
 * [`node_ls`](#node_ls): List nodes in the swarm
 * [`node_rm`](#node_rm): Update a node
 * [`node_update`](#node_update): Update a node
-* [`service_create`](#service_create): Create one service
-* [`service_rm`](#service_rm): Removes an existing service.
+* [`service_create`](#service_create): Create a new Docker service
+* [`service_rm`](#service_rm): Remove one replicated service
 * [`service_scale`](#service_scale): Scale one replicated service
 * [`service_update`](#service_update): Updates an existing service.
 * [`swarm_init`](#swarm_init): Initializes a swarm
 * [`swarm_join`](#swarm_join): Join a swarm
 * [`swarm_leave`](#swarm_leave): Leave a swarm
 * [`swarm_token`](#swarm_token): Gets the swarm token from the master
+* [`swarm_update`](#swarm_update): Updates an existing service.
 
 ## Classes
 
@@ -1019,7 +1020,9 @@ Default value: $docker::params::nuget_package_provider_version
 
 ### docker::compose
 
-The docker::compose class.
+[*curl_ensure*]
+  Whether or not the curl package is ensured by this module.
+  Defaults to true
 
 #### Parameters
 
@@ -1081,6 +1084,14 @@ Data type: `Optional[String]`
 
 Default value: `undef`
 
+##### `curl_ensure`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: $docker::params::curl_ensure
+
 ### docker::config
 
 == Class: docker::config
@@ -1179,6 +1190,14 @@ Class to install Docker Machine using the recommended curl command.
 [*proxy*]
   Proxy to use for downloading Docker Machine.
 
+[*url*]
+  The URL from which the docker machine binary should be fetched
+  Defaults to a auto determined value based on version, kernel and OS.
+
+[*curl_ensure*]
+  Whether or not the curl package is ensured by this module.
+  Defaults to true
+
 #### Parameters
 
 The following parameters are available in the `docker::machine` class.
@@ -1215,6 +1234,22 @@ Data type: `Optional[String]`
 
 Default value: `undef`
 
+##### `url`
+
+Data type: `Optional[Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl]]`
+
+
+
+Default value: `undef`
+
+##### `curl_ensure`
+
+Data type: `Optional[Boolean]`
+
+
+
+Default value: $docker::params::curl_ensure
+
 ### docker::networks
 
 docker::networks
@@ -2836,7 +2871,7 @@ Data type: `Variant[String,Array,Undef]`
 
 
 
-Default value: []
+Default value: ['docker.service']
 
 ##### `tty`
 
@@ -2884,6 +2919,22 @@ Data type: `Variant[String,Boolean]`
 
 
 
+Default value: `false`
+
+##### `after_start`
+
+Data type: `Variant[String,Boolean]`
+
+
+
+Default value: `false`
+
+##### `after_stop`
+
+Data type: `Variant[String,Boolean]`
+
+
+
 Default value: `false`
 
 ##### `after_create`
@@ -3590,10 +3641,6 @@ Default value: present
 
 The volume driver used by the volume
 
-##### `options`
-
-Additional options for the volume driver
-
 ##### `mountpoint`
 
 The location that the volume is mounted to
@@ -3608,6 +3655,10 @@ namevar
 
 The name of the volume
 
+##### `options`
+
+Additional options for the volume driver
+
 ## Functions
 
 ### docker::sanitised_name
@@ -3824,11 +3875,93 @@ Data type: `Optional[Enum['manager', 'worker']]`
 
 Role of the node
 
+##### `label_add`
+
+Data type: `Optional[Array]`
+
+Add or update a node label (key=value)
+
+##### `label_rm`
+
+Data type: `Optional[Array]`
+
+Remove a node label if exists.
+
 ##### `node`
 
 Data type: `String[1]`
 
-Hostname or ID of the node in the swarm
+ID of the node in the swarm
+
+### service_create
+
+Create a new Docker service
+
+**Supports noop?** false
+
+#### Parameters
+
+##### `service`
+
+Data type: `String[1]`
+
+The name of the service to create
+
+##### `image`
+
+Data type: `String[1]`
+
+The new image to use for the service
+
+##### `replicas`
+
+Data type: `Integer`
+
+Number of replicas
+
+##### `expose`
+
+Data type: `Variant[String,Array,Undef]`
+
+Publish service ports externally to the swarm
+
+##### `env`
+
+Data type: `Optional[Hash]`
+
+Set environment variables
+
+##### `command`
+
+Data type: `Variant[String,Array,Undef]`
+
+Command to run on the container
+
+##### `extra_params`
+
+Data type: `Optional[Array]`
+
+Allows you to pass any other flag that the Docker service create supports.
+
+##### `detach`
+
+Data type: `Optional[Boolean]`
+
+Exit immediately instead of waiting for the service to converge
+
+### service_rm
+
+Remove one replicated service
+
+**Supports noop?** false
+
+#### Parameters
+
+##### `service`
+
+Data type: `String[1]`
+
+Name or ID of the service
 
 ### service_scale
 
@@ -3850,12 +3983,44 @@ Data type: `Integer`
 
 Number of replicas
 
-##### `detatch`
+##### `detach`
 
 Data type: `Optional[Boolean]`
 
 Exit immediately instead of waiting for the service to converge
 
+### service_update
+
+Updates an existing service.
+
+**Supports noop?** false
+
+#### Parameters
+
+##### `service`
+
+Data type: `String[1]`
+
+The service to update
+
+##### `image`
+
+Data type: `String[1]`
+
+The new image to use for the service
+
+##### `constraint_add`
+
+Data type: `Optional[Array]`
+
+Add or update a service constraint (selector==value, selector!=value)
+
+##### `constraint_rm`
+
+Data type: `Optional[Array]`
+
+Remove a service constraint if exists.
+
 ### swarm_init
 
 Initializes a swarm

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-docker",
-  "version": "3.9.1",
+  "version": "3.10.0",
   "author": "puppetlabs",
   "summary": "Module for installing and managing docker",
   "license": "Apache-2.0",