diff options
author | 2015-11-25 17:58:58 +0000 | |
---|---|---|
committer | 2015-11-25 17:58:58 +0000 | |
commit | 1f007f2f9ff6f65bd04b5cf25534bbcfa2df44ce (patch) | |
tree | 04654e4d13b704a801144ed429fd6b3d43817fa8 /puppet/swift-storage.yaml | |
parent | d35f067ce1dc0bf48251f89cd1dcdeecbf35cc17 (diff) | |
parent | 14c4417e425f832660bd54118112fc991564b38d (diff) |
Merge "Enable trust anchor injection"
Diffstat (limited to 'puppet/swift-storage.yaml')
-rw-r--r-- | puppet/swift-storage.yaml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index 19a7c7a3..b1746dcb 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -218,10 +218,17 @@ resources: enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} + # Resource for site-specific injection of root certificate + NodeTLSCAData: + depends_on: SwiftStorageHieraDeploy + type: OS::TripleO::NodeTLSCAData + properties: + server: {get_resource: SwiftStorage} + # Hook for site-specific additional pre-deployment config, # applying to all nodes, e.g node registration/unregistration NodeExtraConfig: - depends_on: SwiftStorageHieraDeploy + depends_on: NodeTLSCAData type: OS::TripleO::NodeExtraConfig properties: server: {get_resource: SwiftStorage} @@ -272,4 +279,5 @@ outputs: list_join: - ',' - - {get_attr: [SwiftStorageHieraDeploy, deploy_stdout]} + - {get_attr: [NodeTLSCAData, deploy_stdout]} - {get_param: UpdateIdentifier} |