WIP: Add python3 and virtual environment support

.fixtures.yml

@@ -1,5 +1,14 @@
 fixtures:
-  repositories:
-    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+  forge_modules:
+    augeas_core: 'puppetlabs/augeas_core'
+    epel:
+      repo: 'puppet/epel'
+      ref: '3.0.1'
+    python: 'puppet/python'
+    stdlib: 'puppetlabs/stdlib'
+    vcsrepo:
+      repo: 'puppetlabs/vcsrepo'
+      ref: '3.2.1'
+    yumrepo_core: 'puppetlabs/yumrepo_core'
   symlinks:
     "yas3fs": "#{source_dir}"

CHANGELOG.md

@@ -2,10 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
-## Release 0.4.0
+## Release 0.5.0
 
 **Features**
 
+Add python3 and virtual environment support
+
 **Bugfixes**
 
 **Known Issues**
+
+When not using virtual environment, please confirm install  
+location of yas3fs and make symlink from /usr/local/bin/yas3fs  
+if not created in /usr/local/bin

README.md

@@ -32,71 +32,41 @@ invalidating caches on other nodes using SQS and SNS.
 
 * fuse package and configuration
 * init jobs (sysvinit, upstart or systemd) that are used to manage yas3fs mounts
-* python-pip package (optional)
+* python package
 
 ###Beginning with yas3fs
 
-To install fuse, python-pip, and yas3fs
-```puppet
-class { 'yas3fs': }
-```
-To install fuse, python-pip, and yas3fs from github source
-```puppet
-class { 'yas3fs':
-  provider: 'vcs',
-}
-```
-
-If you'd rather provide pip though some other means, set
-`install_pip_package` to `false`:
+To install fuse and yas3fs from github source
 ```puppet
 class { 'yas3fs':
-  install_pip_package => false,
 }
 ```
-
 ##Usage
 
 ###Classes and Defined Types
 
 ####Class: `yas3fs`
 
-The primary module. By default, fuse, python-pip, and yas3fs are installed and
+The primary module. By default, fuse, and yas3fs are installed and
 configured.
 
 **Parameters within `yas3fs`**
 
-#####`install_pip_package`
-
-When set to true, the python-pip package is installed. If the parameter is false
-then the pip command should be provided by some other means or yas3fs will not
-be installed.
-
 #####`init_system`
 
 Defines the type of init script/configuration to install out of `upstart`,
 `systemd` or `sysvinit`. If the parameter is unset, autodiscovery takes place.
+Default: $facts['service_provider']
 
-#####`provider`
+#####`manage_python`
 
-Sets if yas3fs should installed from default pip package provider
-or if github source is pulled and pip package is built.
-Set to 'vcs' to build from github source.
-To switch to vcs from yas3fs previously installied pip package
-manually intervention is required. Please manually
-uninstall previosly installied pip package before switching to
-vcs type install.
-Default: 'pip'
+Defines if this module should attempt to install and manage python
+Default: false
 
-#####`vcs_remote`
+#####`manage_requirements`:
 
-Optionally set yas3fs source code to be other than original
-Default: 'https://github.com/danilop/yas3fs.git'
-
-#####`vcs_revision`
-
-Optionally set to use code from a specific commit or branch
-Default: 'master'
+Defines if this module should attempt to install and manage yas3fs dependencies.
+Default: true
 
 #####`mounts`
 
