Skip to content

Commit

Permalink
🐛 fixed Vagrant ansible provisioner
Browse files Browse the repository at this point in the history
  • Loading branch information
alexsavio committed Jul 30, 2018
1 parent 18934cc commit 8562ecd
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 44 deletions.
22 changes: 9 additions & 13 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

VAGRANTFILE_API_VERSION = "2"
Vagrant.configure("2") do |config|

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

config.vm.define :test, :autostart => true do |node|
node.vm.box = 'ubuntu/trusty64'
node.vm.hostname = 'test'
node.vm.network :private_network, ip: "10.0.11.11", hostsupdater: "skip"
node.vm.provider "virtualbox" do |vb|
vb.memory = "1024"
vb.gui = false
vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
config.vm.define :vepcon, :autostart => true do |node|
node.vm.box = "ubuntu/trusty64"
node.vm.hostname = 'vepcon'
node.vm.network :private_network, ip: "10.0.11.10"
node.vm.synced_folder ".", "/vagrant", type: "virtualbox"
node.vm.provision "ansible" do |ansible|
ansible.limit = "vepcon"
ansible.playbook = "playbook.yml"
end
node.vm.provision :shell, path: "vagrant/test.sh", privileged: false
end

end
7 changes: 5 additions & 2 deletions ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[defaults]

inventory = ./inventory
inventory = hosts.yml
remote_tmp = /tmp

roles_path = ./roles
roles_path = ./roles
host_key_checking = no
vault_password_file = ./vault-pass.txt
nocows = 1

[ssh_connection]
ssh_args= -o ControlMaster=auto -o ControlPersist=30m -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no
10 changes: 5 additions & 5 deletions host_vars/europython.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ group: "{{ ansible_ssh_user }}"
home_dir: '/home/{{ user }}'

tmp_install_dir: '{{ home_dir }}/tmp'
install_dir: '{{ home_dir }}/apps'
bin_dir: '{{ home_dir }}/bin'
install_dir: '{{ home_dir }}/apps'
bin_dir: '{{ home_dir }}/bin'

config_dir_basename: "config"
env_dir_basename: "envfile"

dockers_files_dir: '{{ install_dir }}/dockerfile'
dockers_files_dir: '{{ install_dir }}/dockerfile'
dockers_volumes_dir: '{{ install_dir }}/volume'
dockers_config_dir: '{{ install_dir }}/{{ config_dir_basename }}'
dockers_env_dir: '{{ install_dir }}/{{ env_dir_basename }}'
dockers_config_dir: '{{ install_dir }}/{{ config_dir_basename }}'
dockers_env_dir: '{{ install_dir }}/{{ env_dir_basename }}'
18 changes: 18 additions & 0 deletions host_vars/vepcon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---

user: "{{ ansible_user }}"
group: "{{ ansible_user }}"

home_dir: '/home/{{ user }}'

tmp_install_dir: '{{ home_dir }}/tmp'
install_dir: '{{ home_dir }}/apps'
bin_dir: '{{ home_dir }}/bin'

config_dir_basename: "config"
env_dir_basename: "envfile"

dockers_files_dir: '{{ install_dir }}/dockerfile'
dockers_volumes_dir: '{{ install_dir }}/volume'
dockers_config_dir: '{{ install_dir }}/{{ config_dir_basename }}'
dockers_env_dir: '{{ install_dir }}/{{ env_dir_basename }}'
1 change: 1 addition & 0 deletions hosts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
---
File renamed without changes.
10 changes: 10 additions & 0 deletions playbook.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---

- hosts:
- vepcon
any_errors_fatal: true
roles:
- { role: common, become: yes, become_method: sudo, tags: common }
- { role: python, become: yes, become_method: sudo, tags: python }
- { role: docker-compose, become: yes, become_method: sudo, tags: docker_compose }
- { role: chatbot, tags: chatbot }
24 changes: 0 additions & 24 deletions site.yml

This file was deleted.

0 comments on commit 8562ecd

Please sign in to comment.