aboutsummaryrefslogtreecommitdiffstats
path: root/os-apply-config
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-11 15:29:28 +0000
committerGerrit Code Review <review@openstack.org>2015-11-11 15:29:28 +0000
commit1b22aed7054ca08e93d870bdc6103c36f97c4b17 (patch)
tree3928dda1c9ce09b385efeafb70ec1418c0d49749 /os-apply-config
parent7961f61a413eb36caf46677655cbf8af8bfb6303 (diff)
parent9ea7831eaeadced1b5599b6ef1feb01d0cb6dca2 (diff)
Merge "Allow customization of Ceph client user"
Diffstat (limited to 'os-apply-config')
-rw-r--r--os-apply-config/ceph-cluster-config.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/os-apply-config/ceph-cluster-config.yaml b/os-apply-config/ceph-cluster-config.yaml
index 4e435ffb..115de085 100644
--- a/os-apply-config/ceph-cluster-config.yaml
+++ b/os-apply-config/ceph-cluster-config.yaml
@@ -13,7 +13,7 @@ parameters:
ceph_client_key:
default: ''
type: string
- description: Ceph key used to create the 'openstack' user keyring.
+ description: Ceph key used to create the client user keyring.
ceph_fsid:
default: ''
type: string
@@ -36,6 +36,9 @@ parameters:
GlanceRbdPoolName:
default: images
type: string
+ CephClientUserName:
+ default: openstack
+ type: string
resources:
CephClusterConfigImpl: