Skip to content

3522 create consul cluster #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 4, 2016
Merged
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
2 changes: 1 addition & 1 deletion ansible/consul-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
- hosts: rabbitmq
- hosts: redis

- hosts: vault
- hosts: consul
roles:
- { role: consul-services }
8 changes: 4 additions & 4 deletions ansible/epsilon-hosts/hosts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ socket-server
epsilon-api

[consul]
epsilon-services
epsilon-api
epsilon-web
epsilon-consul-a
epsilon-consul-b
epsilon-consul-c

[docker-listener]
epsilon-services
Expand Down Expand Up @@ -98,9 +98,9 @@ epsilon-services
api
bastion
charon
consul
dock
docker-listener
docker-listener
docks
eru
hipache
Expand Down
8 changes: 4 additions & 4 deletions ansible/epsilon-hosts/variables
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
registry_host=10.12.12.99
user_content_domain=runnablecloud.com
api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
vault_auth_token=bc768f31-62ef-ceda-3de6-c86bd0c7ffc6
vault_token_01=c21de228e17c9b489b2f5a2de316b97e589ef4ee83cb18ad85f6ce4a0479e30503
vault_token_02=4ad609187fd19ee2e084068ba53e9ec116b11fc05b84c36e4a7b8a9da391be1204
vault_token_03=e59939b5785df0c886c2159937603dce5d45e58e147301781c3cb0bcee6507a105
vault_auth_token=6f5dddd1-dea2-472d-03b0-51e7fe8ea8de
vault_token_01=5b58b93e4cbb550d2bebe3324018c978bc89b11ba0a8a4a1430319ab8938dd1802
vault_token_02=e334c5c53dc979476e1fb27c91dd8f7b0b5f708b876d829ee0ec54d0cba3de9e03
vault_token_03=8e8918bee9fe08f5558450bceeab71326da91b60a24aed41f6ae7eebb35fe2e204

[ec2:vars]
env=epsilon
Expand Down
9 changes: 5 additions & 4 deletions ansible/roles/consul-services/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
---
- name: make /etc/consul.d folder
sudo: yes
become: true
file:
path=/etc/consul.d
state=directory

- name: remove all current configs
sudo: yes
become: true
shell: rm -f /etc/consul.d/*.json

- name: put service files in place
sudo: yes
become: true
run_once: true
template:
dest=/etc/consul.d/{{ item.name }}.json
src=service.json
Expand All @@ -33,5 +34,5 @@
port: '{{ registry_port }}'

- name: send consul SIGUP to reload services
sudo: yes
become: true
shell: pkill --signal SIGHUP consul
5 changes: 5 additions & 0 deletions ansible/roles/consul_value/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---
- name: Debug role
when: debug_info is defined
debug:
msg="Consul Server {{ consul_host_address }}:{{ consul_api_port }}"

- name: make sure httplib2 is installed
run_once: true
sudo: yes
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/container_kill_start/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
dependencies:
- { role: docker }
- { role: docker, tags: docker }
- { role: loggly }
3 changes: 3 additions & 0 deletions ansible/roles/docker/files/docker-engine
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Package: docker-engine
Pin: version 1.9.1*
Pin-Priority: 1001
39 changes: 28 additions & 11 deletions ansible/roles/docker/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
- name: create docker cert directory
sudo: yes
become: true
when: dock is defined
file:
path=/etc/ssl/docker
state=directory

- name: copy docker certs
sudo: yes
become: true
when: dock is defined
copy:
src=certs/
Expand All @@ -17,64 +17,81 @@
group=root

- name: change core dump path
sudo: yes
become: true
when: docker_config == "runnable"
tags: coreDump
sysctl:
name=kernel.core_pattern
reload=yes
reload=true
state=present
value="/var/log/core.%h.%e.%t"

- name: install aufs with linux-image-extra-{{ ansible_kernel }}
sudo: yes
become: true
tags: aufs
apt:
pkg="linux-image-extra-{{ ansible_kernel }}"
state=present
update_cache=yes
update_cache=true
cache_valid_time=604800

- name: install apt-transport-https
sudo: yes
become: true
apt:
pkg="apt-transport-https"
state=present
update_cache=yes
cache_valid_time=604800

- name: add docker repository key
sudo: yes
become: true
apt_key:
id: 2C52609D
url: https://apt.dockerproject.org/gpg
state: present

- name: add docker repository
sudo: yes
become: true
apt_repository:
repo: "deb https://apt.dockerproject.org/repo ubuntu-{{ ansible_distribution_release }} main"
state: present
update_cache: yes

- name: copy docker config file
sudo: yes
become: true
template:
src={{ docker_config }}
dest=/etc/default/docker
register: copied_config
tags: genDockerConfig

- name: force docker version
become: true
copy:
src=docker-engine
dest=/etc/apt/preferences.d/docker-engine
owner=root
group=root
mode=0600

- name: apt-get update
become: true
apt:
update_cache=yes


- name: install docker
sudo: yes
become: true
when: restart is defined or dock is defined
apt:
pkg="{{ docker_package_name }}"
state=present
force=yes
dpkg_options='force-confold,force-confdef'
update_cache=yes
cache_valid_time=604800


- name: restart docker
when: (copied_config.changed and restart is defined) or dock is defined
command: sudo service docker restart
9 changes: 9 additions & 0 deletions ssh/config
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,15 @@ Host epsilon-userland
Host epsilon-web
ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.14.33 22

Host epsilon-consul-a
ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.7.67 22

Host epsilon-consul-b
ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.10.240 22

Host epsilon-consul-c
ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.12.209 22

################################################################################
# other
################################################################################
Expand Down