python-common: prettify `yaml.dump(MonitoringSpec())`

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit f76c02a658ed1de54a380381932bb58b6ab91d41)

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index b0b852c1216db2fd4a5b12d5257f533df8b0be8e..9e44f64ae63388a8c767a003626d891967007142 100644 (file)
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -618,7 +618,8 @@ class ServiceSpec(object):
         if self.service_id:
             ret['service_id'] = self.service_id
         ret['service_name'] = self.service_name()
-        ret['placement'] = self.placement.to_json()
+        if self.placement.to_json():
+            ret['placement'] = self.placement.to_json()
         if self.unmanaged:
             ret['unmanaged'] = self.unmanaged
         if self.networks:
@@ -1095,3 +1096,6 @@ class MonitoringSpec(ServiceSpec):
             return {'prometheus': 9095,
                     'node-exporter': 9100,
                     'grafana': 3000}[self.service_type]
+
+
+yaml.add_representer(MonitoringSpec, ServiceSpec.yaml_representer)

diff --git a/src/python-common/ceph/tests/test_service_spec.py b/src/python-common/ceph/tests/test_service_spec.py
index e8620b017339f6dc369e5a45f234e1be6a87c9fb..9cb85bb24cb9b10e5386b5ad4566e03ddafa0c65 100644 (file)
--- a/src/python-common/ceph/tests/test_service_spec.py
+++ b/src/python-common/ceph/tests/test_service_spec.py
@@ -234,6 +234,19 @@ spec:
   objectstore: bluestore
   wal_devices:
     model: NVME-QQQQ-987
+---
+service_type: alertmanager
+service_name: alertmanager
+spec:
+  port: 1234
+  user_data:
+    default_webhook_urls:
+    - foo
+---
+service_type: grafana
+service_name: grafana
+spec:
+  port: 1234
 """
 
     for y in y.split('---\n'):