From 313e71bc7b4c6c3fc01a39ff487c8168fd7c54c5 Mon Sep 17 00:00:00 2001 From: Peter Matulis Date: Thu, 28 Oct 2021 15:19:42 -0400 Subject: [PATCH] Fix README, extraneous options line Change-Id: I8e5b48de0662c99fffca56a9a48111e75d9bc543 --- README.md | 11 ++++------- requirements.txt | 3 +++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4139bb33..ea2d5798 100644 --- a/README.md +++ b/README.md @@ -75,8 +75,7 @@ configuration file. Block devices (regular), ceph-osd: - options: - osd-devices: /dev/vdb /dev/vdc /dev/vdd + osd-devices: /dev/vdb /dev/vdc /dev/vdd Each regular block device must be an absolute path to a device node. @@ -210,8 +209,7 @@ Jewel, set option `osd-encrypt` for the ceph-osd charm: ```yaml ceph-osd: - options: - osd-encrypt: True + osd-encrypt: True ``` Here, dm-crypt keys are stored in the MON sub-cluster. @@ -222,9 +220,8 @@ options `osd-encrypt` and `osd-encrypt-keymanager` for the ceph-osd charm: ```yaml ceph-osd: - options: - osd-encrypt: True - osd-encrypt-keymanager: vault + osd-encrypt: True + osd-encrypt-keymanager: vault ``` > **Important**: Post deployment configuration will only affect block devices diff --git a/requirements.txt b/requirements.txt index ead6e89a..10d37185 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,3 +22,6 @@ dnspython<2.0.0; python_version < '3.6' dnspython; python_version >= '3.6' psutil>=1.1.1,<2.0.0 + +# cffi 1.15.0 drops support for py35 +cffi==1.14.6; python_version < '3.6'