openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Move apache service under deployment directory"

Browse Source
This commit is contained in:
Zuul 2019-03-28 01:36:58 +00:00 committed by Gerrit Code Review
commit 3a49974ee0
18 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/aodh/aodh-api-container-puppet.yaml
View File

@ -76,7 +76,7 @@ resources:
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

0
puppet/services/apache.j2.yaml → deployment/apache/apache-baremetal-puppet.j2.yaml
View File

2
deployment/barbican/barbican-api-container-puppet.yaml
View File

@ -176,7 +176,7 @@ conditions:
resources: resources:
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/cinder/cinder-api-container-puppet.yaml
View File

@ -103,7 +103,7 @@ resources:
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/deprecated/nova/nova-placement-container-puppet.yaml
View File

@ -79,7 +79,7 @@ resources:
type: OS::TripleO::Services::Logging::NovaPlacement type: OS::TripleO::Services::Logging::NovaPlacement
ApacheServiceBase: ApacheServiceBase:
type: ../../../puppet/services/apache.yaml type: ../../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/deprecated/panko/panko-api-container-puppet.yaml
View File

@ -115,7 +115,7 @@ resources:
type: ../../database/mysql-client.yaml type: ../../database/mysql-client.yaml
ApacheServiceBase: ApacheServiceBase:
type: ../../../puppet/services/apache.yaml type: ../../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
EndpointMap: {get_param: EndpointMap} EndpointMap: {get_param: EndpointMap}
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}

2
deployment/gnocchi/gnocchi-api-container-puppet.yaml
View File

@ -127,7 +127,7 @@ resources:
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/heat/heat-api-cfn-container-puppet.yaml
View File

@ -72,7 +72,7 @@ resources:
type: ../../docker/services/containers-common.yaml type: ../../docker/services/containers-common.yaml
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/heat/heat-api-container-puppet.yaml
View File

@ -86,7 +86,7 @@ resources:
type: ../../docker/services/containers-common.yaml type: ../../docker/services/containers-common.yaml
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/ironic/ironic-api-container-puppet.yaml
View File

@ -69,7 +69,7 @@ conditions:
resources: resources:
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/keystone/keystone-container-puppet.yaml
View File

@ -368,7 +368,7 @@ resources:
type: ../database/mysql-client.yaml type: ../database/mysql-client.yaml
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/manila/manila-api-container-puppet.yaml
View File

@ -79,7 +79,7 @@ resources:
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/nova/nova-api-container-puppet.yaml
View File

@ -146,7 +146,7 @@ resources:
type: OS::TripleO::Services::Logging::NovaApi type: OS::TripleO::Services::Logging::NovaApi
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/nova/nova-metadata-container-puppet.yaml
View File

@ -86,7 +86,7 @@ resources:
type: OS::TripleO::Services::Logging::NovaMetadata type: OS::TripleO::Services::Logging::NovaMetadata
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
deployment/zaqar/zaqar-container-puppet.yaml
View File

@ -91,7 +91,7 @@ conditions:
resources: resources:
ApacheServiceBase: ApacheServiceBase:
type: ../../puppet/services/apache.yaml type: ../../deployment/apache/apache-baremetal-puppet.yaml
properties: properties:
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}

2
environments/ssl/enable-internal-tls.yaml
View File

@ -38,4 +38,4 @@ resource_registry:
OS::TripleO::Services::CertmongerUser: ../../puppet/services/certmonger-user.yaml OS::TripleO::Services::CertmongerUser: ../../puppet/services/certmonger-user.yaml
OS::TripleO::Services::HAProxyInternalTLS: ../../deployment/haproxy/haproxy-internal-tls-certmonger.yaml OS::TripleO::Services::HAProxyInternalTLS: ../../deployment/haproxy/haproxy-internal-tls-certmonger.yaml
OS::TripleO::Services::IpaClient: ../../extraconfig/services/ipaclient.yaml OS::TripleO::Services::IpaClient: ../../extraconfig/services/ipaclient.yaml
OS::TripleO::Services::TLSProxyBase: ../../puppet/services/apache.yaml OS::TripleO::Services::TLSProxyBase: ../../deployment/apache/apache-baremetal-puppet.yaml

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -102,7 +102,7 @@ resource_registry:
# services # services
OS::TripleO::Services: common/services.yaml OS::TripleO::Services: common/services.yaml
OS::TripleO::Services::Aide: OS::Heat::None OS::TripleO::Services::Aide: OS::Heat::None
OS::TripleO::Services::Apache: puppet/services/apache.yaml OS::TripleO::Services::Apache: deployment/apache/apache-baremetal-puppet.yaml
OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml
OS::TripleO::Services::CephMds: OS::Heat::None OS::TripleO::Services::CephMds: OS::Heat::None
OS::TripleO::Services::CephMgr: OS::Heat::None OS::TripleO::Services::CephMgr: OS::Heat::None

2
sample-env-generator/ssl.yaml
View File

@ -62,7 +62,7 @@ environments:
# We use apache as a TLS proxy # We use apache as a TLS proxy
# FIXME(bogdando): switch it, once it is containerized # FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::IpaClient: ../../extraconfig/services/ipaclient.yaml OS::TripleO::Services::IpaClient: ../../extraconfig/services/ipaclient.yaml
OS::TripleO::Services::TLSProxyBase: ../../puppet/services/apache.yaml OS::TripleO::Services::TLSProxyBase: ../../deployment/apache/apache-baremetal-puppet.yaml
# Creates nova metadata that will create the extra service principals per # Creates nova metadata that will create the extra service principals per
# node. # node.
OS::TripleO::ServiceServerMetadataHook: ../../extraconfig/nova_metadata/krb-service-principals.yaml OS::TripleO::ServiceServerMetadataHook: ../../extraconfig/nova_metadata/krb-service-principals.yaml