Skip to content

Commit

Permalink
Merge pull request #12 from kamigerami/travistest
Browse files Browse the repository at this point in the history
#11-Add travis.yml CI build testing
  • Loading branch information
kamigerami committed Jan 16, 2016
2 parents 9163360 + 6235414 commit f013a45
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 10 deletions.
21 changes: 21 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
sudo: required
env:
- distribution: centos
version: 7

language: python
python: "2.7"

before_install:
# Make sure everything's up to date.

install:
# Install Ansible.
- pip install ansible

script:
# We'll add some commands to test the role here.
- ansible-playbook provisioning/site.yml --syntax-check
# Run playbook
- ansible-playbook provisioning/site.yml --connection=local --sudo
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Build Status](https://travis-ci.org/kamigerami/EcoSystem.svg?branch=master)](https://travis-ci.org/kamigerami/EcoSystem)

<img src="architecture/architecture.jpg">

# EcoSystem
Expand Down
3 changes: 3 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ Vagrant.configure(2) do |config|
:server_flag => "false",
:ui_flag => "false",
:host_type => "agent",
},
:swarm => {
:cluster => "#{cluster_name}-01.#{domainname}"
}
}

Expand Down
1 change: 1 addition & 0 deletions provisioning/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
roles:
- { role: consul }
- { role: docker }
- { role: dockerswarm }
1 change: 0 additions & 1 deletion provisioning/roles/consul/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: restart systemd
sudo: yes
command: systemctl daemon-reload

- name: restart consul
Expand Down
4 changes: 0 additions & 4 deletions provisioning/roles/consul/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,20 @@

- name: Download Consul
get_url: url={{ consul_installer_url_base }}/{{consul_installer_filename}} dest={{consul_install_dir}}/{{consul_installer_filename}}
sudo: yes

- name: Unarchive Consul
unarchive: copy=no src={{consul_install_dir}}/{{ consul_installer_filename }} dest={{ consul_install_dir }} owner=consul group=root mode=0755
sudo: yes
register: consul_installed
notify:
- restart systemd
- restart consul

- name: Download Consul WebUI
get_url: url={{ consul_installer_url_base }}/{{consul_web_ui_installer_filename}} dest={{consul_install_dir}}/{{consul_web_ui_installer_filename}}
sudo: yes
when: ansible_eth1.ipv4.address == "192.168.35.101"

- name: Unarchive Consul WebUI
unarchive: copy=no src={{consul_install_dir}}/{{ consul_web_ui_installer_filename }} dest={{ consul_ui_install_dir }} owner=consul group=root mode=0755
sudo: yes
register: consul_UI_installed
when: ansible_eth1.ipv4.address == "192.168.35.101"
notify:
Expand Down
2 changes: 1 addition & 1 deletion provisioning/roles/docker/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
# Options passed to the docker daemon at start
docker_opts: ""
docker_opts: "-H 0.0.0.0:2375"
14 changes: 10 additions & 4 deletions provisioning/roles/dockerswarm/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
- name: Swarm create
---
- name: Swarm pull
docker:
name: swarm_cluster
image: swarm
# pull: always
state: present
# command: create
#register: cluster_id

- name: Swarm create
command: docker run --rm swarm create
register: cluster_id
when: ansible_fqdn == swarm.cluster

- name: debug stuff
debug: msg="{{cluster_id.stdout_lines}}"
4 changes: 4 additions & 0 deletions provisioning/roles/dockerswarm/tasks/node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- name: start swarm agents
command: docker run -d swarm join --addr="{{ansible_eth1.ipv4.address}}":2375 token://"{{ cluster_id }}"
when: "{{ cluster_id}}" is defined

0 comments on commit f013a45

Please sign in to comment.