~cjohnston/charms/precise/summit/trunk

« back to all changes in this revision

Viewing changes to hooks/install

  • Committer: Chris Johnston
  • Date: 2013-01-09 06:09:21 UTC
  • Revision ID: chrisjohnston@ubuntu.com-20130109060921-ai1h9q01lj5xfb9t
more fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
 
6
6
# We want to use the vcsrepo resource type, and it seems the
7
7
# best way to install that is via the puppet-module tool.
8
 
apt-get -y install puppet pwgen
 
8
apt-get install -y puppet pwgen
9
9
# Default vcsrepo 0.0.4 suffers from http://projects.puppetlabs.com/issues/9083
10
10
# (I've commented on and re-opened the above bug.
11
 
apt-get -y install rubygems
 
11
apt-get install -y rubygems
12
12
gem install puppet-module
13
13
puppet-module install puppetlabs-vcsrepo --version=0.0.3 --force
14
14
rm -rf /etc/puppet/modules/vcsrepo/
29
29
# for both apt and pip resource types.
30
30
if [ "$additional_debian_packages" ]; then
31
31
    juju-log "Installing extra debian packages: $additional_debian_packages"
32
 
    sudo apt-get -y install $additional_debian_packages
 
32
    sudo apt-get install -y $additional_debian_packages
33
33
fi
34
34
if [ "$additional_pip_packages" ]; then
35
35
    juju-log "Installing extra pip packages: $additional_pip_packages"
58
58
  local source_dir="/srv/$service_hostname"
59
59
  pip install -r $source_dir/requirements.txt
60
60
  #python2.6 /usr/bin/pip install -r $source_dir/requirements.txt
61
 
        apt-get install python python-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes python-django python-django-openid-auth python-django-south python-beautifulsoup python-psycopg2 python-openid python-tz python-simplejson python-memcache
 
61
  apt-get install -y python python-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes python-django python-django-openid-auth python-django-south python-beautifulsoup python-psycopg2 python-openid python-tz python-simplejson python-memcache
62
62
}
63
63
pip_install
64
64
#MMM idempotency?