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.

Sign up for GitHub

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

Jump to bottom

UI: Add missing RBD parameter #114

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

UI: Add missing RBD parameter #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions build/olm-catalog/yaml-options-gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,16 @@
"type": "Integer(min=1, max=128)"},
)

EMBER_OPTIONS = [
{"default": "",
"deprecated_for_removal": "False",
"help": "Path to the ceph keyring file",
"name": "rbd_keyring_conf",
"required": "False",
"secret": "False",
"type": "String"},
]

MISSING_DRIVER_OPTIONS = {
'QnapISCSI': ('target_ip_address', 'san_login', 'san_password',
'use_chap_auth', 'chap_username', 'chap_password',
Expand Down Expand Up @@ -215,6 +225,7 @@
'use_chap_auth'),
'SolidFire': ('san_ip', 'san_login', 'san_password',
'driver_ssl_cert_verify'),
'RBD': ('rbd_keyring_conf',),
}

IGNORE_OPTIONS = ['max_over_subscription_ratio',
Expand Down Expand Up @@ -646,6 +657,11 @@ def add_missing_config_options(backends, options):
for option_data in MISSING_OPTIONS:
options.setdefault(option_data['name'], Option(option_data))

# These are options that we are forcing the tool to have for Ember-CSI,
# even if they are deprecated or no longer exist in Cinder.
for option_data in EMBER_OPTIONS:
options[option_data['name']] = Option(option_data)

for driver_name, option_names in MISSING_DRIVER_OPTIONS.items():
if driver_name in backends:
backends[driver_name].update(option_names)
Expand Down
1 change: 1 addition & 0 deletions deploy/examples/drivers/RBD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
rbd_cluster_name: ceph
rbd_exclusive_cinder_pool: false
rbd_flatten_volume_from_snapshot: false
rbd_keyring_conf: ''
rbd_max_clone_depth: 5
rbd_pool: rbd
rbd_secret_uuid: ''
Expand Down
8 changes: 8 additions & 0 deletions deploy/olm-catalog/next/ember-csi-operator.vX.Y.Z.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@ metadata:
"driver__RBD__rbd_cluster_name": "ceph",
"driver__RBD__rbd_exclusive_cinder_pool": false,
"driver__RBD__rbd_flatten_volume_from_snapshot": false,
"driver__RBD__rbd_keyring_conf": "",
"driver__RBD__rbd_max_clone_depth": 5,
"driver__RBD__rbd_pool": "rbd",
"driver__RBD__rbd_secret_uuid": "",
Expand Down Expand Up @@ -4153,6 +4154,13 @@ spec:
- 'urn:alm:descriptor:com.tectonic.ui:fieldGroup:DriverSettings'
- 'urn:alm:descriptor:com.tectonic.ui:text'
- 'urn:alm:descriptor:com.tectonic.ui:fieldDependency:spec.config.envVars.X_CSI_BACKEND_CONFIG.driver:RBD'
- description: "Path To The Ceph Keyring File"
displayName: Rbd Keyring Conf
path: config.envVars.X_CSI_BACKEND_CONFIG.driver__RBD__rbd_keyring_conf
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:fieldGroup:DriverSettings'
- 'urn:alm:descriptor:com.tectonic.ui:text'
- 'urn:alm:descriptor:com.tectonic.ui:fieldDependency:spec.config.envVars.X_CSI_BACKEND_CONFIG.driver:RBD'
- description: "Enable Deferred Deletion. Upon Deletion, Volumes Are Tagged For Deletion But Will Only Be Removed Asynchronously At A Later Time."
displayName: Enable Deferred Deletion
path: config.envVars.X_CSI_BACKEND_CONFIG.driver__RBD__enable_deferred_deletion
Expand Down