summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-26 22:27:14 +0000
committerGerrit Code Review <review@openstack.org>2017-01-26 22:27:14 +0000
commita8fc56e6794dd4886379a5a8d2b5de08916a7eac (patch)
tree9538ecd2d15d13bb52fcbde66f16458745546c24
parentc6fe0a1aea125e2f66de44dd560cea116edd9bcf (diff)
parentc6b6466f079097271072c35720462eb6a7414de7 (diff)
Merge "Add novajoin entries to the TLS-everywhere environment file"
-rw-r--r--environments/enable-internal-tls.yaml9
1 files changed, 9 insertions, 0 deletions
diff --git a/environments/enable-internal-tls.yaml b/environments/enable-internal-tls.yaml
index d2fc59c6..ff4ecfbe 100644
--- a/environments/enable-internal-tls.yaml
+++ b/environments/enable-internal-tls.yaml
@@ -2,9 +2,18 @@
# a TLS for in the internal network via certmonger
parameter_defaults:
EnableInternalTLS: true
+
+ # Required for novajoin to enroll the overcloud nodes
+ ServerMetadata:
+ ipa_enroll: True
+
resource_registry:
OS::TripleO::Services::HAProxyInternalTLS: ../puppet/services/haproxy-internal-tls-certmonger.yaml
OS::TripleO::Services::ApacheTLS: ../puppet/services/apache-internal-tls-certmonger.yaml
OS::TripleO::Services::MySQLTLS: ../puppet/services/database/mysql-internal-tls-certmonger.yaml
# We use apache as a TLS proxy
OS::TripleO::Services::TLSProxyBase: ../puppet/services/apache.yaml
+
+ # Creates nova metadata that will create the extra service principals per
+ # node.
+ OS::TripleO::ServiceServerMetadataHook: ../extraconfig/nova_metadata/krb-service-principals.yaml