Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to install or not yum repo #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ docker_yum_repo_url: "https://yum.dockerproject.org/repo/main"
docker_yum_repo: "{{ docker_yum_repo_url }}/{{ docker_yum_repo_uris[ansible_distribution] }}"
docker_yum_repo_gpg: 'https://yum.dockerproject.org/gpg'
docker_yum_package: "docker-engine{{ '-' + docker_version if docker_version else '' }}"
# Optionally install yum repo file
docker_yum_install_repo: yes

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ninthnails please update yes to true to be consistent with rest of the options

# Prior to 1.9, starting Docker engine as daemon use flag '-d' was used, now it's 'daemon' argument
docker_daemon_opts: "{{ 'daemon' if docker_version == '' or docker_version | version_compare('1.9', '>=') else '-d' }}{{ ' -H fd://' if ansible_os_family == 'RedHat' else ''}}"
Expand Down
1 change: 1 addition & 0 deletions tasks/RedHat.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

- name: Install Docker Repository
template: src=docker-repo.j2 dest=/etc/yum.repos.d/docker.repo
when: docker_yum_install_repo == yes

- name: (yum) Install SELinux python bindings
yum: name=libselinux-python state=present
Expand Down