X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=fdio.infra.ansible%2Froles%2Fdocker%2Fdefaults%2Fmain.yaml;h=e493d1c9b506c6ba842be325c0cda874214b0255;hb=refs%2Fchanges%2F06%2F36606%2F5;hp=df9d2c92b6e2b3cc558eaf72dbaf9bfa8233646c;hpb=78a8427cc50c137e5d59ad3448ae128fdda369b2;p=csit.git diff --git a/fdio.infra.ansible/roles/docker/defaults/main.yaml b/fdio.infra.ansible/roles/docker/defaults/main.yaml index df9d2c92b6..e493d1c9b5 100644 --- a/fdio.infra.ansible/roles/docker/defaults/main.yaml +++ b/fdio.infra.ansible/roles/docker/defaults/main.yaml @@ -10,10 +10,11 @@ docker_package_state: latest docker_service_state: started docker_service_enabled: true docker_restart_handler_state: restarted +docker_service_mgr: "" # Used only for Debian/Ubuntu. docker_apt_release_channel: "stable" -docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" +docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable" docker_apt_repository_state: present docker_apt_ignore_key_error: true docker_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" @@ -25,14 +26,10 @@ docker_yum_repo_enable_edge: "0" docker_yum_repo_enable_test: "0" docker_yum_gpg_key: https://download.docker.com/linux/centos/gpg -# A list of users who will be added to the docker group. -docker_users: - - "{{ ansible_user }}" - # Proxy settings. docker_daemon_environment_http: - "HTTP_PROXY={{ proxy_env.http_proxy }}" - "NO_PROXY={{ proxy_env.no_proxy }}" docker_daemon_environment_https: - "HTTPS_PROXY={{ proxy_env.https_proxy }}" - - "NO_PROXY={{ proxy_env.no_proxy }}" \ No newline at end of file + - "NO_PROXY={{ proxy_env.no_proxy }}"