Browse Source

Remove extraconfig/services directory

... and move the services into the deployment directory.

The extraconfig/services directory was initially created for
experimental services using an interface that was work in progress but
is now stable enough, so the services can live among the others for
simplification.

Change-Id: I2bd0b169ed18ea2fccfea4475402dd73076924c8
changes/40/671140/3
Emilien Macchi 2 years ago
parent
commit
2f3554cdcb
25 changed files with 24 additions and 25 deletions
  1. +3
    -3
      ci/environments/scenario009-multinode.yaml
  2. +0
    -0
      deployment/ipa/ipaclient-baremetal-ansible.yaml
  3. +0
    -0
      deployment/ipsec/ipsec-baremetal-ansible.yaml
  4. +0
    -0
      deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml
  5. +0
    -0
      deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml
  6. +0
    -0
      deployment/openshift/openshift-cns-baremetal-ansible.yaml
  7. +0
    -0
      deployment/openshift/openshift-infra-baremetal-ansible.yaml
  8. +0
    -0
      deployment/openshift/openshift-master-baremetal-ansible.yaml
  9. +0
    -0
      deployment/openshift/openshift-node-baremetal-ansible.yaml
  10. +0
    -0
      deployment/openshift/openshift-worker-baremetal-ansible.yaml
  11. +0
    -0
      deployment/rhsm/rhsm-baremetal-ansible.yaml
  12. +0
    -0
      deployment/skydive/skydive-agent-baremetal-ansible.yaml
  13. +0
    -0
      deployment/skydive/skydive-analyzer-baremetal-ansible.yaml
  14. +1
    -1
      environments/ipsec.yaml
  15. +2
    -2
      environments/kubernetes.yaml
  16. +1
    -1
      environments/openshift-cns.yaml
  17. +3
    -3
      environments/openshift.yaml
  18. +1
    -1
      environments/rhsm.yaml
  19. +2
    -2
      environments/services/skydive-environment.yaml
  20. +1
    -1
      environments/ssl/enable-internal-tls.j2.yaml
  21. +0
    -6
      extraconfig/services/README.rst
  22. +2
    -2
      overcloud-resource-registry-puppet.j2.yaml
  23. +5
    -0
      releasenotes/notes/extraconfig_services-18ca28841974b8dd.yaml
  24. +1
    -1
      sample-env-generator/ssl.yaml
  25. +2
    -2
      zuul.d/layout.yaml

+ 3
- 3
ci/environments/scenario009-multinode.yaml View File

@ -2,9 +2,9 @@ resource_registry:
OS::TripleO::Services::DisableUnbound: disable-unbound.yaml
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::OpenShift::Master: ../../extraconfig/services/openshift-master.yaml
OS::TripleO::Services::OpenShift::Worker: ../../extraconfig/services/openshift-worker.yaml
OS::TripleO::Services::OpenShift::Infra: ../../extraconfig/services/openshift-infra.yaml
OS::TripleO::Services::OpenShift::Master: ../../deployment/openshift/openshift-master-baremetal-ansible.yaml
OS::TripleO::Services::OpenShift::Worker: ../../deployment/openshift/openshift-master-baremetal-ansible.yaml
OS::TripleO::Services::OpenShift::Infra: ../../deployment/openshift/openshift-infra-baremetal-ansible.yaml
parameter_defaults:
ControllerServices:


extraconfig/services/ipaclient.yaml → deployment/ipa/ipaclient-baremetal-ansible.yaml View File


extraconfig/services/ipsec.yaml → deployment/ipsec/ipsec-baremetal-ansible.yaml View File


extraconfig/services/kubernetes-master.yaml → deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml View File


extraconfig/services/kubernetes-worker.yaml → deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml View File


extraconfig/services/openshift-cns.yaml → deployment/openshift/openshift-cns-baremetal-ansible.yaml View File


extraconfig/services/openshift-infra.yaml → deployment/openshift/openshift-infra-baremetal-ansible.yaml View File


extraconfig/services/openshift-master.yaml → deployment/openshift/openshift-master-baremetal-ansible.yaml View File


extraconfig/services/openshift-node.yaml → deployment/openshift/openshift-node-baremetal-ansible.yaml View File


extraconfig/services/openshift-worker.yaml → deployment/openshift/openshift-worker-baremetal-ansible.yaml View File


extraconfig/services/rhsm.yaml → deployment/rhsm/rhsm-baremetal-ansible.yaml View File


extraconfig/services/skydive-agent.yaml → deployment/skydive/skydive-agent-baremetal-ansible.yaml View File


extraconfig/services/skydive-analyzer.yaml → deployment/skydive/skydive-analyzer-baremetal-ansible.yaml View File


+ 1
- 1
environments/ipsec.yaml View File

@ -1,2 +1,2 @@
resource_registry:
OS::TripleO::Services::Ipsec: ../extraconfig/services/ipsec.yaml
OS::TripleO::Services::Ipsec: ../deployment/ipsec/ipsec-baremetal-ansible.yaml

+ 2
- 2
environments/kubernetes.yaml View File

@ -1,4 +1,4 @@
resource_registry:
OS::TripleO::Services::Docker: ../deployment/deprecated/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::Kubernetes::Worker: ../extraconfig/services/kubernetes-worker.yaml
OS::TripleO::Services::Kubernetes::Master: ../extraconfig/services/kubernetes-master.yaml
OS::TripleO::Services::Kubernetes::Worker: ../deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml
OS::TripleO::Services::Kubernetes::Master: ../deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml

+ 1
- 1
environments/openshift-cns.yaml View File

