From 891f932d2c0928038c7cb77f96ecad6e12c0e81f Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Tue, 10 Sep 2019 08:09:43 +0000
Subject: Ansible: Trex installation

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I5ab8fe05074a842301a511bbd3ab5e67f8d1a9f0
---
 .../testbed-setup/ansible/roles/tg_sut/tasks/main.yaml  |  3 +++
 .../ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml       | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'resources/tools/testbed-setup/ansible/roles/tg_sut')

diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
index f586e871c7..7f74beec51 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
@@ -3,13 +3,16 @@
 
 - name: Install distribution - release - machine prerequisites
   include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml'
+  tags: [ install-csit-dependencies, install-docker, install-kubernetes ]
 
 - name: Machine specifics
   include_tasks: '{{ ansible_machine }}.yaml'
+  tags: [ disable-turbo-boost, set-grub, install-pip ]
 
 - name: Skylake specific
   import_tasks: skylake.yaml
   when: cpu_microarchitecture == "skylake"
+  tags: [ install-msr, disable-turbo-boost ]
 
 - name: Copy netplan network config file
   template:
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml
index 67c6c17220..6e8dee6cf1 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml
@@ -45,6 +45,7 @@
   file:
     path: '/etc/systemd/system/docker.service.d'
     state: 'directory'
+  tags: install-docker
 
 - name: Setup Docker http proxy
   template:
@@ -55,7 +56,7 @@
     mode: '0644'
   register: docker_register_systemd_service
   when: proxy_env is defined and proxy_env.http_proxy is defined
-  tags: copy-docker
+  tags: install-docker
 
 - name: Setup Docker https proxy
   template:
@@ -66,14 +67,14 @@
     mode: '0644'
   register: docker_register_systemd_service
   when: proxy_env is defined and proxy_env.https_proxy is defined
-  tags: copy-docker
+  tags: install-docker
 
 - name: Reload systemd daemon
   command: 'systemctl daemon-reload'
   notify: ['Restart Docker']
   when: (docker_register_systemd_service and
          docker_register_systemd_service is changed)
-  tags: restart-docker
+  tags: install-docker
 
 - name: Set specific users to docker group
   user:
@@ -82,7 +83,7 @@
     append: True
   with_items: '{{ docker_users }}'
   when: docker_users
-  tags: set-docker
+  tags: install-docker
 
 - name: Add an Apt signing key, for Kubernetes repository
   apt_key:
@@ -92,7 +93,7 @@
 
 - name: Install kubernetes APT repository
   apt_repository:
-    repo: '{{ kubernetes_repository }}'
+    repo: '{{ kubernetes.repository }}'
     state: 'present'
     update_cache: True
   tags: install-kubernetes
@@ -101,9 +102,9 @@
   apt:
     name:
       - 'kubernetes-cni=0.6.0-00'
-      - 'kubeadm={{ kubernetes_apt_package_name }}'
-      - 'kubectl={{ kubernetes_apt_package_name }}'
-      - 'kubelet={{ kubernetes_apt_package_name }}'
+      - 'kubeadm={{ kubernetes.version }}'
+      - 'kubectl={{ kubernetes.version }}'
+      - 'kubelet={{ kubernetes.version }}'
     state: 'present'
     force: yes
   tags: install-kubernetes
-- 
cgit 1.2.3-korg