fix keyring generation during mon deployment
Related-Prod: PROD-34765
Change-Id: I80dc79492dbd469f8401c6b7127e5556ff3014db
diff --git a/ceph/mgr.sls b/ceph/mgr.sls
index ef07e80..85e5fc4 100644
--- a/ceph/mgr.sls
+++ b/ceph/mgr.sls
@@ -2,6 +2,15 @@
{%- if mgr.get('enabled', False) %}
+{%- if common.version in ['nautilus'] %}
+enable_msgr2_protocol:
+ cmd.run:
+ - name: "ceph mon enable-msgr2"
+ - unless:
+ - pkg: mgr_packages
+
+{%- endif %}
+
include:
- ceph.common
diff --git a/ceph/mon.sls b/ceph/mon.sls
index 5cc8138..3c380e0 100644
--- a/ceph/mon.sls
+++ b/ceph/mon.sls
@@ -54,6 +54,17 @@
- pkg: mon_packages
- file: common_config
+# PROD-34765
+create /var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/keyring:
+ file.copy:
+ - name: /var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/keyring
+ - source: /etc/ceph/{{ common.get('cluster_name', 'ceph') }}.mon.{{ grains.host }}.keyring
+ - user: ceph
+ - template: jinja
+ - unless: "test -f /var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/done"
+ - require:
+ - pkg: mon_packages
+
/var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/keyring:
file.managed:
- source: salt://ceph/files/mon_keyring
@@ -63,17 +74,6 @@
- require:
- pkg: mon_packages
-{%- if common.version in ['nautilus'] %}
-enable_msgr2_protocol:
- cmd.run:
- - name: "ceph mon enable-msgr2"
- - unless: "test -f /var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/done"
- - require:
- - pkg: mon_packages
- - file: common_config
-
-{%- endif %}
-
/var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/done:
file.managed:
- user: ceph
diff --git a/ceph/osd/setup.sls b/ceph/osd/setup.sls
index 8c2bc56..252569f 100644
--- a/ceph/osd/setup.sls
+++ b/ceph/osd/setup.sls
@@ -1,9 +1,6 @@
{%- from "ceph/map.jinja" import osd, common with context %}
include:
-{%- if osd.backend.bluestore.create_partitions is defined and osd.backend.bluestore.create_partitions == true %}
-- ceph.osd.setup.partitioning
-{%- endif %}
{%- if osd.lvm_enabled is defined and osd.lvm_enabled == true %}
- ceph.osd.setup.lvm
{%- else %}