diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-21 17:22:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-21 17:22:50 +0000 |
| commit | 6fafefd35e30da85fd6881f28dd66ec3b703bdac (patch) | |
| tree | d11d5651014a8eb84dfda08b33075bc5691e09d2 /docker | |
| parent | 8ba30a1912979925fa37e210df5ecaab47b07c33 (diff) | |
| parent | ad8589212cee744351b9d224265fed9ed1dbf447 (diff) | |
Merge "Let mds create manila key and fs"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 2 | ||||
| -rw-r--r-- | docker/services/nova-libvirt.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index 0399faf8..f09e98ce 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -94,7 +94,7 @@ parameters: default: vms type: string CephClientKey: - description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring. + description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. type: string hidden: true CephClientUserName: diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index 62c25bb2..47414083 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -61,7 +61,7 @@ parameters: description: Whether to enable or not the Rbd backend for Cinder type: boolean CephClientKey: - description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring. + description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. type: string hidden: true CephClusterFSID: |