From c2c6fd982fc410647c4a2d86212561fb966d2454 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Fri, 9 Oct 2020 12:49:11 +0800 Subject: [PATCH] fix: onprem storage incorrect config (#345) fix: https://github.com/mingrammer/diagrams/issues/344 --- config.py | 6 ++---- diagrams/onprem/storage.py | 9 ++++++++- docs/nodes/onprem.md | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/config.py b/config.py index 7b50ad6e..12fec10c 100644 --- a/config.py +++ b/config.py @@ -140,10 +140,8 @@ ALIASES = { "Zeromq": "ZeroMQ", }, "storage": { - "ceph": { - "CEPH": "ceph", - "Ceph-OSD": "CEPH-OSD" - } + "Ceph": "CEPH", + "CephOsd": "CEPH_OSD", }, "workflow": { "Kubeflow": "KubeFlow", diff --git a/diagrams/onprem/storage.py b/diagrams/onprem/storage.py index 49d9556f..37e0a370 100644 --- a/diagrams/onprem/storage.py +++ b/diagrams/onprem/storage.py @@ -2,6 +2,7 @@ from . import _OnPrem + class _Storage(_OnPrem): _type = "storage" _icon_dir = "resources/onprem/storage" @@ -9,11 +10,17 @@ class _Storage(_OnPrem): class CephOsd(_Storage): _icon = "ceph-osd.png" + + class Ceph(_Storage): _icon = "ceph.png" + + class Glusterfs(_Storage): _icon = "glusterfs.png" + # Aliases -{'CEPH': 'ceph', 'Ceph-OSD': 'CEPH-OSD'} = ceph \ No newline at end of file +CEPH = Ceph +CEPH_OSD = CephOsd diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md index f016a4bb..7f90f7b2 100644 --- a/docs/nodes/onprem.md +++ b/docs/nodes/onprem.md @@ -161,7 +161,7 @@ Node classes list of onprem provider. - **diagrams.onprem.network.Nginx** - **diagrams.onprem.network.Ocelot** - **diagrams.onprem.network.OpenServiceMesh**, **OSM** (alias) -- **diagrams.onprem.network.Opnsense**, **OPNsense** (alias) +- **diagrams.onprem.network.Opnsense**, **OPNSense** (alias) - **diagrams.onprem.network.Pfsense**, **PFSense** (alias) - **diagrams.onprem.network.Pomerium** - **diagrams.onprem.network.Powerdns** @@ -194,8 +194,8 @@ Node classes list of onprem provider. ## onprem.storage -- **diagrams.onprem.storage.CephOsd** -- **diagrams.onprem.storage.Ceph** +- **diagrams.onprem.storage.CephOsd**, **CEPH_OSD** (alias) +- **diagrams.onprem.storage.Ceph**, **CEPH** (alias) - **diagrams.onprem.storage.Glusterfs** ## onprem.vcs