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
This commit is contained in:
parent
9b205af88b
commit
d1dd4103d3
@ -167,10 +167,6 @@ container_images:
|
||||
image_source: kolla
|
||||
- imagename: docker.io/tripleomaster/centos-binary-sahara-engine:current-tripleo
|
||||
image_source: kolla
|
||||
- imagename: docker.io/tripleomaster/centos-binary-skydive-agent:current-tripleo
|
||||
image_source: kolla
|
||||
- imagename: docker.io/tripleomaster/centos-binary-skydive-analyzer:current-tripleo
|
||||
image_source: kolla
|
||||
- imagename: docker.io/tripleomaster/centos-binary-swift-account:current-tripleo
|
||||
image_source: kolla
|
||||
- imagename: docker.io/tripleomaster/centos-binary-swift-container:current-tripleo
|
||||
|
@ -718,22 +718,6 @@ container_images_template:
|
||||
services:
|
||||
- OS::TripleO::Services::SaharaEngine
|
||||
|
||||
{% if not rhel_containers %}
|
||||
- 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}}"
|
||||
image_source: kolla
|
||||
params:
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Removed support for troubleshooting network issues using `Skydive
|
||||
<http://skydive.network>`_.
|
@ -416,18 +416,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||
self._test_container_images_yaml_in_sync_helper(
|
||||
neutron_driver='ovn', remove_images=remove_images)
|
||||
|
||||
def test_container_images_yaml_in_sync_for_rhel(self):
|
||||
remove_images = [
|
||||
{'image_source': 'kolla',
|
||||
'imagename': KB_DEFAULT_NAMESPACE + '/' + KB_DEFAULT_PREFIX +
|
||||
'skydive-agent:' + KB_DEFAULT_TAG},
|
||||
{'image_source': 'kolla',
|
||||
'imagename': KB_DEFAULT_NAMESPACE + '/' + KB_DEFAULT_PREFIX +
|
||||
'skydive-analyzer:' + KB_DEFAULT_TAG}]
|
||||
self._test_container_images_yaml_in_sync_helper(
|
||||
rhel_containers=True, neutron_driver='ovn',
|
||||
remove_images=remove_images)
|
||||
|
||||
|
||||
class TestPrepare(base.TestCase):
|
||||
|
||||
@ -802,7 +790,6 @@ class TestPrepare(base.TestCase):
|
||||
'OS::TripleO::Services::NovaApi',
|
||||
'OS::TripleO::Services::NovaCompute',
|
||||
'OS::TripleO::Services::Kubernetes::Worker',
|
||||
'OS::TripleO::Services::SkydiveAgent',
|
||||
]),
|
||||
kb.build_service_filter({
|
||||
'resource_registry': {
|
||||
@ -815,8 +802,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'
|
||||
}
|
||||
@ -828,7 +813,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'
|
||||
]
|
||||
}, {
|
||||
|
Loading…
Reference in New Issue
Block a user