Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exposes mounter configuration item. #122

Merged
merged 1 commit into from Sep 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions config.yaml
Expand Up @@ -184,6 +184,11 @@ options:
description: |
The storage class to make the default storage class. Allowed values are "auto",
"none", "ceph-xfs", "ceph-ext4", "cephfs". Note: Only works in Kubernetes >= 1.10
cephfs-mounter:
type: string
default: "default"
description: |
The client driver used for cephfs based storage. Options are "fuse", "kernel" and "default".
keystone-policy:
default: |
apiVersion: v1
Expand Down
2 changes: 2 additions & 0 deletions reactive/kubernetes_master.py
Expand Up @@ -1400,6 +1400,7 @@ def configure_cdk_addons():
ceph['kubernetes_key'] = b64_ceph_key.decode('ascii')
ceph['mon_hosts'] = ceph_ep.mon_hosts()
default_storage = hookenv.config('default-storage')
cephfs_mounter = hookenv.config('cephfs-mounter')
if kubernetes_master.query_cephfs_enabled():
cephFsEnabled = "true"
ceph['fsname'] = kubernetes_master.get_cephfs_fsname() or ''
Expand Down Expand Up @@ -1446,6 +1447,7 @@ def configure_cdk_addons():
'enable-gpu=' + str(gpuEnable).lower(),
'enable-ceph=' + cephEnabled,
'enable-cephfs='+cephFsEnabled,
'cephfs-mounter=' + cephfs_mounter,
'ceph-admin-key=' + (ceph.get('admin_key', '')),
'ceph-fsid=' + (ceph.get('fsid', '')),
'ceph-fsname=' + (ceph.get('fsname', '')),
Expand Down