diff options
Diffstat (limited to 'fdio.infra.ansible/roles')
6 files changed, 3 insertions, 66 deletions
diff --git a/fdio.infra.ansible/roles/docker/defaults/main.yaml b/fdio.infra.ansible/roles/docker/defaults/main.yaml index e0338fb5ad..bb22541f7c 100644 --- a/fdio.infra.ansible/roles/docker/defaults/main.yaml +++ b/fdio.infra.ansible/roles/docker/defaults/main.yaml @@ -18,18 +18,4 @@ docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distrib docker_apt_repository_state: present docker_apt_ignore_key_error: true docker_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" -docker_apt_gpg_key_state: present - -# Used only for RedHat/CentOS/Fedora. -docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo -docker_yum_repo_enable_edge: "0" -docker_yum_repo_enable_test: "0" -docker_yum_gpg_key: https://download.docker.com/linux/centos/gpg - -# 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 }}" +docker_apt_gpg_key_state: present
\ No newline at end of file diff --git a/fdio.infra.ansible/roles/docker/handlers/main.yaml b/fdio.infra.ansible/roles/docker/handlers/main.yaml index c8c3328cac..a35a20b662 100644 --- a/fdio.infra.ansible/roles/docker/handlers/main.yaml +++ b/fdio.infra.ansible/roles/docker/handlers/main.yaml @@ -1,7 +1,7 @@ --- # file handlers/main.yaml -- name: Restart Docker +- name: "Restart Docker" ansible.builtin.service: name: "docker" state: "{{ docker_restart_handler_state }}" diff --git a/fdio.infra.ansible/roles/docker/meta/main.yaml b/fdio.infra.ansible/roles/docker/meta/main.yaml index 0a1fe9787b..286406bf38 100644 --- a/fdio.infra.ansible/roles/docker/meta/main.yaml +++ b/fdio.infra.ansible/roles/docker/meta/main.yaml @@ -14,6 +14,7 @@ galaxy_info: - name: "Ubuntu" versions: - "jammy" + - "noble" - name: "Debian" versions: - "bookworm" diff --git a/fdio.infra.ansible/roles/docker/tasks/main.yaml b/fdio.infra.ansible/roles/docker/tasks/main.yaml index 4146dbbadf..25c9ea42ec 100644 --- a/fdio.infra.ansible/roles/docker/tasks/main.yaml +++ b/fdio.infra.ansible/roles/docker/tasks/main.yaml @@ -30,16 +30,6 @@ tags: - docker-conf-service -- name: "Docker Service Directory" - ansible.builtin.file: - path: "/etc/systemd/system/docker.service.d" - state: "directory" - mode: "0755" - when: - - docker_service_mgr == "systemd" - tags: - - docker-conf-service - - name: "Configure Docker Daemon" ansible.builtin.template: src: "templates/daemon.json.j2" @@ -55,37 +45,5 @@ tags: - docker-conf-daemon -- name: "Configure Docker HTTP Proxy" - ansible.builtin.template: - src: "templates/docker.service.proxy.http" - dest: "/etc/systemd/system/docker.service.d/http-proxy.conf" - owner: "root" - group: "root" - mode: "0644" - notify: - - "Restart Docker" - when: > - proxy_env is defined and - proxy_env.http_proxy is defined and - docker_service_mgr == "systemd" - tags: - - docker-conf-service - -- name: "Configure Docker HTTPS Proxy" - ansible.builtin.template: - src: "templates/docker.service.proxy.https" - dest: "/etc/systemd/system/docker.service.d/https-proxy.conf" - owner: "root" - group: "root" - mode: "0644" - notify: - - "Restart Docker" - when: > - proxy_env is defined and - proxy_env.https_proxy is defined and - docker_service_mgr == "systemd" - tags: - - docker-conf-service - - name: "Meta - Flush handlers" ansible.builtin.meta: flush_handlers diff --git a/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.http b/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.http deleted file mode 100644 index 73ceba3870..0000000000 --- a/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.http +++ /dev/null @@ -1,4 +0,0 @@ -# {{ ansible_managed }} - -[Service] -Environment="{{ docker_daemon_environment_http | join('" "') }}" diff --git a/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.https b/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.https deleted file mode 100644 index 1c2097eb9d..0000000000 --- a/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.https +++ /dev/null @@ -1,4 +0,0 @@ -# {{ ansible_managed }} - -[Service] -Environment="{{ docker_daemon_environment_https | join('" "') }}" |