From 64e648d815d7365b276b8d5c52cbda2731d60f17 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Fri, 2 Feb 2018 11:37:44 +0200 Subject: [PATCH] Fix the paths for the enable-internal-tls.yaml file in the ssl/ dir These paths were wrong. Change-Id: Id57e2e27b1edc04627c10e6f5a257c24e5e24b28 Closes-Bug: #1746951 --- environments/ssl/enable-internal-tls.yaml | 8 ++++---- sample-env-generator/ssl.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/environments/ssl/enable-internal-tls.yaml b/environments/ssl/enable-internal-tls.yaml index 287ed19f28..80148fd363 100644 --- a/environments/ssl/enable-internal-tls.yaml +++ b/environments/ssl/enable-internal-tls.yaml @@ -30,7 +30,7 @@ parameter_defaults: # End static parameters # ********************* resource_registry: - OS::TripleO::ServiceServerMetadataHook: ../extraconfig/nova_metadata/krb-service-principals.yaml - OS::TripleO::Services::CertmongerUser: ../puppet/services/certmonger-user.yaml - OS::TripleO::Services::HAProxyInternalTLS: ../puppet/services/haproxy-internal-tls-certmonger.yaml - OS::TripleO::Services::TLSProxyBase: ../puppet/services/apache.yaml + OS::TripleO::ServiceServerMetadataHook: ../../extraconfig/nova_metadata/krb-service-principals.yaml + OS::TripleO::Services::CertmongerUser: ../../puppet/services/certmonger-user.yaml + OS::TripleO::Services::HAProxyInternalTLS: ../../puppet/services/haproxy-internal-tls-certmonger.yaml + OS::TripleO::Services::TLSProxyBase: ../../puppet/services/apache.yaml diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index 8a23cef405..bf3e630299 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -49,13 +49,13 @@ environments: ipa_enroll: True resource_registry: - OS::TripleO::Services::CertmongerUser: ../puppet/services/certmonger-user.yaml - OS::TripleO::Services::HAProxyInternalTLS: ../puppet/services/haproxy-internal-tls-certmonger.yaml + OS::TripleO::Services::CertmongerUser: ../../puppet/services/certmonger-user.yaml + OS::TripleO::Services::HAProxyInternalTLS: ../../puppet/services/haproxy-internal-tls-certmonger.yaml # We use apache as a TLS proxy - OS::TripleO::Services::TLSProxyBase: ../puppet/services/apache.yaml + 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 + OS::TripleO::ServiceServerMetadataHook: ../../extraconfig/nova_metadata/krb-service-principals.yaml - name: ssl/inject-trust-anchor title: Inject SSL Trust Anchor on Overcloud Nodes description: |