Refactor vagrant provisioning scripts

so we can use the 'debian.pp' manifest to install
the requirements for setting up the useragent in a
non-vagrant env.

3 files changed, 19 insertions, 10 deletions

diff --git a/provisioning/manifests/debian.pp b/provisioning/manifests/debian.pp
new file mode 100644
index 00000000..644714c0
--- /dev/null
+++ b/provisioning/manifests/debian.pp
@@ -0,0 +1,5 @@
+# This class will install the requirements to setup the
+# useragent from source
+class { '::pixelated::apt': } ->
+class { '::pixelated::common': } ->
+class { '::pixelated::source': }
diff --git a/provisioning/manifests/source.pp b/provisioning/manifests/source.pp
index 74859a63..82395ef9 100644
--- a/provisioning/manifests/source.pp
+++ b/provisioning/manifests/source.pp
@@ -1,5 +1,9 @@
+# This class will install the requirements and the useragent
+# from source. It's the default provision script called by
+# 'vagrant up'
+
 class { '::pixelated::apt': } ->
 class { '::pixelated::common': } ->
-class { '::pixelated::source': }
-#class { '::pixelated::cleanup':}
+class { '::pixelated::source': } ->
+class { '::pixelated::source::install_useragent':}
 
diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp
index c42a30b1..9529f761 100644
--- a/provisioning/modules/pixelated/manifests/source.pp
+++ b/provisioning/modules/pixelated/manifests/source.pp
@@ -1,4 +1,4 @@
-# install useragent from source
+# install requirements for setting up the useragent from source
 class pixelated::source {
   include phantomjs
 
@@ -8,7 +8,6 @@ class pixelated::source {
     'nodejs-legacy',
     'npm',
     'python-dev',
-    'virtualenv',
     'libffi-dev',
     'libssl-dev',
     'g++',
@@ -16,14 +15,15 @@ class pixelated::source {
     'libfontconfig1',
     'build-essential',
     'ruby-compass']:
-    ensure => latest
+      ensure => latest
   }
 
-  stage { 'install_pixelated': }
-
-  class { 'pixelated::source::install_useragent' :
-    stage => install_pixelated
+  # from jessie on, the 'virtualenv' cmd is provided
+  # by a seperate package that is recommended by
+  # 'python-virtualenv'
+  package { 'python-virtualenv':
+    ensure          => latest,
+    install_options => [ '-o', 'APT::Install-Recommends=true'],
   }
 
-  Stage['main'] -> Stage['install_pixelated']
 }