Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Report: Configure for 1901.09
[csit.git]
/
resources
/
tools
/
testbed-setup
/
ansible
/
roles
/
tg_sut
/
defaults
/
main.yaml
diff --git
a/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
b/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
index
cefc496
..
3a6f68f
100644
(file)
--- a/
resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
+++ b/
resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
@@
-16,15
+16,13
@@
docker_daemon_options: []
# - "NO_PROXY=localhost,127.0.0.1"
docker_daemon_environment: []
# - "NO_PROXY=localhost,127.0.0.1"
docker_daemon_environment: []
-docker_apt_key: "9DC858229FC7DD38854AE2D88D81803C0EBFCD88"
-docker_repository: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_channel }}"
+docker_repository: "deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_channel }}"
docker_apt_package_name: "{{ docker_version }}~{{ docker_edition }}~3-0~{{ ansible_distribution | lower }}"
apt_cache_time: 86400
kubernetes_channel: "main"
docker_apt_package_name: "{{ docker_version }}~{{ docker_edition }}~3-0~{{ ansible_distribution | lower }}"
apt_cache_time: 86400
kubernetes_channel: "main"
-kubernetes_version: "1.1
0.3
"
+kubernetes_version: "1.1
1.0-00
"
-kubernetes_apt_key: "54A647F9048D5688D7DA2ABE6A030B21BA07F4FB"
kubernetes_repository: "deb http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_channel }}"
kubernetes_repository: "deb http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_channel }}"
-kubernetes_apt_package_name: "{{ kubernetes_version }}
-00
"
+kubernetes_apt_package_name: "{{ kubernetes_version }}"