From fc65d197c791f9a3cba878b216bddeb924053fd3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 25 Mar 2019 17:16:37 -0400 Subject: [PATCH] Move apache service under deployment directory Move the apache service undercloud the deployment directory. Change-Id: Iead4f910390cb75f56f96da2d24889a461275c9d Related-Blueprint: services-yaml-flattening --- deployment/aodh/aodh-api-container-puppet.yaml | 2 +- .../apache/apache-baremetal-puppet.j2.yaml | 0 deployment/barbican/barbican-api-container-puppet.yaml | 2 +- deployment/cinder/cinder-api-container-puppet.yaml | 2 +- deployment/deprecated/nova/nova-placement-container-puppet.yaml | 2 +- deployment/deprecated/panko/panko-api-container-puppet.yaml | 2 +- deployment/gnocchi/gnocchi-api-container-puppet.yaml | 2 +- deployment/heat/heat-api-cfn-container-puppet.yaml | 2 +- deployment/heat/heat-api-container-puppet.yaml | 2 +- deployment/ironic/ironic-api-container-puppet.yaml | 2 +- deployment/keystone/keystone-container-puppet.yaml | 2 +- deployment/manila/manila-api-container-puppet.yaml | 2 +- deployment/nova/nova-api-container-puppet.yaml | 2 +- deployment/nova/nova-metadata-container-puppet.yaml | 2 +- deployment/zaqar/zaqar-container-puppet.yaml | 2 +- environments/ssl/enable-internal-tls.yaml | 2 +- overcloud-resource-registry-puppet.j2.yaml | 2 +- sample-env-generator/ssl.yaml | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename puppet/services/apache.j2.yaml => deployment/apache/apache-baremetal-puppet.j2.yaml (100%) diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index b0d1d6dea9..9442b475ea 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -76,7 +76,7 @@ resources: RoleParameters: {get_param: RoleParameters} ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/puppet/services/apache.j2.yaml b/deployment/apache/apache-baremetal-puppet.j2.yaml similarity index 100% rename from puppet/services/apache.j2.yaml rename to deployment/apache/apache-baremetal-puppet.j2.yaml diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index c1a7c08506..75e2b10e22 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -176,7 +176,7 @@ conditions: resources: ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index edb6c6f6cb..0b4315d95e 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -103,7 +103,7 @@ resources: RoleParameters: {get_param: RoleParameters} ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/deprecated/nova/nova-placement-container-puppet.yaml b/deployment/deprecated/nova/nova-placement-container-puppet.yaml index 4051bc4263..bc20bf00d8 100644 --- a/deployment/deprecated/nova/nova-placement-container-puppet.yaml +++ b/deployment/deprecated/nova/nova-placement-container-puppet.yaml @@ -79,7 +79,7 @@ resources: type: OS::TripleO::Services::Logging::NovaPlacement ApacheServiceBase: - type: ../../../puppet/services/apache.yaml + type: ../../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/deprecated/panko/panko-api-container-puppet.yaml b/deployment/deprecated/panko/panko-api-container-puppet.yaml index baa489f619..2f44c26d1c 100644 --- a/deployment/deprecated/panko/panko-api-container-puppet.yaml +++ b/deployment/deprecated/panko/panko-api-container-puppet.yaml @@ -115,7 +115,7 @@ resources: type: ../../database/mysql-client.yaml ApacheServiceBase: - type: ../../../puppet/services/apache.yaml + type: ../../../deployment/apache/apache-baremetal-puppet.yaml properties: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index ffe1a87a49..c658d36e0b 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -127,7 +127,7 @@ resources: RoleParameters: {get_param: RoleParameters} ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 49a33dcdbf..9efd190275 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -72,7 +72,7 @@ resources: type: ../../docker/services/containers-common.yaml ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index 47ace4bfc9..eae7051f6c 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -86,7 +86,7 @@ resources: type: ../../docker/services/containers-common.yaml ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index be649c89a0..61964bae2e 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -69,7 +69,7 @@ conditions: resources: ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 1a342e3892..3853ea39c8 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -368,7 +368,7 @@ resources: type: ../database/mysql-client.yaml ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 259f9e5bac..8631910f35 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -79,7 +79,7 @@ resources: RoleParameters: {get_param: RoleParameters} ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 88301a3834..2947a6fa01 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -146,7 +146,7 @@ resources: type: OS::TripleO::Services::Logging::NovaApi ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index cbe9181215..b97744351d 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -86,7 +86,7 @@ resources: type: OS::TripleO::Services::Logging::NovaMetadata ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index 8cd8767b67..1dfc75d6c2 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -91,7 +91,7 @@ conditions: resources: ApacheServiceBase: - type: ../../puppet/services/apache.yaml + type: ../../deployment/apache/apache-baremetal-puppet.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} diff --git a/environments/ssl/enable-internal-tls.yaml b/environments/ssl/enable-internal-tls.yaml index 38bc5ac6d0..7962b3179b 100644 --- a/environments/ssl/enable-internal-tls.yaml +++ b/environments/ssl/enable-internal-tls.yaml @@ -38,4 +38,4 @@ resource_registry: OS::TripleO::Services::CertmongerUser: ../../puppet/services/certmonger-user.yaml OS::TripleO::Services::HAProxyInternalTLS: ../../deployment/haproxy/haproxy-internal-tls-certmonger.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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 15e7580544..efe8631924 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -102,7 +102,7 @@ resource_registry: # services OS::TripleO::Services: common/services.yaml 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::CephMds: OS::Heat::None OS::TripleO::Services::CephMgr: OS::Heat::None diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index 01a42669d8..52d31f5198 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -62,7 +62,7 @@ environments: # We use apache as a TLS proxy # FIXME(bogdando): switch it, once it is containerized 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 # node. OS::TripleO::ServiceServerMetadataHook: ../../extraconfig/nova_metadata/krb-service-principals.yaml