aboutsummaryrefslogtreecommitdiffstats
path: root/environments/enable-tls.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-25 06:11:04 +0000
committerGerrit Code Review <review@openstack.org>2016-08-25 06:11:04 +0000
commit2903a9e4cdb55628ecdd76557e9c7814827d04ab (patch)
tree632be2cb3edfba6a3b32899d37b2e36a2f44cf62 /environments/enable-tls.yaml
parent6d12839f3655f8774ad227bfa4f3cf4d7b45acc5 (diff)
parentb31116a71264beae513ac3bb0ecead95f9e6506f (diff)
Merge "Move resource registry override to enable-tls.yaml"
Diffstat (limited to 'environments/enable-tls.yaml')
-rw-r--r--environments/enable-tls.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/environments/enable-tls.yaml b/environments/enable-tls.yaml
index a3f39ebe..39ded654 100644
--- a/environments/enable-tls.yaml
+++ b/environments/enable-tls.yaml
@@ -7,3 +7,6 @@ parameter_defaults:
SSLIntermediateCertificate: ''
SSLKey: |
The contents of the private key go here
+
+resource_registry:
+ OS::TripleO::NodeTLSData: ../puppet/extraconfig/tls/tls-cert-inject.yaml