Code review by Yoni

This commit is contained in:
Timor Raiman 2013-11-21 19:54:47 +02:00 committed by Arik Fraimovich
parent a3cf6711a5
commit 5b286b74b0
2 changed files with 21 additions and 16 deletions

View File

@ -1,2 +1,4 @@
cookbook 'redash', path: '../cookbooks/redash'
cookbook 'apt'
cookbook 'postgresql'
#cookbook 'redash', git: 'git@gitlab.doit9.com:ops/chef-redash.git'
cookbook 'redash', path: '../../chef-redash'

33
vagrant/Vagrantfile vendored
View File

@ -4,30 +4,33 @@
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "precise32"
# TODO: should be result of encryption of readable password
__pg_password = "securepass"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "ubuntu-precise-cloudimg-amd64"
config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
config.berkshelf.enabled = true
#config.omnibus.chef_version = :latest
config.omnibus.chef_version = "11.6.0"
config.berkshelf.enabled = true
config.omnibus.chef_version = :latest
config.vm.network "forwarded_port", guest: 8888, host: 9999
config.vm.provision :chef_solo do |chef|
#Run apt-get update before anything else (specifically postgresql)..
# run apt-get update before anything else (specifically postgresql)..
chef.add_recipe "apt"
chef.add_recipe "redash"
chef.add_recipe "postgresql"
chef.add_recipe "redash::redash_pg_schema"
chef.add_recipe "redash::redash"
chef.json = {
"apt" => {"compiletime" => true},
"postgresql" => {"password" => {"postgres" => "securepass"}},
"redash" => {"db" => {"host" => "localhost"}},
}
"apt" => { "compiletime" => true },
"postgresql" => { "password" => { "postgres" => __pg_password } },
"redash" => { "db" => { "host" => "localhost",
"user" => "postgres",
"password" => __pg_password } }
}
end
end