ceph mgr fix
Change-Id: I9942fb62544dcd8a53859b98c59e8ed3a3260881
diff --git a/ceph/mgr.sls b/ceph/mgr.sls
index 8d86ab3..40f8bb8 100644
--- a/ceph/mgr.sls
+++ b/ceph/mgr.sls
@@ -53,18 +53,18 @@
ceph_dashboard_address:
cmd.run:
- - name: "ceph config-key put mgr/dashboard/server_addr {{ mgr.dashboard.get('host', '::') }}"
- - unless: "ceph config-key get mgr/dashboard/server_addr | grep {{ mgr.dashboard.get('host', '::') }}"
+ - name: "ceph config-key put mgr/dashboard/{{ grains.host }}/server_addr {{ mgr.dashboard.get('host', '::') }}"
+ - unless: "ceph config-key get mgr/dashboard/{{ grains.host }}/server_addr | grep {{ mgr.dashboard.get('host', '::') }}"
ceph_dashboard_port:
cmd.run:
- - name: "ceph config-key put mgr/dashboard/server_port {{ mgr.dashboard.get('port', '7000') }}"
- - unless: "ceph config-key get mgr/dashboard/server_port | grep {{ mgr.dashboard.get('port', '7000') }}"
+ - name: "ceph config-key put mgr/dashboard/{{ grains.host }}/server_port {{ mgr.dashboard.get('port', '7000') }}"
+ - unless: "ceph config-key get mgr/dashboard/{{ grains.host }}/server_port | grep {{ mgr.dashboard.get('port', '7000') }}"
ceph_restart_dashboard_plugin:
cmd.wait:
- - name: "ceph mgr module disable dashboard;ceph mgr module enable dashboard"
+ - name: "ceph mgr module disable dashboard;ceph mgr module enable dashboard --force"
- watch:
- cmd: ceph_dashboard_address
- cmd: ceph_dashboard_port
diff --git a/metadata/service/mgr/single.yml b/metadata/service/mgr/single.yml
new file mode 100644
index 0000000..9cad788
--- /dev/null
+++ b/metadata/service/mgr/single.yml
@@ -0,0 +1,13 @@
+applications:
+- ceph
+classes:
+- service.ceph.common.single
+- service.ceph.support
+parameters:
+ ceph:
+ mgr:
+ enabled: true
+ dashboard:
+ enabled: true
+ host: ${_param:single_address}
+ port: 7000