From 2f3554cdcbba1e189e1f3a74f93e1c283bc6df26 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 16 Jul 2019 15:35:28 -0400 Subject: [PATCH] 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 --- ci/environments/scenario009-multinode.yaml | 6 +++--- .../ipa/ipaclient-baremetal-ansible.yaml | 0 .../ipsec/ipsec-baremetal-ansible.yaml | 0 .../kubernetes/kubernetes-master-baremetal-ansible.yaml | 0 .../kubernetes/kubernetes-worker-baremetal-ansible.yaml | 0 .../openshift/openshift-cns-baremetal-ansible.yaml | 0 .../openshift/openshift-infra-baremetal-ansible.yaml | 0 .../openshift/openshift-master-baremetal-ansible.yaml | 0 .../openshift/openshift-node-baremetal-ansible.yaml | 0 .../openshift/openshift-worker-baremetal-ansible.yaml | 0 .../rhsm/rhsm-baremetal-ansible.yaml | 0 .../skydive/skydive-agent-baremetal-ansible.yaml | 0 .../skydive/skydive-analyzer-baremetal-ansible.yaml | 0 environments/ipsec.yaml | 2 +- environments/kubernetes.yaml | 4 ++-- environments/openshift-cns.yaml | 2 +- environments/openshift.yaml | 6 +++--- environments/rhsm.yaml | 2 +- environments/services/skydive-environment.yaml | 4 ++-- environments/ssl/enable-internal-tls.j2.yaml | 2 +- extraconfig/services/README.rst | 6 ------ overcloud-resource-registry-puppet.j2.yaml | 4 ++-- .../notes/extraconfig_services-18ca28841974b8dd.yaml | 5 +++++ sample-env-generator/ssl.yaml | 2 +- zuul.d/layout.yaml | 4 ++-- 25 files changed, 24 insertions(+), 25 deletions(-) rename extraconfig/services/ipaclient.yaml => deployment/ipa/ipaclient-baremetal-ansible.yaml (100%) rename extraconfig/services/ipsec.yaml => deployment/ipsec/ipsec-baremetal-ansible.yaml (100%) rename extraconfig/services/kubernetes-master.yaml => deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml (100%) rename extraconfig/services/kubernetes-worker.yaml => deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml (100%) rename extraconfig/services/openshift-cns.yaml => deployment/openshift/openshift-cns-baremetal-ansible.yaml (100%) rename extraconfig/services/openshift-infra.yaml => deployment/openshift/openshift-infra-baremetal-ansible.yaml (100%) rename extraconfig/services/openshift-master.yaml => deployment/openshift/openshift-master-baremetal-ansible.yaml (100%) rename extraconfig/services/openshift-node.yaml => deployment/openshift/openshift-node-baremetal-ansible.yaml (100%) rename extraconfig/services/openshift-worker.yaml => deployment/openshift/openshift-worker-baremetal-ansible.yaml (100%) rename extraconfig/services/rhsm.yaml => deployment/rhsm/rhsm-baremetal-ansible.yaml (100%) rename extraconfig/services/skydive-agent.yaml => deployment/skydive/skydive-agent-baremetal-ansible.yaml (100%) rename extraconfig/services/skydive-analyzer.yaml => deployment/skydive/skydive-analyzer-baremetal-ansible.yaml (100%) delete mode 100644 extraconfig/services/README.rst create mode 100644 releasenotes/notes/extraconfig_services-18ca28841974b8dd.yaml diff --git a/ci/environments/scenario009-multinode.yaml b/ci/environments/scenario009-multinode.yaml index ad6f9063da..f6480c51bb 100644 --- a/ci/environments/scenario009-multinode.yaml +++ b/ci/environments/scenario009-multinode.yaml @@ -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: diff --git a/extraconfig/services/ipaclient.yaml b/deployment/ipa/ipaclient-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/ipaclient.yaml rename to deployment/ipa/ipaclient-baremetal-ansible.yaml diff --git a/extraconfig/services/ipsec.yaml b/deployment/ipsec/ipsec-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/ipsec.yaml rename to deployment/ipsec/ipsec-baremetal-ansible.yaml diff --git a/extraconfig/services/kubernetes-master.yaml b/deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/kubernetes-master.yaml rename to deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml diff --git a/extraconfig/services/kubernetes-worker.yaml b/deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/kubernetes-worker.yaml rename to deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml diff --git a/extraconfig/services/openshift-cns.yaml b/deployment/openshift/openshift-cns-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/openshift-cns.yaml rename to deployment/openshift/openshift-cns-baremetal-ansible.yaml diff --git a/extraconfig/services/openshift-infra.yaml b/deployment/openshift/openshift-infra-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/openshift-infra.yaml rename to deployment/openshift/openshift-infra-baremetal-ansible.yaml diff --git a/extraconfig/services/openshift-master.yaml b/deployment/openshift/openshift-master-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/openshift-master.yaml rename to deployment/openshift/openshift-master-baremetal-ansible.yaml diff --git a/extraconfig/services/openshift-node.yaml b/deployment/openshift/openshift-node-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/openshift-node.yaml rename to deployment/openshift/openshift-node-baremetal-ansible.yaml diff --git a/extraconfig/services/openshift-worker.yaml b/deployment/openshift/openshift-worker-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/openshift-worker.yaml rename to deployment/openshift/openshift-worker-baremetal-ansible.yaml diff --git a/extraconfig/services/rhsm.yaml b/deployment/rhsm/rhsm-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/rhsm.yaml rename to deployment/rhsm/rhsm-baremetal-ansible.yaml diff --git a/extraconfig/services/skydive-agent.yaml b/deployment/skydive/skydive-agent-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/skydive-agent.yaml rename to deployment/skydive/skydive-agent-baremetal-ansible.yaml diff --git a/extraconfig/services/skydive-analyzer.yaml b/deployment/skydive/skydive-analyzer-baremetal-ansible.yaml similarity index 100% rename from extraconfig/services/skydive-analyzer.yaml rename to deployment/skydive/skydive-analyzer-baremetal-ansible.yaml diff --git a/environments/ipsec.yaml b/environments/ipsec.yaml index 2aa17afea7..a745e9b303 100644 --- a/environments/ipsec.yaml +++ b/environments/ipsec.yaml @@ -1,2 +1,2 @@ resource_registry: - OS::TripleO::Services::Ipsec: ../extraconfig/services/ipsec.yaml + OS::TripleO::Services::Ipsec: ../deployment/ipsec/ipsec-baremetal-ansible.yaml diff --git a/environments/kubernetes.yaml b/environments/kubernetes.yaml index 6dd74a9f02..d2ba91313c 100644 --- a/environments/kubernetes.yaml +++ b/environments/kubernetes.yaml @@ -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 diff --git a/environments/openshift-cns.yaml b/environments/openshift-cns.yaml index a3ce11a814..bb2d50181b 100644 --- a/environments/openshift-cns.yaml +++ b/environments/openshift-cns.yaml @@ -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 diff --git a/environments/openshift.yaml b/environments/openshift.yaml index 335e5a3fbb..d8191741e5 100644 --- a/environments/openshift.yaml +++ b/environments/openshift.yaml @@ -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 diff --git a/environments/rhsm.yaml b/environments/rhsm.yaml index d60676e9b7..20b7e7a3de 100644 --- a/environments/rhsm.yaml +++ b/environments/rhsm.yaml @@ -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: diff --git a/environments/services/skydive-environment.yaml b/environments/services/skydive-environment.yaml index c67bff73c6..156ca26101 100644 --- a/environments/services/skydive-environment.yaml +++ b/environments/services/skydive-environment.yaml @@ -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: diff --git a/environments/ssl/enable-internal-tls.j2.yaml b/environments/ssl/enable-internal-tls.j2.yaml index c03b8b4a0d..8165cfec2e 100644 --- a/environments/ssl/enable-internal-tls.j2.yaml +++ b/environments/ssl/enable-internal-tls.j2.yaml @@ -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 diff --git a/extraconfig/services/README.rst b/extraconfig/services/README.rst deleted file mode 100644 index b89bf60f04..0000000000 --- a/extraconfig/services/README.rst +++ /dev/null @@ -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. diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 59ca6ebbec..43e0d040ad 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -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 diff --git a/releasenotes/notes/extraconfig_services-18ca28841974b8dd.yaml b/releasenotes/notes/extraconfig_services-18ca28841974b8dd.yaml new file mode 100644 index 0000000000..82e791a2d3 --- /dev/null +++ b/releasenotes/notes/extraconfig_services-18ca28841974b8dd.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + Services that were in extraconfig/services are now in deployment directory + among other services. diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index bab35af9c9..9ff27ce17b 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -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. diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index d3ff7eab52..b77b40b48c 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -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.*$