diff options
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 12 |
1 files changed, 10 insertions, 2 deletions
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} |