cephadm-adopt: custom prometheus port lost after adoption

If a custom Prometheus port was used before adoption, it was not
taken into account and default 9095 was set instead. Now custom
port is re-applied.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2242346
Signed-off-by: Teoman ONAY <tonay@ibm.com>
(cherry picked from commit b41b7bf869982a82d9ddddcef714a672c530b6f7)

# Conflicts:
#	infrastructure-playbooks/cephadm-adopt.yml

diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index 282514ad41200ff374b8c06a7436d3bca9469e96..859eacd1ce2d5074a8a3bacd309b625806521f0d 100644 (file)
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -1542,8 +1542,24 @@
           environment:
             CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'
 
+<<<<<<< HEAD
         - name: update the placement of prometheus hosts
           command: "{{ cephadm_cmd }} shell -k /etc/ceph/{{ cluster }}.client.admin.keyring --fsid {{ fsid }} -- ceph orch apply prometheus --placement='{{ groups.get(monitoring_group_name, []) | length }} label:{{ monitoring_group_name }}'"
+=======
+        - name: Update the placement of prometheus hosts
+          ceph_orch_apply:
+            fsid: "{{ fsid }}"
+            spec: |
+              service_name: prometheus
+              service_id: "{{ ansible_facts['hostname'] }}"
+              placement:
+                label: {{ monitoring_group_name }}
+                count: {{ groups.get(monitoring_group_name, []) | length }}
+              {% if prometheus_port is defined and prometheus_port != 9095 %}
+              spec:
+                port: {{ prometheus_port }}
+              {% endif %}
+>>>>>>> b41b7bf86 (cephadm-adopt: custom prometheus port lost after adoption)
           changed_when: false
           environment:
             CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'