summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-13 11:42:23 +0000
committerGerrit Code Review <review@openstack.org>2016-10-13 11:42:23 +0000
commit8b9e9ff4ccbe52979f68416a96a863e9379d2619 (patch)
treea3b59ad1fb139b25e818909560700ab4be6468bb
parenta3f9cf1314ae2d29ba68c012069dcc2b2431aa05 (diff)
parentd2af1b887ae92837c501be3df9b18d9e0c9694ef (diff)
Merge "Add flag for internal TLS"
-rw-r--r--environments/enable-internal-tls.yaml2
-rw-r--r--puppet/all-nodes-config.yaml4
2 files changed, 6 insertions, 0 deletions
diff --git a/environments/enable-internal-tls.yaml b/environments/enable-internal-tls.yaml
new file mode 100644
index 00000000..801dcde9
--- /dev/null
+++ b/environments/enable-internal-tls.yaml
@@ -0,0 +1,2 @@
+parameter_defaults:
+ EnableInternalTLS: true
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index cae60aab..d64f70db 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -64,6 +64,9 @@ parameters:
CertmongerCA:
type: string
default: 'IPA'
+ EnableInternalTLS:
+ type: boolean
+ default: false
resources:
@@ -207,6 +210,7 @@ resources:
cloud_name_ctlplane: {get_param: cloud_name_ctlplane}
# TLS parameters
certmonger_ca: {get_param: CertmongerCA}
+ enable_internal_tls: {get_param: EnableInternalTLS}
outputs:
config_id: