From 4067561cdea45dd79dda5850cc6eb6213e00c70b Mon Sep 17 00:00:00 2001 From: Daniel Quackenbush Date: Wed, 24 Oct 2018 18:31:45 -0400 Subject: [PATCH] String -> String[1] --- README.md | 1 + REFERENCE.md | 24 ++++++++++++------------ manifests/dotfile.pp | 10 +++++----- manifests/pip.pp | 38 +++++++++++++++++++------------------- 4 files changed, 37 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 4bb1ab8f..a36feb5b 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ from softwarecollections.org, set python::provider to 'rhscl' and python::versio of the collection you want to use (e.g., 'python27', 'python33', or 'rh-python34'). ## Release Notes + See [Changelog](https://github.com/voxpupuli/puppet-python/blob/master/CHANGELOG.md) ## Contributors diff --git a/REFERENCE.md b/REFERENCE.md index 81c49743..ab43887f 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -256,7 +256,7 @@ Default value: 'present' ##### `filename` -Data type: `Any` +Data type: `Stdlib::Filemode` Filename. @@ -264,7 +264,7 @@ Default value: $title ##### `mode` -Data type: `String` +Data type: `String[1]` File mode. @@ -272,7 +272,7 @@ Default value: '0644' ##### `owner` -Data type: `String` +Data type: `String[1]` user owner of dotfile @@ -280,7 +280,7 @@ Default value: 'root' ##### `group` -Data type: `String` +Data type: `String[1]` group owner of dotfile @@ -288,7 +288,7 @@ Default value: 'root' ##### `config` -Data type: `Any` +Data type: `Hash` Config hash. This will be expanded to an ini-file. @@ -539,7 +539,7 @@ must be unique ##### `pkgname` -Data type: `String` +Data type: `String[1]` the name of the package. @@ -547,7 +547,7 @@ Default value: $name ##### `ensure` -Data type: `Variant[Enum[present, absent, latest], String]` +Data type: `Variant[Enum[present, absent, latest], String[1]]` Require pip to be available. @@ -579,7 +579,7 @@ Default value: `false` ##### `owner` -Data type: `String` +Data type: `String[1]` The owner of the virtualenv being manipulated. @@ -587,7 +587,7 @@ Default value: 'root' ##### `group` -Data type: `String` +Data type: `String[1]` The group of the virtualenv being manipulated. @@ -643,7 +643,7 @@ Default value: 1800 ##### `install_args` -Data type: `String` +Data type: `String[1]` Any additional installation arguments that will be supplied when running pip install. @@ -651,7 +651,7 @@ Default value: '' ##### `uninstall_args` -Data type: `String` +Data type: `String[1]` Any additional arguments that will be supplied when running pip uninstall. @@ -659,7 +659,7 @@ Default value: '' ##### `log_dir` -Data type: `String` +Data type: `String[1]` Log directory diff --git a/manifests/dotfile.pp b/manifests/dotfile.pp index fcff6e10..9d6e3923 100644 --- a/manifests/dotfile.pp +++ b/manifests/dotfile.pp @@ -24,11 +24,11 @@ # define python::dotfile ( Enum['absent', 'present'] $ensure = 'present', - $filename = $title, - String $owner = 'root', - String $group = 'root', - String $mode = '0644', - $config = {}, + Stdlib::Filemode $filename = $title, + String[1] $owner = 'root', + String[1] $group = 'root', + String[1] $mode = '0644', + Hash $config = {}, ) { $parent_dir = dirname($filename) diff --git a/manifests/pip.pp b/manifests/pip.pp index 5e983187..6de2671e 100644 --- a/manifests/pip.pp +++ b/manifests/pip.pp @@ -50,25 +50,25 @@ # } # define python::pip ( - String $pkgname = $name, - Variant[Enum[present, absent, latest], String] $ensure = present, - String $virtualenv = 'system', - Enum['pip', 'pip3'] $pip_provider = 'pip', - Variant[Boolean, String] $url = false, - String $owner = 'root', - String $group = 'root', - $umask = undef, - $index = false, - Variant[Boolean, String] $proxy = false, - $egg = false, - Boolean $editable = false, - $environment = [], - $extras = [], - String $install_args = '', - String $uninstall_args = '', - Numeric $timeout = 1800, - String $log_dir = '/tmp', - Array[String] $path = ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'], + String[1] $pkgname = $name, + Variant[Enum[present, absent, latest], String[1]] $ensure = present, + String $virtualenv = 'system', + Enum['pip', 'pip3'] $pip_provider = 'pip', + Variant[Boolean, String] $url = false, + String[1] $owner = 'root', + String[1] $group = 'root', + $umask = undef, + $index = false, + Variant[Boolean, String] $proxy = false, + $egg = false, + Boolean $editable = false, + $environment = [], + $extras = [], + String[1] $install_args = '', + String[1] $uninstall_args = '', + Numeric $timeout = 1800, + String[1] $log_dir = '/tmp', + Array[String] $path = ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'], ) { $python_provider = getparam(Class['python'], 'provider') $python_version = getparam(Class['python'], 'version')