From a0f76c9bc9ba0c863171b0714e5cc277f23c2b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Tue, 24 Nov 2015 12:03:48 +0100 Subject: [PATCH] Do not run docker-compose on slaves --- Vagrantfile | 1 + bootstrap/playbooks/solar.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 011e6dac..b47088ff 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -61,6 +61,7 @@ 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: "cd /vagrant && docker-compose up -d" , 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" diff --git a/bootstrap/playbooks/solar.yaml b/bootstrap/playbooks/solar.yaml index 784f1509..e07b0dc9 100644 --- a/bootstrap/playbooks/solar.yaml +++ b/bootstrap/playbooks/solar.yaml @@ -6,7 +6,6 @@ # Setup development env for solar - shell: pip install -e . chdir=/vagrant - shell: pip install -e . chdir=/vagrant/solard - - shell: docker-compose up -d chdir=/vagrant - hosts: all tasks: