From f63e36780bef01b1a9c45d0f523ea4124f791aec Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 6 Aug 2019 18:34:19 +0100 Subject: [PATCH] Remove support for Docker legacy packages Docker is now always installed using the community edition (CE) packages. Change-Id: I8c3fe44fd9d2da99b5bb1c0ec3472d7e1b5fb295 --- ansible/roles/baremetal/defaults/main.yml | 50 ++++--------------- .../bootstrap-servers.rst | 10 ++-- ...remove-legacy-docker-3c7d6b9568474e3a.yaml | 6 +++ 3 files changed, 18 insertions(+), 48 deletions(-) create mode 100644 releasenotes/notes/remove-legacy-docker-3c7d6b9568474e3a.yaml diff --git a/ansible/roles/baremetal/defaults/main.yml b/ansible/roles/baremetal/defaults/main.yml index 4904b33caa..2072bd48ca 100644 --- a/ansible/roles/baremetal/defaults/main.yml +++ b/ansible/roles/baremetal/defaults/main.yml @@ -2,51 +2,19 @@ # Whether to enable a package repository for Docker. enable_docker_repo: true -# Whether to use the legacy Docker packages at dockerproject.org instead of the -# newer packages at docker.com. -docker_legacy_packages: false - # Docker APT repository configuration. -docker_apt_url: "{% if docker_legacy_packages | bool %}{{ docker_legacy_apt_url }}{% else %}{{ docker_new_apt_url }}{% endif %}" -docker_apt_repo: "{% if docker_legacy_packages | bool %}{{ docker_legacy_apt_repo }}{% else %}{{ docker_new_apt_repo }}{% endif %}" -docker_apt_key_file: "{% if docker_legacy_packages | bool %}{{ docker_legacy_apt_key_file }}{% else %}{{ docker_new_apt_key_file }}{% endif %}" -docker_apt_key_id: "{% if docker_legacy_packages | bool %}{{ docker_legacy_apt_key_id }}{% else %}{{ docker_new_apt_key_id }}{% endif %}" -docker_apt_package: "{% if docker_legacy_packages | bool %}{{ docker_legacy_apt_package }}{% else %}{{ docker_new_apt_package }}{% endif %}" - -# Docker APT repository configuration when docker_legacy_packages is false. -docker_new_apt_url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}" -docker_new_apt_repo: "deb {{ docker_new_apt_url }} {{ ansible_lsb.codename }} stable" -docker_new_apt_key_file: "gpg" -docker_new_apt_key_id: "0EBFCD88" -docker_new_apt_package: "docker-ce" - -# Docker APT repository configuration when docker_legacy_packages is true. -docker_legacy_apt_url: "{{ 'http://obs.linaro.org/ERP:/17.12/Debian_9' if ansible_architecture == 'aarch64' else 'https://apt.dockerproject.org' }}" -docker_legacy_apt_repo: "{{ docker_legacy_apt_repo_aarch64 if ansible_architecture == 'aarch64' else docker_legacy_apt_repo_x86_64 }}" -docker_legacy_apt_repo_x86_64: "deb {{ docker_apt_url }}/repo {{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }} main" -docker_legacy_apt_repo_aarch64: "deb {{ docker_apt_url }} ./" -docker_legacy_apt_key_file: "{{ 'Release.key' if ansible_architecture == 'aarch64' else 'gpg' }}" -docker_legacy_apt_key_id: "{{ 'C32DA102AD89C2BE' if ansible_architecture == 'aarch64' else 'F76221572C52609D' }}" -docker_legacy_apt_package: "{{ 'docker-ce' if ansible_architecture == 'aarch64' else 'docker-engine=1.12.*' }}" +docker_apt_url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}" +docker_apt_repo: "deb {{ docker_apt_url }} {{ ansible_lsb.codename }} stable" +docker_apt_key_file: "gpg" +docker_apt_key_id: "0EBFCD88" +docker_apt_package: "docker-ce" # Docker Yum repository configuration. -docker_yum_url: "{% if docker_legacy_packages | bool %}{{ docker_legacy_yum_url }}{% else %}{{ docker_new_yum_url }}{% endif %}" -docker_yum_baseurl: "{% if docker_legacy_packages | bool %}{{ docker_legacy_yum_baseurl }}{% else %}{{ docker_new_yum_baseurl }}{% endif %}" -docker_yum_gpgkey: "{% if docker_legacy_packages | bool %}{{ docker_legacy_yum_gpgkey }}{% else %}{{ docker_new_yum_gpgkey }}{% endif %}" +docker_yum_url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}" +docker_yum_baseurl: "{{ docker_yum_url }}/{{ ansible_distribution_major_version | lower }}/$basearch/stable" +docker_yum_gpgkey: "{{ docker_yum_url }}/gpg" docker_yum_gpgcheck: true -docker_yum_package: "{% if docker_legacy_packages | bool %}{{ docker_legacy_yum_package }}{% else %}{{ docker_new_yum_package }}{% endif %}" - -# Docker Yum repository configuration when docker_legacy_packages is false. -docker_new_yum_url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}" -docker_new_yum_baseurl: "{{ docker_yum_url }}/{{ ansible_distribution_major_version | lower }}/$basearch/stable" -docker_new_yum_gpgkey: "{{ docker_yum_url }}/gpg" -docker_new_yum_package: "docker-ce" - -# Docker Yum repository configuration when docker_legacy_packages is true. -docker_legacy_yum_url: "https://yum.dockerproject.org" -docker_legacy_yum_baseurl: "{{ docker_legacy_yum_url }}/repo/main/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version | lower }}" -docker_legacy_yum_gpgkey: "{{ docker_legacy_yum_url }}/gpg" -docker_legacy_yum_package: "docker-engine-1.12.0" +docker_yum_package: "docker-ce" customize_etc_hosts: True diff --git a/doc/source/reference/deployment-and-bootstrapping/bootstrap-servers.rst b/doc/source/reference/deployment-and-bootstrapping/bootstrap-servers.rst index 3075ff3878..7b9a03f195 100644 --- a/doc/source/reference/deployment-and-bootstrapping/bootstrap-servers.rst +++ b/doc/source/reference/deployment-and-bootstrapping/bootstrap-servers.rst @@ -145,15 +145,11 @@ Package repositories -------------------- If the ``enable_docker_repo`` flag is set, then a package repository for Docker -packages will be configured. There are two sets of package repositories -provided by Docker - 'legacy' packages from https://dockerproject.org, and new -'Community Edition' packages from https://download.docker.com. To use legacy -packages, set ``docker_legacy_packages`` to ``true``, or to use new packages -set it to ``false``. The new packages are used by default. +packages will be configured. Kolla Ansible uses the +'Community Edition' packages from https://download.docker.com. Various other configuration options are available beginning -``docker[_(new|legacy)]_(apt|yum)_``. Typically these do not need to be -changed. +``docker_(apt|yum)_``. Typically these do not need to be changed. Configuration ------------- diff --git a/releasenotes/notes/remove-legacy-docker-3c7d6b9568474e3a.yaml b/releasenotes/notes/remove-legacy-docker-3c7d6b9568474e3a.yaml new file mode 100644 index 0000000000..84927c086e --- /dev/null +++ b/releasenotes/notes/remove-legacy-docker-3c7d6b9568474e3a.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Removes support for using the legacy Docker packages, and the variable + ``docker_legacy_packages``. Docker is now always installed using the + Community Edition (CE) packages.