fix keyring generation during mon deployment part2
Related-Prod: PROD-34765
Change-Id: I63294be263c9fedbffc3ba0a453b50303f3ffcbc
diff --git a/ceph/mon.sls b/ceph/mon.sls
index 3c380e0..67e18c9 100644
--- a/ceph/mon.sls
+++ b/ceph/mon.sls
@@ -55,15 +55,11 @@
- 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
+salt_minion_ceph_grains_publish:
+ module.wait:
+ - name: mine.update
+ - watch:
+ - cmd: populate_monmap
/var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/keyring:
file.managed: