diff --git a/Vagrantfile b/Vagrantfile index 1e14d4c..f6cca82 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,12 +2,24 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| - config.vm.box = "centos/7" config.vm.provider "virtualbox" do |vb| vb.memory = "512" end - config.vm.provision "ansible" do |ansible| - ansible.playbook = "tests/vagrant.yml" + config.vm.define "centos" do |machine| + machine.vm.box = "minimal/centos7" + machine.vm.provision "shell", inline: "yum update -y" + machine.vm.provision "ansible" do |ansible| + ansible.playbook = "tests/vagrant.yml" + end end + + config.vm.define "debian" do |machine| + machine.vm.box = "minimal/jessie64" + machine.vm.provision "shell", inline: "apt-get update && apt-get install -y python" + machine.vm.provision "ansible" do |ansible| + ansible.playbook = "tests/vagrant.yml" + end + end + end diff --git a/files/docker.apt.repo b/files/docker.apt.repo new file mode 100644 index 0000000..37bccd1 --- /dev/null +++ b/files/docker.apt.repo @@ -0,0 +1 @@ +deb https://apt.dockerproject.org/repo debian-jessie main diff --git a/meta/main.yml b/meta/main.yml index 23f7c66..b8d1ecc 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -8,6 +8,9 @@ galaxy_info: - name: EL versions: - 7 + - name: Debian + versions: + - jessie galaxy_tags: - docker - swarm diff --git a/tasks/main.yml b/tasks/main.yml index fe9d22e..485635e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,6 +9,9 @@ notify: - restart docker +- name: ensure base folder for unit file is present + file: path=/usr/lib/systemd/system state=directory + - name: ensure unit file is present & up to date copy: src=files/docker.service dest=/usr/lib/systemd/system/docker.service notify: diff --git a/tasks/os/Debian.yml b/tasks/os/Debian.yml new file mode 100644 index 0000000..dc108d1 --- /dev/null +++ b/tasks/os/Debian.yml @@ -0,0 +1,19 @@ +--- +- name: ensure docker dependencies are installed + apt: name={{ item }} state=present + with_items: + - apt-transport-https + - ca-certificates + +- name: ensure Docker GPG key is present + apt_key: id=58118E89F3A912897C070ADBF76221572C52609D keyserver=hkp://p80.pool.sks-keyservers.net:80 + +- name: ensure repo is present + copy: src=files/docker.apt.repo dest=/etc/apt/sources.list.d/docker.list + register: repofile + +- name: ensure apt cache is updated + apt: update_cache=yes + +- name: ensure docker is installed + apt: name=docker-engine state=present