Fixed lvm.sls behaviour for multiple osd per node scenario
Related-Prod: PROD-34370
Change-Id: Ib999e61b8ea99ee361df81bd347970dfb5ba5f52
diff --git a/ceph/osd/setup/lvm.sls b/ceph/osd/setup/lvm.sls
index e5e737c..363c649 100644
--- a/ceph/osd/setup/lvm.sls
+++ b/ceph/osd/setup/lvm.sls
@@ -15,6 +15,11 @@
{%- if osd.backend is defined %}
+link_keyring:
+ cmd.run:
+ - name: "ln -s {{"/etc/ceph/" + common.get('cluster_name', 'ceph') + ".client.bootstrap-osd.keyring"}} /var/lib/ceph/bootstrap-osd/ceph.keyring"
+ - unless: "ls /var/lib/ceph/bootstrap-osd/ceph.keyring"
+
{%- for backend_name, backend in osd.backend.iteritems() %}
{%- for disk in backend.disks %}
@@ -43,11 +48,6 @@
{%- do cmd.append('--data ') %}
{%- do cmd.append(dev) %}
-link_keyring:
- cmd.run:
- - name: "ln -s {{"/etc/ceph/" + common.get('cluster_name', 'ceph') + ".client.bootstrap-osd.keyring"}} /var/lib/ceph/bootstrap-osd/ceph.keyring"
- - unless: "ls /var/lib/ceph/bootstrap-osd/ceph.keyring"
-
prepare_disk_{{ dev }}:
cmd.run:
- name: "yes | ceph-volume lvm prepare {{ cmd|join(' ') }}"
@@ -62,6 +62,11 @@
{% set db_partition = db_partition + 1 %}
{% set wal_partition = wal_partition + 1 %}
+
+{%- endfor %}
+
+{%- endfor %}
+
activate_disks:
cmd.run:
- name: "ceph-volume lvm activate --all"
@@ -73,10 +78,6 @@
- onlyif: /bin/false
{%- endif %}
-{%- endfor %}
-
-{%- endfor %}
-
{%- endif %}
osd_services_global: