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
This commit is contained in:
parent
78c7e24d16
commit
2f3554cdcb
|
@ -2,9 +2,9 @@ resource_registry:
|
||||||
OS::TripleO::Services::DisableUnbound: disable-unbound.yaml
|
OS::TripleO::Services::DisableUnbound: disable-unbound.yaml
|
||||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||||
OS::TripleO::Compute::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::Master: ../../deployment/openshift/openshift-master-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::OpenShift::Worker: ../../extraconfig/services/openshift-worker.yaml
|
OS::TripleO::Services::OpenShift::Worker: ../../deployment/openshift/openshift-master-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::OpenShift::Infra: ../../extraconfig/services/openshift-infra.yaml
|
OS::TripleO::Services::OpenShift::Infra: ../../deployment/openshift/openshift-infra-baremetal-ansible.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
ControllerServices:
|
ControllerServices:
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::Ipsec: ../extraconfig/services/ipsec.yaml
|
OS::TripleO::Services::Ipsec: ../deployment/ipsec/ipsec-baremetal-ansible.yaml
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
resource_registry:
|
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::Kubernetes::Worker: ../extraconfig/services/kubernetes-worker.yaml
|
OS::TripleO::Services::Kubernetes::Worker: ../deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::Kubernetes::Master: ../extraconfig/services/kubernetes-master.yaml
|
OS::TripleO::Services::Kubernetes::Master: ../deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::OpenShift::GlusterFS: ../extraconfig/services/openshift-cns.yaml
|
OS::TripleO::Services::OpenShift::GlusterFS: ../deployment/openshift/openshift-cns-baremetal-ansible.yaml
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::HAproxy: ../deployment/haproxy/haproxy-container-puppet.yaml
|
OS::TripleO::Services::HAproxy: ../deployment/haproxy/haproxy-container-puppet.yaml
|
||||||
OS::TripleO::Services::Keepalived: ../deployment/keepalived/keepalived-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::Infra: ../deployment/openshift/openshift-infra-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::OpenShift::Master: ../extraconfig/services/openshift-master.yaml
|
OS::TripleO::Services::OpenShift::Master: ../deployment/openshift/openshift-master-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::OpenShift::Worker: ../extraconfig/services/openshift-worker.yaml
|
OS::TripleO::Services::OpenShift::Worker: ../deployment/openshift/openshift-worker-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::Podman: ../deployment/podman/podman-baremetal-ansible.yaml
|
OS::TripleO::Services::Podman: ../deployment/podman/podman-baremetal-ansible.yaml
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# A Heat environment file that enables RHSM.
|
# A Heat environment file that enables RHSM.
|
||||||
|
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::Rhsm: ../extraconfig/services/rhsm.yaml
|
OS::TripleO::Services::Rhsm: ../deployment/rhsm/rhsm-baremetal-ansible.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
# RhsmVars:
|
# RhsmVars:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::SkydiveAnalyzer: ../../extraconfig/services/skydive-analyzer.yaml
|
OS::TripleO::Services::SkydiveAnalyzer: ../../deployment/skydive/skydive-analyzer-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::SkydiveAgent: ../../extraconfig/services/skydive-agent.yaml
|
OS::TripleO::Services::SkydiveAgent: ../../deployment/skydive/skydive-agent-baremetal-ansible.yaml
|
||||||
|
|
||||||
#parameter_defaults:
|
#parameter_defaults:
|
||||||
# SkydiveVars:
|
# SkydiveVars:
|
||||||
|
|
|
@ -36,7 +36,7 @@ parameter_defaults:
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::CertmongerUser: ../../deployment/certs/certmonger-user-baremetal-puppet.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: ../../deployment/ipa/ipaclient-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::TLSProxyBase: ../../deployment/apache/apache-baremetal-puppet.yaml
|
OS::TripleO::Services::TLSProxyBase: ../../deployment/apache/apache-baremetal-puppet.yaml
|
||||||
{%- for role in roles %}
|
{%- for role in roles %}
|
||||||
OS::TripleO::{{role.name}}ServiceServerMetadataHook: ../../extraconfig/nova_metadata/krb-service-principals/{{role.name.lower()}}-role.yaml
|
OS::TripleO::{{role.name}}ServiceServerMetadataHook: ../../extraconfig/nova_metadata/krb-service-principals/{{role.name.lower()}}-role.yaml
|
||||||
|
|
|
@ -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.
|
|
|
@ -129,8 +129,8 @@ resource_registry:
|
||||||
OS::TripleO::Services::HeatApiCloudwatch: deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
|
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::HeatEngine: deployment/heat/heat-engine-container-puppet.yaml
|
||||||
OS::TripleO::Services::Kernel: deployment/kernel/kernel-baremetal-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::Master: deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::Kubernetes::Worker: extraconfig/services/kubernetes-worker.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::MySQL: deployment/database/mysql-container-puppet.yaml
|
||||||
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
|
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
|
||||||
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
|
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
other:
|
||||||
|
- |
|
||||||
|
Services that were in extraconfig/services are now in deployment directory
|
||||||
|
among other services.
|
|
@ -60,7 +60,7 @@ environments:
|
||||||
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
|
||||||
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
|
OS::TripleO::Services::TLSProxyBase: ../../deployment/apache/apache-baremetal-puppet.yaml
|
||||||
# Creates nova metadata that will create the extra service principals per
|
# Creates nova metadata that will create the extra service principals per
|
||||||
# node.
|
# node.
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
- ^ci/common/.*$
|
- ^ci/common/.*$
|
||||||
- ^coe/kubernetes.*$
|
- ^coe/kubernetes.*$
|
||||||
- ^environments/kubernetes.*$
|
- ^environments/kubernetes.*$
|
||||||
- ^extraconfig/services/kubernetes.*$
|
- ^deployment/kubernetes/.*$
|
||||||
- ci/environments/scenario006-multinode.yaml
|
- ci/environments/scenario006-multinode.yaml
|
||||||
- ci/pingtests/scenario006-multinode.yaml
|
- ci/pingtests/scenario006-multinode.yaml
|
||||||
- ^deployed-server/.*$
|
- ^deployed-server/.*$
|
||||||
|
@ -80,7 +80,7 @@
|
||||||
files:
|
files:
|
||||||
- ^coe/openshift.*$
|
- ^coe/openshift.*$
|
||||||
- ^environments/openshift.*$
|
- ^environments/openshift.*$
|
||||||
- ^extraconfig/services/openshift.*$
|
- ^deployment/openshift/.*$
|
||||||
- ^(deployment|docker|puppet)/.*haproxy.*$
|
- ^(deployment|docker|puppet)/.*haproxy.*$
|
||||||
- ^(deployment|docker|puppet)/.*keepalived.*$
|
- ^(deployment|docker|puppet)/.*keepalived.*$
|
||||||
- ^(deployment|docker|puppet)/.*mistral.*$
|
- ^(deployment|docker|puppet)/.*mistral.*$
|
||||||
|
|
Loading…
Reference in New Issue