Merge pull request #27 from christopherobin/repo/docker

Added docker repo for CentOS 7, fixed tasks to stop spewing errors on Ansible 2.x

README.md

@@ -72,7 +72,7 @@ name                                                                          |
 [`jenkins`](http://jenkins-ci.org/)                                           | `jenkins`
 [`mesophere`](https://www.mesosphere.com/)                                    | `mesosphere`
 [`mongodb`](http://mongodb.org/)                                              | `mongodb`
-[`mysql`](https://www.mysql.fr/products/community/)                           | `mysql56-community` `mysql-connectors-community` `mysql-tools-community` 
+[`mysql`](https://www.mysql.fr/products/community/)                           | `mysql56-community` `mysql-connectors-community` `mysql-tools-community`
 [`nginx`](http://nginx.org/)                                                  | `nginx`
 [`percona`](https://www.percona.com)                                          | `percona-release-x86_64`
 [`postgresql 9.0`](http://yum.postgresql.org/repopackages.php)                | `pgdg90`
@@ -97,6 +97,7 @@ become available.
 name                                                                          | provides
 ------------------------------------------------------------------------------|-----------------------------------------------
 [`couchbase`](http://www.couchbase.com/)                                      | `couchbase`
+[`docker`](https://www.docker.com/)                                           | `dockerrepo`
 [`elasticsearch`](https://www.elastic.co/products/elasticsearch)              | `elasticsearch-2.x`
 [`endpoint`](https://packages.endpoint.com/)                                  | `endpoint`
 [`epel`](https://fedoraproject.org/wiki/EPEL)                                 | `epel`
@@ -133,6 +134,7 @@ name                                                                          |
 name                                                                          | provides
 ------------------------------------------------------------------------------|-----------------------------------------------
 [`backports`](https://packages.debian.org/wheezy-backports/)                  | `backports`
+[`docker`](https://www.docker.com/)                                           | `docker`
 [`dotdeb`](https://www.dotdeb.org)                                            | `dotdeb`
 [`elasticsearch`](https://www.elastic.co/products/elasticsearch)              | `elasticsearch-2.x`
 [`jenkins`](http://jenkins-ci.org/)                                           | `jenkins`
@@ -150,6 +152,7 @@ _nb:_ `deb-src` is not provided. `deb` is only provided.
 name                                                                          | provides
 ------------------------------------------------------------------------------|-----------------------------------------------
 [`backports`](https://packages.debian.org/jessie-backports/)                  | `backports`
+[`docker`](https://www.docker.com/)                                           | `docker`
 [`dotdeb`](https://www.dotdeb.org)                                            | `dotdeb`
 [`elasticsearch`](https://www.elastic.co/products/elasticsearch)              | `elasticsearch-2.x`
 [`jenkins`](http://jenkins-ci.org/)                                           | `jenkins`

files/debian/keys/docker.gpg

@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+EJOQTvBR8Q==
+=Yhur
+-----END PGP PUBLIC KEY BLOCK-----

tasks/amazon.yml

@@ -7,7 +7,7 @@
     group=root
     mode=0644
   when: "item['name']|default(item) in repository_list and 'amazon' in repository_list[item['name']|default(item)]"
-  with_items: repositories['amazon']|default([])
+  with_items: "{{ repositories['amazon']|default([]) }}"
   tags:
     - files
     - repos
@@ -20,7 +20,7 @@
     group=root
     mode=0644
   when: "item['name']|default(item) in repository_list and 'amazon' in repository_list[item['name']|default(item)] and 'key' in repository_list[item['name']|default(item)]['amazon']"
-  with_items: repositories['amazon']|default([])
+  with_items: "{{ repositories['amazon']|default([]) }}"
   tags:
     - files
     - repos
@@ -33,7 +33,7 @@
     group=root
     mode=0644
   when: "'amazon' in remote_repositories and item.endswith('repo')"
-  with_items: remote_repositories['amazon']|default([])
+  with_items: "{{ remote_repositories['amazon']|default([]) }}"
   tags:
     - files
     - repos
@@ -43,7 +43,7 @@
     name="{{item}}"
     state="present"
   when: "'amazon' in remote_repositories and item.endswith('rpm')"
-  with_items: remote_repositories['amazon']|default([])
+  with_items: "{{ remote_repositories['amazon']|default([]) }}"
   tags:
     - files
     - repos

tasks/centos.yml

@@ -7,7 +7,7 @@
     group=root
     mode=0644
   when: "item['name']|default(item) in repository_list and centos_distribution in repository_list[item['name']|default(item)] and repository_list[item['name']|default(item)][centos_distribution]['repo'] is defined"
-  with_items: repositories[centos_distribution]|default([])
+  with_items: "{{ repositories[centos_distribution]|default([]) }}"
   tags:
     - files
     - repos
@@ -20,7 +20,7 @@
     group=root
     mode=0644
   when: "item['name']|default(item) in repository_list and centos_distribution in repository_list[item['name']|default(item)] and 'key' in repository_list[item['name']|default(item)][centos_distribution]"
-  with_items: repositories[centos_distribution]|default([])
+  with_items: "{{ repositories[centos_distribution]|default([]) }}"
   tags:
     - files
     - repos
@@ -30,15 +30,15 @@
     name="{{ repository_list[item['name']|default(item)][centos_distribution]['url'] }}"
     state=present
   when: "item['name']|default(item) in repository_list and repository_list[item['name']|default(item)][centos_distribution]['url'] is defined and repository_list[item['name']|default(item)][centos_distribution]['url'].endswith('rpm')"
-  with_items: repositories[centos_distribution]|default([])
+  with_items: "{{ repositories[centos_distribution]|default([]) }}"
   tags:
     - files
     - repos
 
 - name: "Ensure repositories from defined rpms are disabled by default, unless specified to be enabled."
   command: "yum-config-manager --disable {{ item }}"
   when: "item['name']|default(item) in repository_list and repository_list[item['name']|default(item)][centos_distribution]['url'] is defined and repository_list[item['name']|default(item)][centos_distribution]['url'].endswith('rpm')"
-  with_items: repositories[centos_distribution]|default([])
+  with_items: "{{ repositories[centos_distribution]|default([]) }}"
   tags:
     - files
     - repos
@@ -51,7 +51,7 @@
     group=root
     mode=0644
   when: centos_distribution in remote_repositories and item.endswith('repo')
-  with_items: remote_repositories[centos_distribution]|default([])
+  with_items: "{{ remote_repositories[centos_distribution]|default([]) }}"
   tags:
     - files
     - repos
@@ -61,7 +61,7 @@
     name="{{item}}"
     state="present"
   when: centos_distribution in remote_repositories and item.endswith('rpm')
-  with_items: remote_repositories[centos_distribution]|default([])
+  with_items: "{{ remote_repositories[centos_distribution]|default([]) }}"
   tags:
     - files
     - repos

tasks/debian.yml

@@ -7,7 +7,7 @@
     group=root
     mode=0644
   when: "item['name']|default(item) in repository_list and debian_distribution in repository_list[item['name']|default(item)] and repository_list[item][debian_distribution]['key'] is defined"
-  with_items: repositories[debian_distribution]|default([])
+  with_items: "{{ repositories[debian_distribution]|default([]) }}"
   tags:
     - files
     - repos
@@ -16,7 +16,7 @@
   apt_key: >
     file="/tmp/{{ repository_list[item][debian_distribution]['key'] }}"
   when: "item['name']|default(item) in repository_list and debian_distribution in repository_list[item['name']|default(item)] and repository_list[item][debian_distribution]['key'] is defined"
-  with_items: repositories[debian_distribution]|default([])
+  with_items: "{{ repositories[debian_distribution]|default([]) }}"
   tags:
     - files
     - repos
@@ -26,7 +26,15 @@
     path="/tmp/{{ repository_list[item][debian_distribution]['key'] }}"
     state=absent
   when: "item['name']|default(item) in repository_list and debian_distribution in repository_list[item['name']|default(item)] and repository_list[item][debian_distribution]['key'] is defined"
-  with_items: repositories[debian_distribution]|default([])
+  with_items: "{{ repositories[debian_distribution]|default([]) }}"
+  tags:
+    - files
+    - repos
+
+- name: "Check that we have the proper apt transports"
+  apt: pkg=apt-transport-https state=present update_cache=yes
+  when: "item['name']|default(item) in repository_list and debian_distribution in repository_list[item['name']|default(item)] and repository_list[item][debian_distribution]['url']|match('https.*')"
+  with_items: "{{ repositories[debian_distribution]|default([]) }}"
   tags:
     - files
     - repos
@@ -37,7 +45,7 @@
     repo="deb {{ repository_list[item][debian_distribution]['url'] }} {{ repository_list[item][debian_distribution]['pool'] }}"
     update_cache=no
   when: "item['name']|default(item) in repository_list and debian_distribution in repository_list[item['name']|default(item)]"
-  with_items: repositories[debian_distribution]|default([])
+  with_items: "{{ repositories[debian_distribution]|default([]) }}"
   tags:
     - files
     - repos

tasks/main.yml

@@ -1,16 +1,21 @@
 # Install repositories
 
 - include: amazon.yml
+  static: no
   when: "ansible_distribution == 'Amazon'"
 
 - include: centos.yml centos_distribution='centos6'
+  static: no
   when: "ansible_distribution == 'CentOS' and ansible_distribution_major_version|int == 6"
 
 - include: centos.yml centos_distribution='centos7'
+  static: no
   when: "ansible_distribution == 'CentOS' and ansible_distribution_major_version|int == 7"
 
 - include: debian.yml debian_distribution='wheezy'
+  static: no
   when: "ansible_distribution == 'Debian' and ansible_distribution_major_version|int == 7"
 
 - include: debian.yml debian_distribution='jessie'
+  static: no
   when: "ansible_distribution == 'Debian' and ansible_distribution_major_version|int == 8"

templates/centos7/docker.repo.j2

@@ -0,0 +1,6 @@
+[dockerrepo]
+name=Docker Repository
+baseurl=https://yum.dockerproject.org/repo/main/centos/7/
+enabled={{item['enabled']|default(0)}}
+gpgcheck=1
+gpgkey=https://yum.dockerproject.org/gpg

vars/main.yml

@@ -11,6 +11,13 @@ repository_list:
       repo: couchbase.repo
     centos7:
       repo: couchbase.repo
+  docker:
+    centos7:
+      repo: docker.repo
+    jessie:
+      key: "docker.gpg"
+      url: "https://apt.dockerproject.org/repo"
+      pool: "debian-{{ ansible_distribution_release }} main"
   dotdeb:
     wheezy:
       key: "dotdeb.gpg"