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/controller.yaml | |
| parent | d35f067ce1dc0bf48251f89cd1dcdeecbf35cc17 (diff) | |
| parent | 14c4417e425f832660bd54118112fc991564b38d (diff) | |
Merge "Enable trust anchor injection"
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 01ff76e0..a7038dec 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -709,9 +709,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} @@ -1318,7 +1325,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} @@ -1398,6 +1405,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} |