From 6a6503311a955379cabb4edbfa3458eff97fddd3 Mon Sep 17 00:00:00 2001
From: Gabriele Cerami <gcerami@redhat.com>
Date: Wed, 11 Mar 2020 17:27:12 +0000
Subject: [PATCH] Remove skydive support

Skydive is not supported anymore and is causing promotions inconsistency
with the containers list.
Removing reference from containers template and tests

Change-Id: Id069e6150d12b6e32f3206efbfecf1c4886a0e3c
(cherry picked from commit d1dd4103d3b4e074adeba7f97b7380f15692f3e7)
---
 container-images/overcloud_containers.yaml         |  4 ----
 container-images/overcloud_containers.yaml.j2      | 14 --------------
 .../remove-skydive-support-1cea22a7419a3b13.yaml   |  5 +++++
 tripleo_common/tests/image/test_kolla_builder.py   | 12 +-----------
 4 files changed, 6 insertions(+), 29 deletions(-)
 create mode 100644 releasenotes/notes/remove-skydive-support-1cea22a7419a3b13.yaml

diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml
index 26dea0f02..efdec2078 100644
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@@ -183,10 +183,6 @@ container_images:
   image_source: kolla
 - imagename: docker.io/tripleotrain/centos-binary-sensu-client:current-tripleo
   image_source: kolla
-- imagename: docker.io/tripleotrain/centos-binary-skydive-agent:current-tripleo
-  image_source: kolla
-- imagename: docker.io/tripleotrain/centos-binary-skydive-analyzer:current-tripleo
-  image_source: kolla
 - imagename: docker.io/tripleotrain/centos-binary-swift-account:current-tripleo
   image_source: kolla
 - imagename: docker.io/tripleotrain/centos-binary-swift-container:current-tripleo
diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2
index 7a20b3fdd..b734a712a 100644
--- a/container-images/overcloud_containers.yaml.j2
+++ b/container-images/overcloud_containers.yaml.j2
@@ -796,20 +796,6 @@ container_images_template:
   - ContainerSensuConfigImage
   services:
   - OS::TripleO::Services::SensuClient
-
-- imagename: "{{namespace}}/{{name_prefix}}skydive-agent{{name_suffix}}:{{tag}}"
-  image_source: kolla
-  params:
-  - ContainerSkydiveAgentImage
-  services:
-  - OS::TripleO::Services::SkydiveAgent
-
-- imagename: "{{namespace}}/{{name_prefix}}skydive-analyzer{{name_suffix}}:{{tag}}"
-  image_source: kolla
-  params:
-  - ContainerSkydiveAnalyzerImage
-  services:
-  - OS::TripleO::Services::SkydiveAnalyzer
 {% endif %}
 
 - imagename: "{{namespace}}/{{name_prefix}}swift-account{{name_suffix}}:{{tag}}"
diff --git a/releasenotes/notes/remove-skydive-support-1cea22a7419a3b13.yaml b/releasenotes/notes/remove-skydive-support-1cea22a7419a3b13.yaml
new file mode 100644
index 000000000..b278489a4
--- /dev/null
+++ b/releasenotes/notes/remove-skydive-support-1cea22a7419a3b13.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Removed support for troubleshooting network issues using `Skydive
+    <http://skydive.network>`_.
diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py
index 54da89ff7..f2e28394e 100644
--- a/tripleo_common/tests/image/test_kolla_builder.py
+++ b/tripleo_common/tests/image/test_kolla_builder.py
@@ -538,13 +538,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                              '-fluentd:current-tripleo'},
             {'image_source': 'kolla',
                 'imagename': 'docker.io/tripleotrain/centos-binary'
-                             '-sensu-client:current-tripleo'},
-            {'image_source': 'kolla',
-                'imagename': 'docker.io/tripleotrain/centos-binary'
-                             '-skydive-agent:current-tripleo'},
-            {'image_source': 'kolla',
-                'imagename': 'docker.io/tripleotrain/centos-binary'
-                             '-skydive-analyzer:current-tripleo'}]
+                             '-sensu-client:current-tripleo'}]
         self._test_container_images_yaml_in_sync_helper(
             rhel_containers=True, neutron_driver='ovn',
             remove_images=remove_images)
@@ -959,7 +953,6 @@ class TestPrepare(base.TestCase):
                 'OS::TripleO::Services::NovaCompute',
                 'OS::TripleO::Services::NeutronApi',
                 'OS::TripleO::Services::Kubernetes::Worker',
-                'OS::TripleO::Services::SkydiveAgent',
             ]),
             kb.build_service_filter({
                 'resource_registry': {
@@ -970,8 +963,6 @@ class TestPrepare(base.TestCase):
                     'OS::TripleO::Services::Kubernetes::Worker':
                     'deployment' +
                     'kubernetes/kubernetes-worker-baremetal-ansible.yaml',
-                    'OS::TripleO::Services::SkydiveAgent':
-                    'deployment/skydive/skydive-agent-baremetal-ansible.yaml',
                     'OS::TripleO::Services::Noop':
                     'OS::Heat::None'
                 }
@@ -983,7 +974,6 @@ class TestPrepare(base.TestCase):
                         'OS::TripleO::Services::HeatApi',
                         'OS::TripleO::Services::NeutronApi',
                         'OS::TripleO::Services::NovaApi',
-                        'OS::TripleO::Services::SkydiveAgent',
                         'OS::TripleO::Services::Noop'
                     ]
                 }, {