Merge pull request #2 from ninthnails/master

Add support for RedHat based systems

.travis.yml

@@ -0,0 +1,23 @@
+---
+language: python
+python: "2.7"
+
+env:
+  - SITE=playbook.yml
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install curl -y
+
+install:
+  - pip install -U ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i ci/inventory ci/$SITE --syntax-check"
+
+  # Run the ansible ci playbook
+  - "ansible-playbook -i ci/inventory ci/playbook.yml --connection=local --sudo -vvvv"

ci/inventory

@@ -0,0 +1,2 @@
+[local]
+localhost

ci/playbook.yml

@@ -0,0 +1,13 @@
+---
+#
+# Test Playbook
+#
+
+- hosts: localhost
+  connection: local
+  sudo: yes
+
+  roles:
+    - {role: ../../}
+
+- include: tests.yml

ci/tests.yml

@@ -0,0 +1,11 @@
+---
+
+- hosts: localhost
+  connection: local
+  sudo: yes
+  gather_facts: false
+
+  tasks:
+    - command: docker run hello-world
+      register: status
+      failed_when: status.rc != 0

vars/main.yml → defaults/main.yml

@@ -1,10 +1,8 @@
 ---
 docker_playbook_version: "0.1.2"
 
-# replace with gist variant
-docker_repo_key: "36A1D7869245C8950F966E92D8576A8BA88D21E9"
-docker_repo: "https://get.docker.io/ubuntu"
 docker_opts: ''
+docker_create_group: true
 
 ##### ---
 # Want to advertise the tcp port? Enable below.

tasks/Debian.yml

@@ -20,13 +20,6 @@
   with_items:
     - lxc-docker
 
-- name: Docker default config file
-  template: src=docker-defaults.j2 dest=/etc/default/docker
-
-- name: Docker init file
-  template: src=docker-init.j2 dest=/etc/init/docker.conf
-  notify: Restart Docker
-
 # consider seperate role here
 - name: Change ufw forward policy to ACCEPT
   command: sed -i 's/DEFAULT_FORWARD_POLICY="DROP"/DEFAULT_FORWARD_POLICY="ACCEPT"/g' /etc/default/ufw

tasks/RedHat.yml

@@ -0,0 +1,7 @@
+
+- name: Install Docker Repository
+  template: src=docker-repo.j2 dest=/etc/yum.repos.d/docker.repo
+
+- name: Install Docker Engine
+  yum: name=docker-engine state=present
+

tasks/init.yml

@@ -0,0 +1,33 @@
+
+- name: Check if /etc/init exists
+  stat: path=/etc/init/
+  register: etc_init
+
+- name: Docker upstart default config file
+  template: src=docker-defaults.j2 dest=/etc/default/docker
+  when: etc_init.stat.exists == true
+  notify: 
+    - Restart Docker
+
+- name: Docker init file
+  template: src=docker-init.j2 dest=/etc/init/docker.conf
+  when: etc_init.stat.exists == true
+  notify: 
+    - Restart Docker
+
+- name: Check if systemd exists
+  stat: path=/usr/lib/systemd/system/
+  register: systemd_check
+
+- name: Docker systemd default config file
+  template: src=docker-sysconfig.j2 dest=/etc/sysconfig/docker
+  when: systemd_check.stat.exists == true
+  notify: 
+    - Restart Docker
+
+- name: Docker systemd file
+  template: src=docker-service.j2 dest=/lib/systemd/system/docker.service backup=yes
+  when: systemd_check.stat.exists == true
+  notify: 
+    - Restart Docker
+

tasks/main.yml

@@ -1,3 +1,17 @@
 ---
+
+- include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Create docker group
+  group: name=docker state=present system=yes
+  when: docker_create_group
+  tags:
+    - config
+
 - include: Debian.yml
   when: ansible_os_family == "Debian"
+
+- include: RedHat.yml
+  when: ansible_os_family == "RedHat"
+
+- include: init.yml

templates/docker-defaults.j2

@@ -1,3 +1,3 @@
 # Generated by Ansible for {{ansible_fqdn}}
 
-DOCKER_OPTS={{docker_opts}}
+DOCKER_OPTS={{docker_opts}}

templates/docker-repo.j2

@@ -0,0 +1,6 @@
+[dockerrepo]
+name=Docker Repository
+baseurl={{ docker_yum_repo }}
+enabled=1
+gpgcheck=1
+gpgkey=https://yum.dockerproject.org/gpg

templates/docker-service.j2

@@ -0,0 +1,20 @@
+# {{ansible_managed}}
+
+[Unit]
+Description=Docker Application Container Engine
+Documentation=https://docs.docker.com
+After=network.target docker.socket
+Requires=docker.socket
+
+[Service]
+Type=notify
+EnvironmentFile=-/etc/sysconfig/docker
+ExecStart=/usr/bin/docker -d -H fd:// $OPTIONS
+MountFlags=slave
+LimitNOFILE=1048576
+LimitNPROC=1048576
+LimitCORE=infinity
+
+[Install]
+WantedBy=multi-user.target
+Also=docker.socket

templates/docker-sysconfig.j2

@@ -0,0 +1,6 @@
+# {{ansible_managed}}
+
+OPTIONS={{docker_opts}}
+
+# CentOS 6, RHEL 6
+other_args={{docker_opts}}

vars/Debian.yml

@@ -0,0 +1,3 @@
+# replace with gist variant
+docker_repo_key: "36A1D7869245C8950F966E92D8576A8BA88D21E9"
+docker_repo: "https://get.docker.io/ubuntu"

vars/RedHat.yml

@@ -0,0 +1,4 @@
+os_version: "{{ ansible_lsb.release if ansible_lsb is defined else ansible_distribution_version }}"
+os_version_major: "{{ os_version | regex_replace('^([0-9]+)[^0-9]*.*', '\\\\1') }}"
+
+docker_yum_repo: "https://yum.dockerproject.org/repo/main/{{ ansible_distribution | lower }}/{{ os_version_major }}"