Merge "Move apache service under deployment directory"

2019-03-28 01:36:58 +00:00 · 2019-03-28 01:36:58 +00:00 · 3a49974ee0
parent 92f9557bd1 fc65d197c7
commit 3a49974ee0
18 changed files with 17 additions and 17 deletions
--- 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}
--- a/deployment/apache/apache-baremetal-puppet.j2.yaml
+++ b/deployment/apache/apache-baremetal-puppet.j2.yaml
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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}
--- 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
--- 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
--- 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