From 14c4417e425f832660bd54118112fc991564b38d Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 3 Nov 2015 15:27:28 +0200 Subject: Enable trust anchor injection This commit enables the injection of a trust anchor or root certificate into every node in the overcloud. This is in case that the TLS certificates for the controllers are signed with a self-signed CA or if the deployer would like to inject a relevant root certificate for other purposes. In this case the other nodes might need to have the root certificate in their trust chain in order to do proper validation Change-Id: Ia45180fe0bb979cf12d19f039dbfd22e26fb4856 --- puppet/controller.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'puppet/controller.yaml') diff --git a/puppet/controller.yaml b/puppet/controller.yaml index e6289219..81fa6c11 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -701,9 +701,16 @@ resources: bridge_name: br-ex interface_name: {get_param: NeutronPublicInterface} + # Resource for site-specific injection of root certificate + NodeTLSCAData: + depends_on: NetworkDeployment + type: OS::TripleO::NodeTLSCAData + properties: + server: {get_resource: Controller} + # Hook for site-specific passing of private keys/certificates NodeTLSData: - depends_on: NetworkDeployment + depends_on: NodeTLSCAData type: OS::TripleO::NodeTLSData properties: server: {get_resource: Controller} @@ -1305,7 +1312,7 @@ resources: # Hook for site-specific additional pre-deployment config, # applying to all nodes, e.g node registration/unregistration NodeExtraConfig: - depends_on: ControllerExtraConfigPre + depends_on: [ControllerExtraConfigPre, NodeTLSData] type: OS::TripleO::NodeExtraConfig properties: server: {get_resource: Controller} @@ -1385,6 +1392,7 @@ outputs: list_join: - ',' - - {get_attr: [ControllerDeployment, deploy_stdout]} + - {get_attr: [NodeTLSCAData, deploy_stdout]} - {get_attr: [NodeTLSData, deploy_stdout]} - {get_attr: [ControllerExtraConfigPre, deploy_stdout]} - {get_param: UpdateIdentifier} -- cgit 1.2.3-korg