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 dd688228ec4108f624209f05f09a3c37abcd8cab..e96d601d26d7c945eb2d8a4c499fa5b582df0024 100644 (file)
--- 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 9943636d8899bc31c2191b15bf977230109a1e21..72622db122363d2bb6dbe1352c6d2903fbfaaa38 100644 (file)
--- 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 215ffae5c0ad1ca31047d24e0121b1b97a80a7e7..2b38500cb4211ae0902c5ed07c9a3d9a04ca8e71 100755 (executable)
--- 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 57f3a5f8af93466ae8fc58021530f40c3f0ce442..b4994e2927ffc9447e7bd6ecbe4df2f5fc374c44 100644 (file)
--- 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