@ -1,2 +1,2 @@
resource_registry:
OS::TripleO::Services::OpenShift::GlusterFS: ../extraconfig/services/openshift-cns.yaml
OS::TripleO::Services::OpenShift::GlusterFS: ../deployment/openshift/openshift-cns-baremetal-ansible.yaml

+ 3
- 3
environments/openshift.yaml View File

@ -1,7 +1,7 @@
resource_registry:
OS::TripleO::Services::HAproxy: ../deployment/haproxy/haproxy-container-puppet.yaml
OS::TripleO::Services::Keepalived: ../deployment/keepalived/keepalived-container-puppet.yaml
OS::TripleO::Services::OpenShift::Infra: ../extraconfig/services/openshift-infra.yaml
OS::TripleO::Services::OpenShift::Master: ../extraconfig/services/openshift-master.yaml
OS::TripleO::Services::OpenShift::Worker: ../extraconfig/services/openshift-worker.yaml
OS::TripleO::Services::OpenShift::Infra: ../deployment/openshift/openshift-infra-baremetal-ansible.yaml
OS::TripleO::Services::OpenShift::Master: ../deployment/openshift/openshift-master-baremetal-ansible.yaml
OS::TripleO::Services::OpenShift::Worker: ../deployment/openshift/openshift-worker-baremetal-ansible.yaml
OS::TripleO::Services::Podman: ../deployment/podman/podman-baremetal-ansible.yaml

+ 1
- 1
environments/rhsm.yaml View File

@ -1,7 +1,7 @@
# A Heat environment file that enables RHSM.
resource_registry:
OS::TripleO::Services::Rhsm: ../extraconfig/services/rhsm.yaml
OS::TripleO::Services::Rhsm: ../deployment/rhsm/rhsm-baremetal-ansible.yaml
parameter_defaults:
# RhsmVars:


+ 2
- 2
environments/services/skydive-environment.yaml View File

@ -1,6 +1,6 @@
resource_registry:
OS::TripleO::Services::SkydiveAnalyzer: ../../extraconfig/services/skydive-analyzer.yaml
OS::TripleO::Services::SkydiveAgent: ../../extraconfig/services/skydive-agent.yaml
OS::TripleO::Services::SkydiveAnalyzer: ../../deployment/skydive/skydive-analyzer-baremetal-ansible.yaml
OS::TripleO::Services::SkydiveAgent: ../../deployment/skydive/skydive-agent-baremetal-ansible.yaml
#parameter_defaults:
# SkydiveVars:


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

@ -36,7 +36,7 @@ parameter_defaults:
resource_registry:
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::IpaClient: ../../deployment/ipa/ipaclient-baremetal-ansible.yaml
OS::TripleO::Services::TLSProxyBase: ../../deployment/apache/apache-baremetal-puppet.yaml
{%- for role in roles %}
OS::TripleO::{{role.name}}ServiceServerMetadataHook: ../../extraconfig/nova_metadata/krb-service-principals/{{role.name.lower()}}-role.yaml


+ 0
- 6
extraconfig/services/README.rst View File

@ -1,6 +0,0 @@
=============================
Externally Installed Services
=============================
The services in this directory and the Ansible hook they use
(`external_deploy_tasks`) are currently considered experimental.

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

@ -129,8 +129,8 @@ resource_registry:
OS::TripleO::Services::HeatApiCloudwatch: deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
OS::TripleO::Services::HeatEngine: deployment/heat/heat-engine-container-puppet.yaml
OS::TripleO::Services::Kernel: deployment/kernel/kernel-baremetal-puppet.yaml
OS::TripleO::Services::Kubernetes::Master: extraconfig/services/kubernetes-master.yaml
OS::TripleO::Services::Kubernetes::Worker: extraconfig/services/kubernetes-worker.yaml
OS::TripleO::Services::Kubernetes::Master: deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml
OS::TripleO::Services::Kubernetes::Worker: deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml
OS::TripleO::Services::MySQL: deployment/database/mysql-container-puppet.yaml
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None


+ 5
- 0
releasenotes/notes/extraconfig_services-18ca28841974b8dd.yaml View File

@ -0,0 +1,5 @@
---
other:
- |
Services that were in extraconfig/services are now in deployment directory
among other services.

+ 1
- 1
sample-env-generator/ssl.yaml View File

@ -60,7 +60,7 @@ environments:
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
OS::TripleO::Services::IpaClient: ../../extraconfig/services/ipaclient.yaml
OS::TripleO::Services::IpaClient: ../../deployment/ipa/ipaclient-baremetal-ansible.yaml
OS::TripleO::Services::TLSProxyBase: ../../deployment/apache/apache-baremetal-puppet.yaml
# Creates nova metadata that will create the extra service principals per
# node.


+ 2
- 2
zuul.d/layout.yaml View File

@ -57,7 +57,7 @@
- ^ci/common/.*$
- ^coe/kubernetes.*$
- ^environments/kubernetes.*$
- ^extraconfig/services/kubernetes.*$
- ^deployment/kubernetes/.*$
- ci/environments/scenario006-multinode.yaml
- ci/pingtests/scenario006-multinode.yaml
- ^deployed-server/.*$
@ -80,7 +80,7 @@
files:
- ^coe/openshift.*$
- ^environments/openshift.*$
- ^extraconfig/services/openshift.*$
- ^deployment/openshift/.*$
- ^(deployment|docker|puppet)/.*haproxy.*$
- ^(deployment|docker|puppet)/.*keepalived.*$
- ^(deployment|docker|puppet)/.*mistral.*$


Loading…
Cancel
Save