diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-29 10:20:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-29 10:20:46 +0000 |
| commit | 569e73ff758d58d4f3ece707b259f0b2926dcf9c (patch) | |
| tree | db43078fb60fcf74d650d2329dbf30c823ca49f7 | |
| parent | 9aec3de5b842967cfa104ec5aebd359b71379c64 (diff) | |
| parent | a2b64eb86c6f3eddac669656044231763ea437b1 (diff) | |
Merge "We don't need to set a default for the CephX keys and cluster FSID"
| -rw-r--r-- | puppet/services/ceph-base.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/ceph-external.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/ceph-mon.yaml | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index 563feebe..bec4340e 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -5,12 +5,10 @@ description: > parameters: CephAdminKey: - default: '' description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key. type: string hidden: true CephClientKey: - default: '' 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. type: string hidden: true @@ -18,7 +16,6 @@ parameters: default: openstack type: string CephClusterFSID: - default: '' type: string description: The Ceph cluster FSID. Must be a UUID. CephIPv6: diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml index 7c1cfbae..f6fe26db 100644 --- a/puppet/services/ceph-external.yaml +++ b/puppet/services/ceph-external.yaml @@ -5,7 +5,6 @@ description: > parameters: CephClientKey: - default: '' 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. type: string hidden: true @@ -13,7 +12,6 @@ parameters: default: openstack type: string CephClusterFSID: - default: '' type: string description: The Ceph cluster FSID. Must be a UUID. CephExternalMonHost: diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml index 25da71f0..f48515e5 100644 --- a/puppet/services/ceph-mon.yaml +++ b/puppet/services/ceph-mon.yaml @@ -13,7 +13,6 @@ parameters: default: False type: boolean CephMonKey: - default: '' description: The Ceph monitors key. Can be created with ceph-authtool --gen-print-key. type: string hidden: true |