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

Change-Id: I28021f27a5adc8433df8abdadf0b571b20674fa6
Partial-Bug: 1607407

diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index 76f649b..70022c8 100644 (file)
--- 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 b656e24..fef68d9 100644 (file)
--- 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 8df7683..299c527 100644 (file)
--- 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