X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Ftg_sut%2Fdefaults%2Fmain.yaml;h=3a6f68fb8b3f9e81fba82c809d195284d17b6654;hp=174dc78cb0c61339751272b17ef6e8eca32088f6;hb=ab596c32fdda48aa8140f428710b98d47baf9cae;hpb=d1589ad74e515757fb12cf8a5f976282924afe13 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 174dc78cb0..3a6f68fb8b 100644 --- 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,8 +16,7 @@ docker_daemon_options: [] # - "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 @@ -25,6 +24,5 @@ apt_cache_time: 86400 kubernetes_channel: "main" kubernetes_version: "1.11.0-00" -kubernetes_apt_key: "54A647F9048D5688D7DA2ABE6A030B21BA07F4FB" kubernetes_repository: "deb http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_channel }}" kubernetes_apt_package_name: "{{ kubernetes_version }}"