From 2cfc1f2d67103726140b32b5a5c555f7a66636be Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Thu, 17 Jun 2021 17:10:38 -0700
Subject: Move topology-manager configuration to kubespray

The steps performed by the existing ansible playbook can be
performed directly by kubespray.  In addtion, fix and enable the
topology-manager.sh test.

Issue-ID: MULTICLOUD-1324
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Iee2197c1fc3e35288796399cccff0d3ae0925a6c
---
 .../playbooks/configure-topology-manager.yml       | 66 ----------------------
 kud/deployment_infra/playbooks/kud-vars.yml        |  7 ---
 2 files changed, 73 deletions(-)
 delete mode 100644 kud/deployment_infra/playbooks/configure-topology-manager.yml

(limited to 'kud/deployment_infra')

diff --git a/kud/deployment_infra/playbooks/configure-topology-manager.yml b/kud/deployment_infra/playbooks/configure-topology-manager.yml
deleted file mode 100644
index 012bc8b0..00000000
--- a/kud/deployment_infra/playbooks/configure-topology-manager.yml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2020
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-- hosts: kube-node
-  tasks:
-    - name: Load kud variables
-      include_vars:
-        file: kud-vars.yml
-
-    - name: creating kubelet config
-      become: yes
-      blockinfile:
-        path: "{{ kubernetes_config_file }}"
-        marker: "# {mark} OpenNESS configuration - General"
-        create: yes
-        block: |
-          featureGates:
-            TopologyManager: {{ False if topology_manager.policy == 'none' else True }}
-      notify:
-      - enable and restart kubelet
-
-    - name: customize kubelet config - CPU Manager
-      become: yes
-      blockinfile:
-        path: "{{ kubernetes_config_file }}"
-        marker: "# {mark} OpenNESS configuration - CPU Manager"
-        block: |
-          cpuManagerPolicy: {{ cpu_manager.policy }}
-        state: "{{ 'present' if cpu_manager.policy == 'static' else 'absent' }}"
-      notify:
-      - remove cpu manager checkpoint file
-      - enable and restart kubelet
-
-    - name: customize kubelet config - Topology Manager
-      become: yes
-      blockinfile:
-        path: "{{ kubernetes_config_file }}"
-        marker: "# {mark} OpenNESS configuration - Topology Manager"
-        block: |
-          topologyManagerPolicy: {{ topology_manager.policy }}
-        state: "{{ 'absent' if topology_manager.policy == 'none' else 'present' }}"
-      notify:
-      - enable and restart kubelet
-
-  handlers:
-    - name: enable and restart kubelet
-      become: yes
-      systemd:
-        name: kubelet
-        daemon_reload: yes
-        enabled: yes
-        masked: no
-        state: restarted
-
-    - name: remove cpu manager checkpoint file
-      become: yes
-      file:
-        path: "{{ cpu_manager.checkpoint_file }}"
-        state: absent
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index 24a9ef98..35057f5b 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -78,13 +78,6 @@ optane_ipmctl_version: 02.00.00.3474
 optane_ipmctl_url: "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/ipmctl/{{ optane_package }}.tar.xz"
 optane_ipmctl_package: ipmctl_02.00.00.3474+really01.00.00.3469.orig
 
-kubernetes_config_file: "/etc/kubernetes/kubelet-config.yaml"
-cpu_manager:
-  policy: "static" # Options: none (disabled), static (default)
-  checkpoint_file: "/var/lib/kubelet/cpu_manager_state"
-topology_manager:
-  policy: "best-effort" # Options: none (disabled), best-effort (default), restricted, single-numa-node
-
 emco_git_url: "https://github.com/open-ness/EMCO.git"
 emco_repository: "integratedcloudnative/"
 emco_version: "openness-21.03"
-- 
cgit 1.2.3-korg