Browse Source

Move auditd, ca-cert, certmonger to deployment

Change-Id: I152762c33ef31a580ce1c7fba5f5e81146b2f00b
Related-Blueprint: services-yaml-flattening
changes/08/655508/4
Dan Prince 2 years ago
committed by Alex Schultz
parent
commit
2e2750b72d
7 changed files with 6 additions and 8 deletions
  1. +0
    -0
      deployment/auditd/auditd-baremetal-puppet.yaml
  2. +0
    -0
      deployment/certs/ca-certs-baremetal-puppet.yaml
  3. +0
    -0
      deployment/certs/certmonger-user-baremetal-puppet.yaml
  4. +1
    -2
      environments/auditd.yaml
  5. +1
    -1
      environments/ssl/enable-internal-tls.j2.yaml
  6. +2
    -2
      overcloud-resource-registry-puppet.j2.yaml
  7. +2
    -3
      sample-env-generator/ssl.yaml

puppet/services/auditd.yaml → deployment/auditd/auditd-baremetal-puppet.yaml View File


puppet/services/ca-certs.yaml → deployment/certs/ca-certs-baremetal-puppet.yaml View File


puppet/services/certmonger-user.yaml → deployment/certs/certmonger-user-baremetal-puppet.yaml View File


+ 1
- 2
environments/auditd.yaml View File

@ -1,6 +1,5 @@
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::AuditD: ../puppet/services/auditd.yaml
OS::TripleO::Services::AuditD: ../deployment/auditd/auditd-baremetal-puppet.yaml
parameter_defaults:
AuditdRules:


+ 1
- 1
environments/ssl/enable-internal-tls.j2.yaml View File

@ -34,7 +34,7 @@ parameter_defaults:
# End static parameters
# *********************
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::IpaClient: ../../extraconfig/services/ipaclient.yaml
OS::TripleO::Services::TLSProxyBase: ../../deployment/apache/apache-baremetal-puppet.yaml


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

@ -111,7 +111,7 @@ resource_registry:
{%- endfor %}
OS::TripleO::Services::Aide: OS::Heat::None
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::CephMgr: 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::DockerRegistry: OS::Heat::None
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::RsyslogSidecar: OS::Heat::None
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None


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

@ -56,8 +56,7 @@ environments:
ipa_enroll: True
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
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
# We use apache as a TLS proxy
# FIXME(bogdando): switch it, once it is containerized
@ -89,7 +88,7 @@ environments:
children:
- name: ssl/inject-trust-anchor-hiera
files:
puppet/services/ca-certs.yaml:
deployment/certs/ca-certs-baremetal-puppet.yaml:
parameters:
- CAMap
# Need to clear this so we don't inherit the parent registry


Loading…
Cancel
Save