aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Cornea <mcornea@redhat.com>2016-07-11 17:41:47 +0200
committerMarius Cornea <mcornea@redhat.com>2016-07-11 17:53:41 +0200
commit0ac53f566d9f8c3804189119c082da03fc98ad49 (patch)
tree5267985b542ace7633bfb7f0bec2965b7d8348bd
parentc89f2e3f01e81e50d48e81a5d5727e62f1ffc178 (diff)
Missing CephClientKey parameter in puppet-ceph-devel and storage-environment
This change adds the CephClientKey parameter to puppet-ceph-devel.yaml and storage-environment.yaml environment files. This is needed when --ceph-storage is not passed to the openstack overcloud deploy command as the tripleo client doesn't generate the keys. Change-Id: Idfdce190c2ad4ae198fe17474aee19cb76dac5fb Closes-Bug: #1601864
-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: ''