Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ANSIBLE_GROUPS = {

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

config.vm.box = "tsihosting/centos7"
config.vm.box = "centos/7"

config.vm.provider 'virtualbox' do |v|
v.linked_clone = true if Vagrant::VERSION =~ /^1.8/
Expand All @@ -41,7 +41,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
(1..MANAGERS).each do |manager_id|
config.vm.define "manager#{manager_id}" do |manager|
manager.vm.hostname = "manager#{manager_id}"
manager.vm.network "private_network", ip: "192.168.77.#{20+manager_id}"
manager.vm.network "private_network", ip: "192.168.56.#{20+manager_id}"
manager.vm.provider "virtualbox" do |v|
v.memory = 2048
v.cpus = 2
Expand All @@ -52,7 +52,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
(1..WORKERS).each do |worker_id|
config.vm.define "worker#{worker_id}" do |worker|
worker.vm.hostname = "worker#{worker_id}"
worker.vm.network "private_network", ip: "192.168.77.#{30+worker_id}"
worker.vm.network "private_network", ip: "192.168.56.#{30+worker_id}"
worker.vm.provider "virtualbox" do |v|
v.memory = 2048
v.cpus = 2
Expand Down
4 changes: 2 additions & 2 deletions ansible/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# DNS: dig @172.17.0.1 -p 53 manager2.node.consul
#

- include: swarm.yml
- include: consul.yml
- import_playbook: swarm.yml
- import_playbook: consul.yml
4 changes: 2 additions & 2 deletions ansible/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---

vagrant_network_interface: enp0s8
vagrant_network_interface: eth1
vagrant_primary_manager_ip: "{{ hostvars['manager1']['ansible_'+vagrant_network_interface].ipv4.address }}"

docker_syslog_tag: "{% raw %}'{{.ImageName}}/{{.Name}}/{{.ID}}'{% endraw %}"
Expand All @@ -12,7 +12,7 @@ swarm_bind_port: 2377
logstash_host: "{{ hostvars['manager2']['ansible_'+vagrant_network_interface].ipv4.address }}"

# Consul
consul_interface: enp0s8
consul_interface: eth1
consul_advertise: "{{ hostvars[inventory_hostname]['ansible_'+consul_interface]['ipv4']['address'] }}"

# Nomad
Expand Down
5 changes: 4 additions & 1 deletion ansible/network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@
tasks:
- name: Get networks
shell: >
docker network ls --filter name={{ item }}$ | tail -n +2
docker network ls --filter name={{ item }} | awk '{print $2}' | tail -n +2
with_items:
- appnet
register: network_result

- debug:
msg: "{{network_result}}"

- set_fact:
docker_current_networks: "{{ network_result.results | map(attribute='stdout') | list | join(' ') }}"
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ common_yum_packages:
- net-tools
- unzip


common_pip_packages:
- pathlib
- pyyaml
- docker-py
- docker
- docker-compose
27 changes: 21 additions & 6 deletions ansible/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
---
- name: Install epel
yum: name=epel-release state=latest
yum:
name: epel-release
state: latest

- name: Install required packages
yum: name={{ item }} state=latest
with_items: "{{ common_yum_packages }}"
yum:
name: "{{ common_yum_packages }}"
state: latest
tags:
- packages

- name: Get bootstrap script for pip
become: true
get_url:
url: https://bootstrap.pypa.io/pip/2.7/get-pip.py
dest: /root/get-pip.py

- name: Update pip
become: true
shell:
cmd: python /root/get-pip.py

- name: install docker python dependencies
pip: name={{ item }}
with_items: "{{ common_pip_packages }}"
pip:
name: "{{ common_pip_packages }}"
tags:
- packages
- packages

11 changes: 4 additions & 7 deletions ansible/roles/consul/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
- pip: name=docker state=absent
- pip: name=docker-py state=absent
- pip: name=docker state=present

- name: Install pip packages
pip:
name: "{{ item }}"
name: python-consul
state: present
with_items:
- python-consul
- docker-py

- debug: var=consul_advertise

- debug: var=consul_join_ip

- debug: var=consul_servers_list

- name: run consul container with bootstrap
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/nomad/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ nomad_ports:
- { name: rpc, port: 4647 }


nomad_interface: enp0s8
nomad_interface: eth1
nomad_advertise_ip: "{{ hostvars[inventory_hostname]['ansible_'+nomad_interface]['ipv4']['address'] }}"
nomad_cluster_size: "{{ nomad_servers_list | length }}"
2 changes: 1 addition & 1 deletion ansible/swarm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
tags:
- label

- include: network.yml
- import_playbook: network.yml

- hosts: managers[0]
become: yes
Expand Down