Use docker compose to run riak, redis and celery

This commit is contained in:
Łukasz Oleś 2015-11-23 22:35:25 +01:00
parent de57d64670
commit 2241de1eb4
3 changed files with 5 additions and 8 deletions

6
Vagrantfile vendored
View File

@ -54,10 +54,6 @@ solar_script = ansible_playbook_command("solar.yaml")
slave_script = ansible_playbook_command("custom-configs.yaml", ["-e", "master_ip=10.0.0.2"])
master_celery = ansible_playbook_command("celery.yaml", ["--skip-tags", "slave"])
slave_celery = ansible_playbook_command("celery.yaml", ["--skip-tags", "master"])
master_pxe = ansible_playbook_command("pxe.yaml")
@ -67,7 +63,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = MASTER_IMAGE
config.vm.provision "shell", inline: solar_script, privileged: true
config.vm.provision "shell", inline: master_celery, privileged: true
config.vm.provision "shell", inline: master_pxe, privileged: true unless PREPROVISIONED
config.vm.provision "file", source: "~/.vagrant.d/insecure_private_key", destination: "/vagrant/tmp/keys/ssh_private"
config.vm.provision "file", source: "bootstrap/ansible.cfg", destination: "/home/vagrant/.ansible.cfg"
@ -126,7 +121,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provision "file", source: "bootstrap/ansible.cfg", destination: "/home/vagrant/.ansible.cfg"
config.vm.provision "shell", inline: slave_script, privileged: true
config.vm.provision "shell", inline: solar_script, privileged: true
config.vm.provision "shell", inline: slave_celery, privileged: true
#TODO(bogdando) figure out how to configure multiple interfaces when was not PREPROVISIONED
ind = 0
SLAVES_IPS.each do |ip|

View File

@ -4,10 +4,9 @@
sudo: yes
tasks:
# Setup development env for solar
- apt: name=libssl-dev state=present
- apt: name=libffi-dev state=present
- shell: pip install -e . chdir=/vagrant
- shell: pip install -e . chdir=/vagrant/solard
- shell: docker-compose up -d chdir=/vagrant
- hosts: all
tasks:

View File

@ -15,3 +15,7 @@
# creates: /etc/apt/sources.list.d/docker.list
#- shell: apt-get update
#- shell: apt-get install -y -q docker-engine
# install docker compose
- shell: curl -L https://github.com/docker/compose/releases/download/1.5.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
- shell: chmod +x /usr/local/bin/docker-compose