fixes bug 821352 - finish getting vagrant working with Precise

mr-const · Dec 19, 2012 · 476af26 · 476af26
1 parent 341687a
commit 476af26
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -16,7 +16,8 @@ CONF = _config
 
 
 Vagrant::Config.run do |config|
-  config.vm.box = "socorro-all"
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
   config.vm.network :hostonly, "33.33.33.10"
   config.vm.customize ["modifyvm", :id, "--memory", CONF['memory']]
 

diff --git a/docs/vagrant.rst b/docs/vagrant.rst
@@ -18,16 +18,11 @@ http://www.virtualbox.org/
 3. Install Vagrant from:
 http://vagrantup.com/
 
-4. Download base box
-::
- # NOTE: if you have a 32-bit host, change "lucid64" to "lucid32"
- vagrant box add socorro-all http://files.vagrantup.com/precise64.box
-
-5. Copy base box, boot VM and provision it with puppet:
+4. Download and copy base box, boot VM and provision it with puppet:
 ::
  vagrant up
 
-6. Add to /etc/hosts (on the HOST machine!):
+5. Add to /etc/hosts (on the HOST machine!):
 ::
   33.33.33.10 crash-stats crash-reports socorro-api
 

diff --git a/puppet/files/etc_apt_sources.list.d/cloudera.list b/puppet/files/etc_apt_sources.list.d/cloudera.list
@@ -1,2 +1,3 @@
-deb http://archive.cloudera.com/debian lucid-cdh3 contrib
-deb-src http://archive.cloudera.com/debian lucid-cdh3 contrib
+deb [arch=amd64] http://archive.cloudera.com/cdh4/ubuntu/precise/amd64/cdh precise-cdh4 contrib
+deb-src http://archive.cloudera.com/cdh4/ubuntu/precise/amd64/cdh precise-cdh4 contrib
+
diff --git a/puppet/manifests/classes/socorro-base.pp b/puppet/manifests/classes/socorro-base.pp
@@ -92,18 +92,23 @@
     exec {
         '/usr/bin/apt-get update && touch /tmp/apt-get-update':
             alias => 'apt-get-update',
-            require => Exec['add-deadsnakes-ppa'],
             creates => '/tmp/apt-get-update';
 
         'add-deadsnakes-ppa':
             command => '/usr/bin/sudo /usr/bin/add-apt-repository ppa:fkrull/deadsnakes && touch /tmp/add-deadsnakes-ppa',
+            require => Package['python-software-properties'],
             creates => '/tmp/add-deadsnakes-ppa';
+
+        'apt-get-update-deadsnakes':
+            command => '/usr/bin/apt-get update && touch /tmp/apt-get-update-deadsnakes',
+            require => Exec['add-deadsnakes-ppa'],
+            creates => '/tmp/apt-get-update-deadsnakes';
     }
 
     package {
         ['rsyslog', 'libcurl4-openssl-dev', 'libxslt1-dev', 'build-essential',
          'supervisor', 'ant', 'python-software-properties', 'curl', 'git-core',
-         'openjdk-6-jdk', 'maven2']:
+         'openjdk-6-jdk', 'maven2', 'memcached']:
             ensure => latest,
             require => Exec['apt-get-update'];
     }
@@ -122,8 +127,14 @@
             enable => true,
             require => Package['rsyslog'],
             ensure => running;
+
+        memcached:
+            enable => true,
+            require => Package['memcached'],
+            ensure => running;
     }
 
+
     group { 'puppet':
         ensure => 'present',
     }
@@ -167,9 +178,11 @@
 #                default => "puppet://$server/modules/socorro/prod/etc-logrotated/socorro",
 #                };
     package {
-        ['subversion', 'libpq-dev', 'python-virtualenv', 'python-dev']:
+        ['subversion', 'libpq-dev', 'python-virtualenv', 'python2.6-dev',
+         'python-pip']:
             ensure => latest,
-            require => Exec['apt-get-update'];
+            require => [Exec['apt-get-update'],
+                        Exec['apt-get-update-deadsnakes']];
     }
 
     exec {
@@ -200,7 +213,9 @@
             alias => 'socorro-reinstall',
             cwd => '/home/socorro/dev/socorro',
             timeout => '3600',
-            require => Exec['socorro-install'],
+            require => [Exec['socorro-install'],
+                        Package['apache2'],
+                        Package['memcached']],
             logoutput => on_failure,
             notify => [Service['apache2'], Service['memcached']],
             user => 'socorro';
@@ -231,10 +246,6 @@
                         Package[libapache2-mod-php5], Exec[enable-mod-proxy]];
     }
 
-}
-
-class socorro-php inherits socorro-web {
-
      file {
         '/etc/apache2/sites-available/crash-stats':
             require => Package[apache2],
@@ -318,15 +329,8 @@
             creates => '/etc/apache2/mods-enabled/headers.load';
     }
 
-    service {
-        memcached:
-            enable => true,
-            require => Package['memcached'],
-            ensure => running;
-    }
-
     package {
-        ['memcached', 'libcrypt-ssleay-perl', 'php5-pgsql', 'php5-curl',
+        ['libcrypt-ssleay-perl', 'php5-pgsql', 'php5-curl',
          'php5-dev', 'php5-tidy', 'php-pear', 'php5-common', 'php5-cli',
          'php5-memcache', 'php5', 'php5-gd', 'php5-mysql', 'php5-ldap',
          'phpunit']:

diff --git a/puppet/manifests/nodes/nodes.pp b/puppet/manifests/nodes/nodes.pp
@@ -1,7 +1,6 @@
 node default {
     include socorro-db
     include socorro-monitor
-    include socorro-php
     include socorro-processor
     include socorro-collector
     include socorro-api

diff --git a/puppet/ubuntu-bootstrap.sh b/puppet/ubuntu-bootstrap.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# Quick bootstrap script for an Ubuntu Lucid host
+# Quick bootstrap script for an Ubuntu Precise host
 #
-# This allows you to bootstrap any Lucid box (VM, physical hardware, etc)
+# This allows you to bootstrap any Precise box (VM, physical hardware, etc)
 # using Puppet and automatically install a full Socorro environment on it.
 #
 # NOTE - if you want HBase installed (which you need for processing incoming