From 5f94a31b5ae7bc57f73d41927386c83a5d0588e0 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Mon, 4 Feb 2019 13:45:30 +0000
Subject: [PATCH] Remove support for deploying cAdvisor

Kolla-Ansible now supports deploying cAdvisor so we
no longer need this.

Change-Id: I9e37651643c18e06f9143893bb3564ec0e9f2ccd
Story: 2004932
Task: 29321
---
 ansible/cadvisor.yml                          | 15 -------
 ansible/group_vars/all/cadvisor               |  6 ---
 ansible/overcloud-extras.yml                  |  1 -
 ansible/roles/cadvisor/README.md              | 44 -------------------
 ansible/roles/cadvisor/defaults/main.yml      | 35 ---------------
 ansible/roles/cadvisor/tasks/deploy.yml       | 14 ------
 ansible/roles/cadvisor/tasks/destroy.yml      | 29 ------------
 ansible/roles/cadvisor/tasks/main.yml         |  2 -
 ansible/roles/cadvisor/tasks/pull.yml         | 10 -----
 ansible/roles/cadvisor/tasks/reconfigure.yml  |  1 -
 ansible/roles/cadvisor/tasks/upgrade.yml      |  3 --
 etc/kayobe/cadvisor.yml                       | 10 -----
 ...-cadvisor-deployment-3866f823cd1dc0b9.yaml |  4 ++
 13 files changed, 4 insertions(+), 170 deletions(-)
 delete mode 100644 ansible/cadvisor.yml
 delete mode 100644 ansible/group_vars/all/cadvisor
 delete mode 100644 ansible/roles/cadvisor/README.md
 delete mode 100644 ansible/roles/cadvisor/defaults/main.yml
 delete mode 100644 ansible/roles/cadvisor/tasks/deploy.yml
 delete mode 100644 ansible/roles/cadvisor/tasks/destroy.yml
 delete mode 100644 ansible/roles/cadvisor/tasks/main.yml
 delete mode 100644 ansible/roles/cadvisor/tasks/pull.yml
 delete mode 120000 ansible/roles/cadvisor/tasks/reconfigure.yml
 delete mode 100644 ansible/roles/cadvisor/tasks/upgrade.yml
 delete mode 100644 etc/kayobe/cadvisor.yml
 create mode 100644 releasenotes/notes/remove-overcloud-cadvisor-deployment-3866f823cd1dc0b9.yaml

diff --git a/ansible/cadvisor.yml b/ansible/cadvisor.yml
deleted file mode 100644
index e73cc204f..000000000
--- a/ansible/cadvisor.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-# Deploy/pull/reconfigure/upgrade cAdvisor.
-#
-# Follows kolla-ansible service deployment patterns.
-#
-# Variables:
-# action: One of deploy, destroy, pull, reconfigure, upgrade
-
-- name: Ensure cAdvisor is deployed
-  hosts: overcloud:&docker
-  tags:
-    - cadvisor
-  roles:
-    - role: cadvisor
-      cadvisor_action: "{{ kayobe_action }}"
diff --git a/ansible/group_vars/all/cadvisor b/ansible/group_vars/all/cadvisor
deleted file mode 100644
index 99074b790..000000000
--- a/ansible/group_vars/all/cadvisor
+++ /dev/null
@@ -1,6 +0,0 @@
----
-###############################################################################
-# cAdvisor configuration.
-
-# Whether cAdvisor is enabled.
-cadvisor_enabled: False
diff --git a/ansible/overcloud-extras.yml b/ansible/overcloud-extras.yml
index 4ac259052..ab1d80e38 100644
--- a/ansible/overcloud-extras.yml
+++ b/ansible/overcloud-extras.yml
@@ -10,4 +10,3 @@
 - import_playbook: docker-registry.yml
 - import_playbook: inspection-store.yml
 - import_playbook: opensm.yml
