diff --git a/defaults/main.yml b/defaults/main.yml index 8a2392d..bba89fa 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -28,3 +28,6 @@ docker_yum_repo_enable_test: 0 # A list of users who will be added to the docker group. docker_users: [] + +# Update repositories to be used for download/install +docker_add_repo: true diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 8c6ecc6..7248a1c 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -22,10 +22,11 @@ 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). package: name=curl state=present - when: add_repository_key is failed + when: docker_add_repo and add_repository_key is failed - name: Add Docker apt key (alternative for older systems without SNI). shell: | @@ -33,7 +34,7 @@ curl -sSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - args: warn: false - when: add_repository_key is failed + when: docker_add_repo and add_repository_key is failed tags: - configure_docker_repo @@ -44,3 +45,4 @@ update_cache: true tags: - configure_docker_repo + when: docker_add_repo diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 452c737..eb80863 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -13,6 +13,7 @@ state: present tags: - configure_docker_repo + when: docker_add_repo - name: Add Docker repository. get_url: @@ -23,6 +24,7 @@ mode: 0644 tags: - configure_docker_repo + when: docker_add_repo - name: Configure Docker Edge repo. ini_file: @@ -32,6 +34,7 @@ value: '{{ docker_yum_repo_enable_edge }}' tags: - configure_docker_repo + when: docker_add_repo - name: Configure Docker Test repo. ini_file: @@ -41,3 +44,4 @@ value: '{{ docker_yum_repo_enable_test }}' tags: - configure_docker_repo + when: docker_add_repo