Diff of /vagrant/manifests/ubuntu-1110-server-amd64.pp [948611] .. [c0c52d] Maximize Restore

  Switch to side-by-side view

--- a/vagrant/manifests/ubuntu-1110-server-amd64.pp
+++ b/vagrant/manifests/ubuntu-1110-server-amd64.pp
@@ -1,6 +1,10 @@
 # create puppet group
 group { "puppet":
   ensure => "present",
+}
+
+exec { "package index update":
+    command => "/usr/bin/apt-get update",
 }
 
 # install required system packages
@@ -21,7 +25,9 @@
  "python-pip"
 ]
 
-package { $packages: }
+package { $packages:
+    require => Exec[ "package index update" ],
+}
 
 file { '/usr/lib/libz.so':
   ensure => 'link',
@@ -43,7 +49,7 @@
 
 # create Allura virtualenv
 exec { "create allura venv":
-  command => "/usr/local/bin/virtualenv --system-site-packages anvil && chown -R vagrant:vagrant /home/vagrant/anvil",
+  command => "/usr/local/bin/virtualenv --system-site-packages anvil",
   cwd     => "/home/vagrant",
   creates => "/home/vagrant/anvil",
   user => "vagrant",
@@ -75,21 +81,13 @@
   require => [ File[ "/home/vagrant/src" ], Package[ "git-core" ] ],
 }
 
-# pre-install Paste and PasteDeploy to work around problem in TG2 install
-exec { "prereqs":
-  command => "/home/vagrant/anvil/bin/pip install Paste==1.7.5.1 PasteDeploy==1.5.0",
-  user => "vagrant",
-  group => "vagrant",
-  require => Exec[ "create allura venv" ],
-}
-
-# install remainder of Allura dependencies
-exec { "/usr/bin/sudo /home/vagrant/anvil/bin/pip install -r requirements.txt":
+# install Allura dependencies
+exec { "/home/vagrant/anvil/bin/pip install -r requirements.txt":
   cwd     => "/home/vagrant/src/forge",
   user => "vagrant",
   group => "vagrant",
   timeout => 0,
-  require => [ Exec[ "clone repo"], Exec[ "prereqs" ] ],
+  require => [ Exec[ "clone repo"], Exec[ "create allura venv" ] ],
 }
 
 # create SCM repo dirs