summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-25 21:05:49 +0000
committerGerrit Code Review <review@openstack.org>2016-08-25 21:05:49 +0000
commit0ecb075814375ec413e4c7e7ca1ed982512c16bd (patch)
tree21ddfa6dd99a1bcaf3fd390cb1cd5d05fa16d0df /puppet
parenta72608cce824e5e5f043ea35af5e7c4beb7e0b48 (diff)
parentf8e4070fcac8b5214f7906ebb576236aed7417a8 (diff)
Merge "Disable the Mon/OSD/Client resources in puppet-ceph-external"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/ceph-base.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index 415b77b6..a4b1653a 100644
--- a/puppet/services/ceph-base.yaml
+++ b/puppet/services/ceph-base.yaml
@@ -4,7 +4,9 @@ description: >
Ceph base service. Shared by all Ceph services.
parameters:
+ # NOTE(gfidente): needs a default to cope with external Ceph deployments were we don't pass (and need) an Admin key
CephAdminKey:
+ default: ''
description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true