From d3e0654a57aa958aaef1906e4a759e521655a86b Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 16 Oct 2019 16:25:41 +0000 Subject: Ansible: Role cleanup + Separate and reuse role (better naming) + Cleanup in naming + Introduce defaults that can be overriden Signed-off-by: Peter Mikus Change-Id: Iedaf7caba1d05a35a6f61cd21a483cdbc0073d32 --- .../inventories/lf_inventory/group_vars/all.yaml | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'resources/tools/testbed-setup/ansible/inventories/lf_inventory') diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml index 68994ec36b..f53584a939 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml @@ -22,25 +22,6 @@ name_servers: "1.1.1.1, 8.8.8.8" # no_proxy: localhost,127.0.0.1,{{ ansible_default_ipv4.address }} # NO_PROXY: localhost,127.0.0.1,{{ ansible_default_ipv4.address }} -# Docker settings. -docker_edition: 'ce' -docker_channel: 'edge' -docker_version: '18.05.0' -docker_users: ['testuser'] -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 }}' -docker_daemon_environment_http: - - 'HTTP_PROXY={{ proxy_env.http_proxy }}' - - 'NO_PROXY={{ proxy_env.no_proxy }}' -docker_daemon_environment_https: - - 'HTTPS_PROXY={{ proxy_env.https_proxy }}' - - 'NO_PROXY={{ proxy_env.no_proxy }}' - -# Kubernetes settings. -kubernetes: - version: '1.11.0-00' - repository: 'deb http://apt.kubernetes.io/ kubernetes-xenial main' - # TRex settings. trex: target_dir: '/opt' -- cgit 1.2.3-korg