diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-25 17:58:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-25 17:58:58 +0000 |
| commit | 1f007f2f9ff6f65bd04b5cf25534bbcfa2df44ce (patch) | |
| tree | 04654e4d13b704a801144ed429fd6b3d43817fa8 /puppet/ceph-storage.yaml | |
| parent | d35f067ce1dc0bf48251f89cd1dcdeecbf35cc17 (diff) | |
| parent | 14c4417e425f832660bd54118112fc991564b38d (diff) | |
Merge "Enable trust anchor injection"
Diffstat (limited to 'puppet/ceph-storage.yaml')
| -rw-r--r-- | puppet/ceph-storage.yaml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index 0bf0fde4..7d36b46c 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -176,6 +176,13 @@ resources: ceph::profile::params::cluster_network: {get_input: ceph_cluster_network} ceph::profile::params::public_network: {get_input: ceph_public_network} + # Resource for site-specific injection of root certificate + NodeTLSCAData: + depends_on: CephStorageDeployment + type: OS::TripleO::NodeTLSCAData + properties: + server: {get_resource: CephStorage} + # Hook for site-specific additional pre-deployment config, e.g extra hieradata CephStorageExtraConfigPre: depends_on: CephStorageDeployment @@ -186,7 +193,7 @@ resources: # Hook for site-specific additional pre-deployment config, # applying to all nodes, e.g node registration/unregistration NodeExtraConfig: - depends_on: CephStorageExtraConfigPre + depends_on: [CephStorageExtraConfigPre, NodeTLSCAData] type: OS::TripleO::NodeExtraConfig properties: server: {get_resource: CephStorage} @@ -227,5 +234,6 @@ outputs: list_join: - ',' - - {get_attr: [CephStorageDeployment, deploy_stdout]} + - {get_attr: [NodeTLSCAData, deploy_stdout]} - {get_attr: [CephStorageExtraConfigPre, deploy_stdout]} - {get_param: UpdateIdentifier} |