openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "We don't need to set a default for the CephX keys and cluster FSID"

Browse Source
This commit is contained in:
Jenkins 2016-07-29 10:20:46 +00:00 committed by Gerrit Code Review
commit 569e73ff75
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
puppet/services/ceph-base.yaml
View File

@ -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:

2
puppet/services/ceph-external.yaml
View File

@ -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:

1
puppet/services/ceph-mon.yaml
View File

@ -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