From 06cdd3096dbeeadf75fd4b0784e7edc6d7d45a59 Mon Sep 17 00:00:00 2001 From: Adam DeConinck Date: Thu, 16 May 2019 14:18:36 -0700 Subject: [PATCH] remove tags, the docker_add_repo variable is a better mechanism for this --- tasks/setup-Debian.yml | 6 ------ tasks/setup-RedHat.yml | 8 -------- 2 files changed, 14 deletions(-) diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 7248a1c..af2f21c 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -20,8 +20,6 @@ state: present register: add_repository_key ignore_errors: "{{ docker_apt_ignore_key_error }}" - tags: - - configure_docker_repo when: docker_add_repo - name: Ensure curl is present (on older systems without SNI). @@ -35,14 +33,10 @@ args: warn: false when: docker_add_repo and add_repository_key is failed - tags: - - configure_docker_repo - name: Add Docker repository. apt_repository: repo: "{{ docker_apt_repository }}" state: present update_cache: true - tags: - - configure_docker_repo when: docker_add_repo diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index eb80863..ceab2f1 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -11,8 +11,6 @@ rpm_key: key: https://download.docker.com/linux/centos/gpg state: present - tags: - - configure_docker_repo when: docker_add_repo - name: Add Docker repository. @@ -22,8 +20,6 @@ owner: root group: root mode: 0644 - tags: - - configure_docker_repo when: docker_add_repo - name: Configure Docker Edge repo. @@ -32,8 +28,6 @@ section: 'docker-{{ docker_edition }}-edge' option: enabled value: '{{ docker_yum_repo_enable_edge }}' - tags: - - configure_docker_repo when: docker_add_repo - name: Configure Docker Test repo. @@ -42,6 +36,4 @@ section: 'docker-{{ docker_edition }}-test' option: enabled value: '{{ docker_yum_repo_enable_test }}' - tags: - - configure_docker_repo when: docker_add_repo