x/solar
Code Issues Proposed changes

Do not run docker-compose on slaves

Browse Source
This commit is contained in:
Łukasz Oleś 2015-11-24 12:03:48 +01:00
parent 8e6519795e
commit a0f76c9bc9
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Vagrantfile vendored
View File

@ -61,6 +61,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = MASTER_IMAGE config.vm.box = MASTER_IMAGE
config.vm.provision "shell", inline: solar_script, privileged: true 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 "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: "~/.vagrant.d/insecure_private_key", destination: "/vagrant/tmp/keys/ssh_private"
config.vm.provision "file", source: "bootstrap/ansible.cfg", destination: "/home/vagrant/.ansible.cfg" config.vm.provision "file", source: "bootstrap/ansible.cfg", destination: "/home/vagrant/.ansible.cfg"

1
bootstrap/playbooks/solar.yaml
View File

@ -6,7 +6,6 @@
# Setup development env for solar # Setup development env for solar
- shell: pip install -e . chdir=/vagrant - shell: pip install -e . chdir=/vagrant
- shell: pip install -e . chdir=/vagrant/solard - shell: pip install -e . chdir=/vagrant/solard
- shell: docker-compose up -d chdir=/vagrant
- hosts: all - hosts: all
tasks: tasks: