summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-18 16:59:39 +0000
committerGerrit Code Review <review@openstack.org>2016-07-18 16:59:39 +0000
commit6494276bbc8e654034160a600ceba27fc8a52561 (patch)
tree0dc45a6c232d9c0063deab442685a0ebbd7a10ba /environments
parent6a629a4dccf08597d79776de2e0814c46fe84afb (diff)
parent0ac53f566d9f8c3804189119c082da03fc98ad49 (diff)
Merge "Missing CephClientKey parameter in puppet-ceph-devel and storage-environment"
Diffstat (limited to 'environments')
-rw-r--r--environments/puppet-ceph-devel.yaml1
-rw-r--r--environments/storage-environment.yaml2
2 files changed, 3 insertions, 0 deletions
diff --git a/environments/puppet-ceph-devel.yaml b/environments/puppet-ceph-devel.yaml
index ad542bee..a9e459df 100644
--- a/environments/puppet-ceph-devel.yaml
+++ b/environments/puppet-ceph-devel.yaml
@@ -13,6 +13,7 @@ parameter_defaults:
CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
+ CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
NovaEnableRbdBackend: true
CinderEnableRbdBackend: true
GlanceBackend: rbd
diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml
index 2529ea14..0128cabd 100644
--- a/environments/storage-environment.yaml
+++ b/environments/storage-environment.yaml
@@ -61,3 +61,5 @@ parameter_defaults:
# CephMonKey: ''
## Ceph admin key, e.g. 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
# CephAdminKey: ''
+ ## Ceph client key, e.g 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
+ # CephClientKey: ''