@@ -113,6 +83,30 @@ class { 'yas3fs':
   }
 }
 ```
+#####`python_version`:
+
+Which version /usr/bin/pythonX[.Y] should be used to run yas3fs?
+Major version X require, minor version Y is optional.
+i.g. 3,3.6,3.8,2,2.7
+Default: 3
+
+#####`vcs_remote`
+
+Optionally set yas3fs source code to be other than original
+Default: 'https://github.com/danilop/yas3fs.git'
+
+#####`vcs_revision`
+
+Optionally set to use code from a specific commit or branch
+Default: '5bbf8296b5cb16c8afecad94ea55d03c4052a683' # v2.4.6 No tag available 
+
+#####`venv_path`
+
+Path to python virtual environment. 
+If set to '' system python library path will be used.
+Highly recommend installing yas3fs to a virtual environment
+to avoid causing issues with your python based package
+management systems i.g. apt, yum...
 
 ####Defined Type: `yas3fs::mount`
 
@@ -132,6 +126,14 @@ yas3fs::mount { 'example-mount':
 
 **Parameters within `yas3fs::mount`**
 
+#####`s3_url`
+
+The S3 URL that should be mounted (e.g. s3://my-bucket/my-path)
+
+#####`local_path`
+
+The location where the S3 bucket should be mounted.
+
 #####`ensure`
 
 Control what to do with this mount. Valid values are `mounted` (default), `unmounted`, `absent`,
@@ -140,24 +142,25 @@ and `present`.
 WARNING: setting ensure to `absent` removes the service configuration, but cannot
 verify that the service is stopped.
 
-#####`s3_url`
+#####`init_system`
 
-The S3 URL that should be mounted (e.g. s3://my-bucket/my-path)
+Your init system so that proper mount startup script can be created.
 
-#####`local_path`
+#####`options`
 
-The location where the S3 bucket should be mounted.
+An array of command line arguments that should be passed to yas3fs. The leading
+dashes can be omitted. A full list of options is in the
+[yas3fs documentation](https://github.com/danilop/yas3fs/blob/master/README.md).
 
 #####`aws_access_key_id` and `aws_secret_access_key`
 
 The credentials to use when connecting to AWS. Credentials can be omitted on EC2
 instances with appropriate IAM roles assigned.
 
-#####`options`
+#####`venv_path`
 
-An array of command line arguments that should be passed to yas3fs. The leading
-dashes can be omitted. A full list of options is in the
-[yas3fs documentation](https://github.com/danilop/yas3fs/blob/master/README.md).
+The virtual environment where yas3fs is installed.
+Help your init system start the mount properly. 
 
 ##Reference
 
@@ -170,7 +173,7 @@ dashes can be omitted. A full list of options is in the
 ####Private Classes
 
 * `yas3fs::config`: Manages the fuse configuration
-* `yas3fs::package`: Installs pip, fuse, and yas3fs
+* `yas3fs::install`: Installs fuse, and yas3fs
 * `yas3fs::params`: Manages base parameters
 
 ###Defined Types
@@ -182,4 +185,4 @@ dashes can be omitted. A full list of options is in the
 ##Limitations
 
 yas3fs is written for python 2.6, though there has been a lot of success running
-it on 2.7.
+it on 2.7, and now 3.x.

files/requirements.txt

@@ -0,0 +1,7 @@
+# This file is puppet managed
+# any changes will be removed
+# by puppet. 
+# Minimum requirements for yas3fs
+setuptools>=2.2
+boto>=2.25.0
+boto3>=1.6.12

manifests/config.pp

@@ -2,11 +2,13 @@
 class yas3fs::config {
   assert_private()
 
-  file { '/etc/fuse.conf':
-    ensure => present,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0664',
+  if ! defined(File['/etc/fuse.conf']) {
+    file { '/etc/fuse.conf':
+      ensure => present,
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0664',
+    }
   }
 
   augeas { 'fuse.conf:user_allow_other':

manifests/init.pp

@@ -1,15 +1,49 @@
 # A module to manage S3 mounts using yas3fs
+# * `init_system`:
+#   Specify the init system used. i.g. sysv, systemd
+#
+# * `manage_python`:
+#   Should this module attempt to install and manage
+#   python?
+#
+# * `manage_requirements`:
+#   Should this module attempt to install and manage
+#   yas3fs dependencies?
+#
+# * `mounts`:
+#   A hash of mounts and mount options passed to
+#   defined type yas3fs::mount
+#
+# * `python_version`:
+#   Which version /usr/bin/pythonX[.Y] should be
+#   used to run yas3fs?
+#
+# * `vcsrepo`:
+#   The VCS repository to fetch yas3fs code.
+#
+# * `vcs_revision`:
+#   Revision/Commit/Branch/Tag to check out
+#   when installing yas3fs
+#
+# * `venv_path`:
+#   If set to '' system python library path will be used.
+#   Highly recommend installing yas3fs to a virtual environment
+#   to avoid causing issues with your python based package
+#   management systems i.g. apt, yum...
+#
 class yas3fs (
-  $install_pip_package          = $::yas3fs::params::install_pip_package,
-  $init_system                  = $::yas3fs::params::init_system,
-  $mounts                       = {},
-  Enum['pip', 'vcs'] $provider  = $::yas3fs::params::provider,
-  $vcs_remote                   = $::yas3fs::params::vcs_remote,
-  $vcs_revision                 = $::yas3fs::params::vcs_revision,
+  Enum['systemd','sysvinit','upstart'] $init_system = $::yas3fs::params::init_system,
+  Boolean $manage_python       = false,
+  Boolean $manage_requirements = true,
+  Hash $mounts                 = {},
+  String[1] $python_version    = '3', # Versions 2,2.7,3,3.6
+  String[9] $vcs_remote        = 'https://github.com/danilop/yas3fs.git',
+  String[1] $vcs_revision      = '5bbf8296b5cb16c8afecad94ea55d03c4052a683', # v2.4.6 No tag available
+  String $venv_path            = '/opt/yas3fs/venv', #Path to install python virtual environment
 ) inherits yas3fs::params {
 
   anchor { 'yas3fs::begin': }
-  -> class { '::yas3fs::package': }
+  -> class { '::yas3fs::install': }
   -> class { '::yas3fs::config': }
   -> anchor { 'yas3fs::end':}