Merge pull request #534 from hollow/no-nightly

Remove broken nightly repo

Author: geerlingguy

README.md

@@ -103,12 +103,11 @@ You can change `docker_apt_gpg_key` to a different url if you are behind a firew
 
 ```yaml
 docker_yum_repo_url: "{{ docker_repo_url }}/{{ 'fedora' if ansible_facts.distribution == 'Fedora' else 'rhel' if ansible_facts.distribution == 'RedHat' else 'centos' }}/docker-{{ docker_edition }}.repo"
-docker_yum_repo_enable_nightly: '0'
 docker_yum_repo_enable_test: '0'
 docker_yum_gpg_key: "{{ docker_repo_url }}/{{ 'fedora' if ansible_facts.distribution == 'Fedora' else 'rhel' if ansible_facts.distribution == 'RedHat' else 'centos' }}/gpg"
 ```
 
-(Used only for RedHat/CentOS.) You can enable the Nightly or Test repo by setting the respective vars to `1`.
+(Used only for RedHat/CentOS.) You can enable the Test repo by setting the respective vars to `1`.
 
 You can change `docker_yum_gpg_key` to a different url if you are behind a firewall or provide a trustworthy mirror.
 Usually in combination with changing `docker_yum_repository` as well.

defaults/main.yml

@@ -54,7 +54,6 @@ docker_apt_filename: "docker"
 
 # Used only for RedHat/CentOS/Fedora.
 docker_yum_repo_url: "{{ docker_repo_url }}/{{ 'fedora' if ansible_facts.distribution == 'Fedora' else 'rhel' if ansible_facts.distribution == 'RedHat' else 'centos' }}/docker-{{ docker_edition }}.repo"
-docker_yum_repo_enable_nightly: '0'
 docker_yum_repo_enable_test: '0'
 docker_yum_gpg_key: "{{ docker_repo_url }}/{{ 'fedora' if ansible_facts.distribution == 'Fedora' else 'rhel' if ansible_facts.distribution == 'RedHat' else 'centos' }}/gpg"
 

tasks/setup-RedHat.yml

@@ -13,28 +13,25 @@
 - name: Add Docker repository.
   get_url:
     url: "{{ docker_yum_repo_url }}"
-    dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
+    dest: "/etc/yum.repos.d/docker-{{ docker_edition }}.repo"
     owner: root
     group: root
     mode: 0644
   when: docker_add_repo | bool
 
-- name: Configure Docker Nightly repo.
+- name: Remove Docker Nightly repo.
   ini_file:
-    dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
-    section: 'docker-{{ docker_edition }}-nightly'
-    option: enabled
-    value: '{{ docker_yum_repo_enable_nightly }}'
-    mode: 0644
-    no_extra_spaces: true
+    dest: "/etc/yum.repos.d/docker-{{ docker_edition }}.repo"
+    section: "docker-{{ docker_edition }}-nightly"
+    state: absent
   when: docker_add_repo | bool
 
 - name: Configure Docker Test repo.
   ini_file:
-    dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
-    section: 'docker-{{ docker_edition }}-test'
+    dest: "/etc/yum.repos.d/docker-{{ docker_edition }}.repo"
+    section: "docker-{{ docker_edition }}-test"
     option: enabled
-    value: '{{ docker_yum_repo_enable_test }}'
+    value: "{{ docker_yum_repo_enable_test }}"
     mode: 0644
     no_extra_spaces: true
   when: docker_add_repo | bool