-- import_playbook: cadvisor.yml
diff --git a/ansible/roles/cadvisor/README.md b/ansible/roles/cadvisor/README.md
deleted file mode 100644
index a9e9feb36..000000000
--- a/ansible/roles/cadvisor/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-cAdvisor
-========
-
-This role can be used to configure cAdvisor running in a Docker container.
-
-Requirements
-------------
-
-The host executing the role has the following requirements:
-
-* Docker engine
-* Python ``docker >= 2.0.0``
-
-Role Variables
---------------
-
-``cadvisor_enabled``: Whether the cAdvisor is enabled. Defaults to ``false``.
-``cadvisor_namespace``: Docker image namespace. Defaults to ``cadvisor``.
-``cadvisor_image``: Docker image name.
-``cadvisor_tag``: Docker image tag. Defaults to ``v0.28.3``.
-``cadvisor_image_full``: Full docker image specification.
-``cadvisor_restart_policy``: Docker restart policy for cAdvisor container. Defaults
-to ``unless-stopped``.
-``cadvisor_restart_retries``: Number of Docker restarts. Defaults to 10.
-
-Dependencies
-------------
-
-None
-
-Example Playbook
-----------------
-
-The following playbook configures cAdvisor.
-
-    ---
-    - hosts: cadvisor
-      roles:
-        - role: cadvisor
-
-Author Information
-------------------
-
-- Jonathan Davies (<jpds@protonmail.com>)
diff --git a/ansible/roles/cadvisor/defaults/main.yml b/ansible/roles/cadvisor/defaults/main.yml
deleted file mode 100644
index 04dba8cad..000000000
--- a/ansible/roles/cadvisor/defaults/main.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# Roughly follows kolla-ansible's service deployment patterns.
-
-# Action to perform. One of 'deploy', 'destroy', 'pull', 'reconfigure',
-# 'upgrade'.
-cadvisor_action: deploy
-
-# Whether cAdvisor is enabled.
-cadvisor_enabled: false
-
-# Service deployment definition.
-cadvisor_services:
-  cadvisor:
-    container_name: cadvisor
-    enabled: "{{ cadvisor_enabled }}"
-    image: "{{ cadvisor_image_full }}"
-    published_ports: '8080:8080'
-    read_only: True
-    volumes:
-      - "/:/rootfs"
-      - "/var/run:/var/run:rw"
-      - "/sys:/sys:ro"
-      - "/var/lib/docker/:/var/lib/docker:ro"
-      - "/dev/disk/:/dev/disk:ro"
-
-####################
-# Docker
-####################
-cadvisor_namespace: "cadvisor"
-cadvisor_image: "{{ docker_registry ~ '/' if docker_registry | default else '' }}{{ cadvisor_namespace }}/cadvisor"
-cadvisor_tag: "v0.28.3"
-cadvisor_image_full: "{{ cadvisor_image }}:{{ cadvisor_tag }}"
-
-cadvisor_restart_policy: "unless-stopped"
-#cadvisor_restart_retries: 10
diff --git a/ansible/roles/cadvisor/tasks/deploy.yml b/ansible/roles/cadvisor/tasks/deploy.yml
deleted file mode 100644
index 4277a3542..000000000
--- a/ansible/roles/cadvisor/tasks/deploy.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Ensure cAdvisor container is running
-  docker_container:
-    image: "{{ item.value.image }}"
-    name: "{{ item.value.container_name }}"
-    network_mode: "host"
-    privileged: "{{ item.value.privileged | default(omit) }}"
-    published_ports: "{{ item.value.published_ports | default(omit) }}"
-    read_only: "{{ item.value.read_only | default(omit) }}"
-    restart_policy: "{{ cadvisor_restart_policy }}"
-    restart_retries: "{{ cadvisor_restart_retries | default(omit) }}"
-    state: "{{ item.value.enabled | ternary('started', 'absent') }}"
-    volumes: "{{ item.value.volumes }}"
-  with_dict: "{{ cadvisor_services }}"
diff --git a/ansible/roles/cadvisor/tasks/destroy.yml b/ansible/roles/cadvisor/tasks/destroy.yml
deleted file mode 100644
index 7b937212e..000000000
--- a/ansible/roles/cadvisor/tasks/destroy.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- name: Ensure cAdvisor container is stopped
-  docker_container:
-    name: "{{ item.value.container_name }}"
-    state: "absent"
-  with_dict: "{{ cadvisor_services }}"
-
-- name: Check whether cAdvisor volumes are present
-  command: docker volume inspect {{ volume }}
-  changed_when: False
-  with_subelements:
-    - "{{ cadvisor_services }}"
-    - volumes
-  when: "'/' not in volume"
-  failed_when:
-    - volume_result.rc != 0
-    - "'No such volume' not in volume_result.stderr"
-  vars:
-    volume: "{{ item.1.split(':')[0] }}"
-  register: volume_result
-
-- name: Ensure cAdvisor volumes are absent
-  command: docker volume rm {{ volume }}
-  with_items: "{{ volume_result.results }}"
-  when:
-    - not item | skipped
-    - item.rc == 0
-  vars:
-    volume: "{{ item.item.1.split(':')[0] }}"
diff --git a/ansible/roles/cadvisor/tasks/main.yml b/ansible/roles/cadvisor/tasks/main.yml
deleted file mode 100644
index f14cbb59b..000000000
--- a/ansible/roles/cadvisor/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include_tasks: "{{ cadvisor_action }}.yml"
diff --git a/ansible/roles/cadvisor/tasks/pull.yml b/ansible/roles/cadvisor/tasks/pull.yml
deleted file mode 100644
index 3e3098c17..000000000
--- a/ansible/roles/cadvisor/tasks/pull.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Pulling cAdvisor container image
-  docker_image:
-    name: "{{ item.value.image }}"
-    repository: "{{ item.value.image }}"
-    state: present
-  with_dict: "{{ cadvisor_services }}"
-  when:
-    - item.value.enabled
-    - cadvisor_action != 'destroy'
diff --git a/ansible/roles/cadvisor/tasks/reconfigure.yml b/ansible/roles/cadvisor/tasks/reconfigure.yml
deleted file mode 120000
index 0412f9220..000000000
--- a/ansible/roles/cadvisor/tasks/reconfigure.yml
+++ /dev/null
@@ -1 +0,0 @@
-deploy.yml
\ No newline at end of file
diff --git a/ansible/roles/cadvisor/tasks/upgrade.yml b/ansible/roles/cadvisor/tasks/upgrade.yml
deleted file mode 100644
index 99348ae91..000000000
--- a/ansible/roles/cadvisor/tasks/upgrade.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- include_tasks: pull.yml
-- include_tasks: deploy.yml
diff --git a/etc/kayobe/cadvisor.yml b/etc/kayobe/cadvisor.yml
deleted file mode 100644
index 25e1db4f9..000000000
--- a/etc/kayobe/cadvisor.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-###############################################################################
-# cAdvisor configuration.
-
-# Whether cAdvisor is enabled.
-#cadvisor_enabled:
-
-###############################################################################
-# Dummy variable to allow Ansible to accept this file.
-workaround_ansible_issue_8743: yes
diff --git a/releasenotes/notes/remove-overcloud-cadvisor-deployment-3866f823cd1dc0b9.yaml b/releasenotes/notes/remove-overcloud-cadvisor-deployment-3866f823cd1dc0b9.yaml
new file mode 100644
index 000000000..c12e11022
--- /dev/null
+++ b/releasenotes/notes/remove-overcloud-cadvisor-deployment-3866f823cd1dc0b9.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - First class support in Kayobe for deploying cAdvisor
+    has been removed since this is now supported via Kolla-Ansible.