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 d1dd4103d3
)
This commit is contained in:
parent
cf1019492e
commit
6a6503311a
|
@ -183,10 +183,6 @@ container_images:
|
||||||
image_source: kolla
|
image_source: kolla
|
||||||
- imagename: docker.io/tripleotrain/centos-binary-sensu-client:current-tripleo
|
- imagename: docker.io/tripleotrain/centos-binary-sensu-client:current-tripleo
|
||||||
image_source: kolla
|
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
|
- imagename: docker.io/tripleotrain/centos-binary-swift-account:current-tripleo
|
||||||
image_source: kolla
|
image_source: kolla
|
||||||
- imagename: docker.io/tripleotrain/centos-binary-swift-container:current-tripleo
|
- imagename: docker.io/tripleotrain/centos-binary-swift-container:current-tripleo
|
||||||
|
|
|
@ -796,20 +796,6 @@ container_images_template:
|
||||||
- ContainerSensuConfigImage
|
- ContainerSensuConfigImage
|
||||||
services:
|
services:
|
||||||
- OS::TripleO::Services::SensuClient
|
- 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 %}
|
{% endif %}
|
||||||
|
|
||||||
- imagename: "{{namespace}}/{{name_prefix}}swift-account{{name_suffix}}:{{tag}}"
|
- imagename: "{{namespace}}/{{name_prefix}}swift-account{{name_suffix}}:{{tag}}"
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Removed support for troubleshooting network issues using `Skydive
|
||||||
|
<http://skydive.network>`_.
|
|
@ -538,13 +538,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||||
'-fluentd:current-tripleo'},
|
'-fluentd:current-tripleo'},
|
||||||
{'image_source': 'kolla',
|
{'image_source': 'kolla',
|
||||||
'imagename': 'docker.io/tripleotrain/centos-binary'
|
'imagename': 'docker.io/tripleotrain/centos-binary'
|
||||||
'-sensu-client:current-tripleo'},
|
'-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'}]
|
|
||||||
self._test_container_images_yaml_in_sync_helper(
|
self._test_container_images_yaml_in_sync_helper(
|
||||||
rhel_containers=True, neutron_driver='ovn',
|
rhel_containers=True, neutron_driver='ovn',
|
||||||
remove_images=remove_images)
|
remove_images=remove_images)
|
||||||
|
@ -959,7 +953,6 @@ class TestPrepare(base.TestCase):
|
||||||
'OS::TripleO::Services::NovaCompute',
|
'OS::TripleO::Services::NovaCompute',
|
||||||
'OS::TripleO::Services::NeutronApi',
|
'OS::TripleO::Services::NeutronApi',
|
||||||
'OS::TripleO::Services::Kubernetes::Worker',
|
'OS::TripleO::Services::Kubernetes::Worker',
|
||||||
'OS::TripleO::Services::SkydiveAgent',
|
|
||||||
]),
|
]),
|
||||||
kb.build_service_filter({
|
kb.build_service_filter({
|
||||||
'resource_registry': {
|
'resource_registry': {
|
||||||
|
@ -970,8 +963,6 @@ class TestPrepare(base.TestCase):
|
||||||
'OS::TripleO::Services::Kubernetes::Worker':
|
'OS::TripleO::Services::Kubernetes::Worker':
|
||||||
'deployment' +
|
'deployment' +
|
||||||
'kubernetes/kubernetes-worker-baremetal-ansible.yaml',
|
'kubernetes/kubernetes-worker-baremetal-ansible.yaml',
|
||||||
'OS::TripleO::Services::SkydiveAgent':
|
|
||||||
'deployment/skydive/skydive-agent-baremetal-ansible.yaml',
|
|
||||||
'OS::TripleO::Services::Noop':
|
'OS::TripleO::Services::Noop':
|
||||||
'OS::Heat::None'
|
'OS::Heat::None'
|
||||||
}
|
}
|
||||||
|
@ -983,7 +974,6 @@ class TestPrepare(base.TestCase):
|
||||||
'OS::TripleO::Services::HeatApi',
|
'OS::TripleO::Services::HeatApi',
|
||||||
'OS::TripleO::Services::NeutronApi',
|
'OS::TripleO::Services::NeutronApi',
|
||||||
'OS::TripleO::Services::NovaApi',
|
'OS::TripleO::Services::NovaApi',
|
||||||
'OS::TripleO::Services::SkydiveAgent',
|
|
||||||
'OS::TripleO::Services::Noop'
|
'OS::TripleO::Services::Noop'
|
||||||
]
|
]
|
||||||
}, {
|
}, {
|
||||||
|
|
Loading…
Reference in New Issue