From: Omri Zeneva <ozeneva@redhat.com>
Date: Mon, 13 Jun 2022 06:58:17 +0000 (-0400)
Subject: nits fixes
X-Git-Tag: v18.0.0~592^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=36a4a4e25764e153aa1345454c3020daf469862a;p=ceph-ci.git

nits fixes

Signed-off-by: Omri Zeneva <ozeneva@redhat.com>
---

diff --git a/doc/cephadm/services/tracing.rst b/doc/cephadm/services/tracing.rst
index dd688228ec4..e96d601d26d 100644
--- a/doc/cephadm/services/tracing.rst
+++ b/doc/cephadm/services/tracing.rst
@@ -28,7 +28,7 @@ Jaeger services consist of 3 services:
 Jaeger requires a database for the traces. we use ElasticSearch (version 6) by default.
 
 
-To deploy jaeger tracing service, without ElasticSearch:
+To deploy jaeger tracing service, when not using your own ElasticSearch:
 
 #. Deploy jaeger services, with a new elasticsearch container:
 
@@ -41,5 +41,5 @@ To deploy jaeger tracing service, without ElasticSearch:
 
      .. prompt:: bash #
 
-        ceph orch apply jaeger --without-query -es_nodes=ip:port,..
+        ceph orch apply jaeger --without-query --es_nodes=ip:port,..
 
diff --git a/doc/jaegertracing/index.rst b/doc/jaegertracing/index.rst
index 9943636d889..72622db1223 100644
--- a/doc/jaegertracing/index.rst
+++ b/doc/jaegertracing/index.rst
@@ -48,7 +48,7 @@ Important Notes:
 
 - Spans are being sent to local jaeger agent, so the jaeger agent must be running on each host (not in all-in-one mode). otherwise, spans of hosts without active jaeger agent will be lost.
 
-- Ceph tracers are configured to sent tracers to agents that are listening to port 6799, so on manual jaeger deployment, option "--processor.jaeger-compact.server-host-port=6799" should be used.
+- Ceph tracers are configured to send tracers to agents that are listening to port 6799, so on manual jaeger deployment, option "--processor.jaeger-compact.server-host-port=6799" should be used.
 
 
 HOW TO ENABLE TRACING IN CEPH
diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 215ffae5c0a..2b38500cb42 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1111,7 +1111,6 @@ class Tracing(object):
         },
         'jaeger-agent': {
             'image': DEFAULT_JAEGER_AGENT_IMAGE,
-            'envs': ''
         },
         'jaeger-collector': {
             'image': DEFAULT_JAEGER_COLLECTOR_IMAGE,
@@ -3013,7 +3012,7 @@ def get_container(ctx: CephadmContext,
         name = '%s.%s' % (daemon_type, daemon_id)
         config = get_parm(ctx.config_json)
         Tracing.set_configuration(config, daemon_type)
-        envs.extend(Tracing.components[daemon_type]['envs'])
+        envs.extend(Tracing.components[daemon_type].get('envs', []))
     elif daemon_type == NFSGanesha.daemon_type:
         entrypoint = NFSGanesha.entrypoint
         name = '%s.%s' % (daemon_type, daemon_id)
diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index 57f3a5f8af9..b4994e2927f 100644
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -1384,7 +1384,6 @@ class TracingSpec(ServiceSpec):
             placement=placement, unmanaged=unmanaged,
             preview_only=preview_only, config=config,
             networks=networks)
-        self.service_type = service_type
         self.without_query = without_query
         self.es_nodes = es_nodes