Move auditd, ca-cert, certmonger to deployment
Change-Id: I152762c33ef31a580ce1c7fba5f5e81146b2f00b Related-Blueprint: services-yaml-flattening
This commit is contained in:
parent
48ca0b4ace
commit
2e2750b72d
|
@ -1,6 +1,5 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
# FIXME(bogdando): switch it, once it is containerized
|
OS::TripleO::Services::AuditD: ../deployment/auditd/auditd-baremetal-puppet.yaml
|
||||||
OS::TripleO::Services::AuditD: ../puppet/services/auditd.yaml
|
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
AuditdRules:
|
AuditdRules:
|
||||||
|
|
|
@ -34,7 +34,7 @@ parameter_defaults:
|
||||||
# End static parameters
|
# End static parameters
|
||||||
# *********************
|
# *********************
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::CertmongerUser: ../../puppet/services/certmonger-user.yaml
|
OS::TripleO::Services::CertmongerUser: ../../deployment/certs/certmonger-user-baremetal-puppet.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: ../../deployment/apache/apache-baremetal-puppet.yaml
|
OS::TripleO::Services::TLSProxyBase: ../../deployment/apache/apache-baremetal-puppet.yaml
|
||||||
|
|
|
@ -111,7 +111,7 @@ resource_registry:
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
OS::TripleO::Services::Aide: OS::Heat::None
|
OS::TripleO::Services::Aide: OS::Heat::None
|
||||||
OS::TripleO::Services::Apache: deployment/apache/apache-baremetal-puppet.yaml
|
OS::TripleO::Services::Apache: deployment/apache/apache-baremetal-puppet.yaml
|
||||||
OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml
|
OS::TripleO::Services::CACerts: deployment/certs/ca-certs-baremetal-puppet.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
|
||||||
OS::TripleO::Services::CephMon: OS::Heat::None
|
OS::TripleO::Services::CephMon: OS::Heat::None
|
||||||
|
@ -322,7 +322,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::Docker: deployment/deprecated/docker/docker-baremetal-ansible.yaml
|
OS::TripleO::Services::Docker: deployment/deprecated/docker/docker-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::DockerRegistry: OS::Heat::None
|
OS::TripleO::Services::DockerRegistry: OS::Heat::None
|
||||||
OS::TripleO::Services::ContainerImagePrepare: deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml
|
OS::TripleO::Services::ContainerImagePrepare: deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::CertmongerUser: puppet/services/certmonger-user.yaml
|
OS::TripleO::Services::CertmongerUser: deployment/certs/certmonger-user-baremetal-puppet.yaml
|
||||||
OS::TripleO::Services::Clustercheck: OS::Heat::None
|
OS::TripleO::Services::Clustercheck: OS::Heat::None
|
||||||
OS::TripleO::Services::RsyslogSidecar: OS::Heat::None
|
OS::TripleO::Services::RsyslogSidecar: OS::Heat::None
|
||||||
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
|
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
|
||||||
|
|
|
@ -56,8 +56,7 @@ environments:
|
||||||
|
|
||||||
ipa_enroll: True
|
ipa_enroll: True
|
||||||
resource_registry:
|
resource_registry:
|
||||||
# FIXME(bogdando): switch it, once it is containerized
|
OS::TripleO::Services::CertmongerUser: ../../deployment/certs/certmonger-user-baremetal-puppet.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
|
||||||
# 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
|
||||||
|
@ -89,7 +88,7 @@ environments:
|
||||||
children:
|
children:
|
||||||
- name: ssl/inject-trust-anchor-hiera
|
- name: ssl/inject-trust-anchor-hiera
|
||||||
files:
|
files:
|
||||||
puppet/services/ca-certs.yaml:
|
deployment/certs/ca-certs-baremetal-puppet.yaml:
|
||||||
parameters:
|
parameters:
|
||||||
- CAMap
|
- CAMap
|
||||||
# Need to clear this so we don't inherit the parent registry
|
# Need to clear this so we don't inherit the parent registry
|
||||||
|
|
Loading…
Reference in New Issue