aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-07-28 17:03:33 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-07-28 15:47:33 +0000
commita2b64eb86c6f3eddac669656044231763ea437b1 (patch)
treec682710420b55721dd92d6f8a8d342e548e86fcc
parentfc93cf3e2965f430b243eda1e95ce30c4e59a1ab (diff)
We don't need to set a default for the CephX keys and cluster FSID
Change-Id: I28021f27a5adc8433df8abdadf0b571b20674fa6 Partial-Bug: 1607407
-rw-r--r--puppet/services/ceph-base.yaml3
-rw-r--r--puppet/services/ceph-external.yaml2
-rw-r--r--puppet/services/ceph-mon.yaml1
3 files changed, 0 insertions, 6 deletions
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index 76f649b0..70022c87 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 b656e245..fef68d96 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 8df7683d..299c5274 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