epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 13:54:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert docker_versioned_pkg dict keys to string

Browse Source 
This will allow to use '-e docker_version=1.12' in ansible playbook
execution. It's also backward-compatible and will work with floating
docker_version format in custom yaml files.

Closes #702
This commit is contained in:
Aleksandr Didenko
2016-12-09 09:17:36 +01:00
parent a80745b5bd
commit ee8d6ab4fc
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/docker/defaults/main.yml
View File

@@ -1,4 +1,4 @@
docker_version: 1.10 docker_version: '1.10'
docker_package_info: docker_package_info:
pkgs: pkgs:

12
roles/docker/vars/debian.yml
View File

@@ -2,16 +2,16 @@ docker_kernel_min_version: '3.2'
# https://apt.dockerproject.org/repo/dists/debian-wheezy/main/filelist # https://apt.dockerproject.org/repo/dists/debian-wheezy/main/filelist
docker_versioned_pkg: docker_versioned_pkg:
latest: docker-engine 'latest': docker-engine
1.9: docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }} '1.9': docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }}
1.10: docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }} '1.10': docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }}
1.11: docker-engine=1.11.2-0~{{ ansible_distribution_release|lower }} '1.11': docker-engine=1.11.2-0~{{ ansible_distribution_release|lower }}
1.12: docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }} '1.12': docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt
pkgs: pkgs:
- name: "{{ docker_versioned_pkg[docker_version] }}" - name: "{{ docker_versioned_pkg[docker_version | string] }}"
force: yes force: yes
docker_repo_key_info: docker_repo_key_info:

12
roles/docker/vars/fedora.yml
View File

@@ -1,16 +1,16 @@
docker_kernel_min_version: '0' docker_kernel_min_version: '0'
docker_versioned_pkg: docker_versioned_pkg:
latest: docker 'latest': docker
1.9: docker-1:1.9.1 '1.9': docker-1:1.9.1
1.10: docker-1:1.10.1 '1.10': docker-1:1.10.1
1.11: docker-1:1.11.2 '1.11': docker-1:1.11.2
1.12: docker-1:1.12.1 '1.12': docker-1:1.12.1
docker_package_info: docker_package_info:
pkg_mgr: dnf pkg_mgr: dnf
pkgs: pkgs:
- name: "{{ docker_versioned_pkg[docker_version] }}" - name: "{{ docker_versioned_pkg[docker_version | string] }}"
docker_repo_key_info: docker_repo_key_info:
pkg_key: '' pkg_key: ''

10
roles/docker/vars/ubuntu-16.04.yml
View File

@@ -1,17 +1,17 @@
--- ---
docker_version: 1.11 docker_version: '1.11'
docker_kernel_min_version: '3.2' docker_kernel_min_version: '3.2'
# https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist # https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist
docker_versioned_pkg: docker_versioned_pkg:
latest: docker-engine 'latest': docker-engine
1.11: docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }} '1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }}
1.12: docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }} '1.12': docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt
pkgs: pkgs:
- name: "{{ docker_versioned_pkg[docker_version] }}" - name: "{{ docker_versioned_pkg[docker_version | string] }}"
force: yes force: yes
docker_repo_key_info: docker_repo_key_info:

12
roles/docker/vars/ubuntu.yml
View File

@@ -3,16 +3,16 @@ docker_kernel_min_version: '3.2'
# https://apt.dockerproject.org/repo/dists/ubuntu-trusty/main/filelist # https://apt.dockerproject.org/repo/dists/ubuntu-trusty/main/filelist
docker_versioned_pkg: docker_versioned_pkg:
latest: docker-engine 'latest': docker-engine
1.9: docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }} '1.9': docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }}
1.10: docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }} '1.10': docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }}
1.11: docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }} '1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }}
1.12: docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }} '1.12': docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt
pkgs: pkgs:
- name: "{{ docker_versioned_pkg[docker_version] }}" - name: "{{ docker_versioned_pkg[docker_version | string] }}"
force: yes force: yes
docker_repo_key_info: docker_repo_key_info: