Fixed issues with docker repositories

ystia · Aug 12, 2021 · 83458c0 · 83458c0
1 parent f58a322
commit 83458c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/org/ystia/docker/ansible/playbooks/create.yaml b/org/ystia/docker/ansible/playbooks/create.yaml
@@ -12,13 +12,18 @@
 
   - set_fact:
       # The baseurl of the RedHat/CentOS docker repository.
-      redhat_docker_repository: "{{ REPOSITORY_URL  if (REPOSITORY_URL != '') else ('https://download.docker.com/linux/centos/7/$basearch/stable') }}"
+      redhat_docker_repository: "{{ REPOSITORY_URL  }}"
       redhat_docker_gpgkey: "{{ DOCKER_GPGKEY if (DOCKER_GPGKEY != '') else ('https://download.docker.com/linux/centos/gpg') }}"
       # The baseurl of the Debian/Ubuntu docker repository.
-      debian_docker_repository: "{{ REPOSITORY_URL if (REPOSITORY_URL != '') else ('deb https://download.docker.com/linux/ubuntu xenial stable') }}"
+      debian_docker_repository: "{{ REPOSITORY_URL }}"
       debian_docker_gpgkey: "{{ DOCKER_GPGKEY if (DOCKER_GPGKEY != '') else ('https://download.docker.com/linux/ubuntu/gpg') }}"
       docker_package_name:  "docker-ce{{ '-'  if (DOCKER_VERSION != '') else ('') }}{{ DOCKER_VERSION if (DOCKER_VERSION != '') else ('') }}"
 
+  - set_fact:
+      redhat_docker_repository: "https://download.docker.com/linux/centos/{{ ansible_distribution_major_version }}/$basearch/stable"
+      debian_docker_repository: "deb https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
+    when: REPOSITORY_URL == ""
+
   - name: Add Docker Yum repository
     yum_repository:
       name: docker

diff --git a/org/ystia/docker/ansible/types.yml b/org/ystia/docker/ansible/types.yml
@@ -11,6 +11,7 @@ metadata:
   template_version: 3.0.0-SNAPSHOT
   template_author: Ystia
 
+description: Docker types
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.1.0