openstack/tripleo-heat-templates
Code Issues Proposed changes

Missing CephClientKey parameter in puppet-ceph-devel and storage-environment

Browse Source 
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
This commit is contained in:
Marius Cornea 2016-07-11 17:41:47 +02:00
parent c89f2e3f01
commit 0ac53f566d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/puppet-ceph-devel.yaml
View File

@ -13,6 +13,7 @@ parameter_defaults:
CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
NovaEnableRbdBackend: true NovaEnableRbdBackend: true
CinderEnableRbdBackend: true CinderEnableRbdBackend: true
GlanceBackend: rbd GlanceBackend: rbd

2
environments/storage-environment.yaml
View File

@ -61,3 +61,5 @@ parameter_defaults:
# CephMonKey: '' # CephMonKey: ''
## Ceph admin key, e.g. 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' ## Ceph admin key, e.g. 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
# CephAdminKey: '' # CephAdminKey: ''
## Ceph client key, e.g 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
# CephClientKey: ''