File tree 5 files changed +28
-4
lines changed
5 files changed +28
-4
lines changed Original file line number Diff line number Diff line change @@ -44,6 +44,7 @@ puppet:
44
44
# Install puppet modules required to set-up a Vagrant box
45
45
rm -rf sites/puppet/modules/*
46
46
puppet module install --target-dir sites/puppet/modules/ saz-memcached -v 2.0.2
47
+ puppet module install --target-dir sites/puppet/modules/ puppetlabs/mysql
47
48
git clone git://github.com/akumria/puppet-postgresql.git sites/puppet/modules/postgresql
48
49
git clone git://github.com/uggedal/puppet-module-python.git sites/puppet/modules/python
49
50
git clone git://github.com/codeinthehole/puppet-userconfig.git sites/puppet/modules/userconfig
Original file line number Diff line number Diff line change
1
+ MySQL-python==1.2.4c1
2
+ psycopg2==2.4.5
Original file line number Diff line number Diff line change 14
14
15
15
PROJECT_DIR = os .path .dirname (__file__ )
16
16
17
+ # Change to the current directory to solve an issue installing Oscar on the Vagrant machine.
18
+ os .chdir (PROJECT_DIR )
19
+
17
20
setup (name = 'django-oscar' ,
18
21
version = get_version ().replace (' ' , '-' ),
19
22
url = 'https://github.com/tangentlabs/django-oscar' ,
Original file line number Diff line number Diff line change 13
13
" python-imaging" ,
14
14
" python-memcache" ,
15
15
" postgresql-server-dev-9.1" ,
16
+ " libmysqlclient-dev" ,
16
17
]
17
18
package {
18
19
$packages: ensure => installed,
46
47
encoding => " UTF8" ,
47
48
}
48
49
50
+ # MySQL
51
+ class {"mysql::python" : }
52
+ class {"mysql::server" :
53
+ config_hash => {" root_password" => " root_password" }
54
+ }
55
+ mysql::db {$database_name:
56
+ user => $user ,
57
+ password => $password ,
58
+ host => " localhost" ,
59
+ grant => [" all" ],
60
+ }
61
+
49
62
# Python
50
63
# - set-up a virtualenv
51
64
# - install testing requirements
56
69
python::venv::isolate { $virtualenv:
57
70
requirements => " /vagrant/requirements.txt"
58
71
}
72
+ python::pip::requirements {"/vagrant/requirements_vagrant.txt" :
73
+ venv => $virtualenv ,
74
+ }
59
75
exec {"install-oscar" :
60
- command => " $virtualenv /bin/python setup.py develop" ,
76
+ command => " $virtualenv /bin/python /vagrant/ setup.py develop" ,
61
77
require => Python::Venv::Isolate[$virtualenv ]
62
78
}
63
79
}
Original file line number Diff line number Diff line change
1
+ from settings import *
2
+
1
3
DATABASES = {
2
4
'default' : {
3
5
'ENGINE' : 'django.db.backends.mysql' ,
4
- 'NAME' : 'oscar ' ,
5
- 'USER' : 'oscar_vagrant ' ,
6
+ 'NAME' : 'oscar_vagrant ' ,
7
+ 'USER' : 'oscar_user ' ,
6
8
'PASSWORD' : 'oscar_password' ,
7
- 'HOST' : '' ,
9
+ 'HOST' : 'localhost ' ,
8
10
'PORT' : '' ,
9
11
}
10
12
}
You can’t perform that action at this time.
0 commit comments