From f1ab762ed1f8de16a00b461a649b62010e90729c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 1 Mar 2019 14:26:13 -0500 Subject: [PATCH] Move Designate to Experimental Designate is a great service but unfortunatly, we don't have full time maintainers therefore we can't certify the service will be tested and work correctly. In this patch, we create an experimental folder and put Designate in it. Change-Id: I8a587ebdca2c7e64ab8348155cf75c2dbb65a5ed --- .../scenario003-multinode-containers.yaml | 10 +++++----- ci/environments/scenario003-standalone.yaml | 10 +++++----- deployment/experimental/README.rst | 6 ++++++ .../designate/designate-api-container-puppet.yaml | 2 +- .../{ => experimental}/designate/designate-base.yaml | 0 .../designate-central-container-puppet.yaml | 4 ++-- .../designate/designate-mdns-container-puppet.yaml | 4 ++-- .../designate-producer-container-puppet.yaml | 2 +- .../designate/designate-sink-container-puppet.yaml | 2 +- .../designate/designate-worker-container-puppet.yaml | 2 +- environments/enable-designate.yaml | 10 +++++----- sample-env-generator/enable-services.yaml | 12 ++++++------ 12 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 deployment/experimental/README.rst rename deployment/{ => experimental}/designate/designate-api-container-puppet.yaml (99%) rename deployment/{ => experimental}/designate/designate-base.yaml (100%) rename deployment/{ => experimental}/designate/designate-central-container-puppet.yaml (98%) rename deployment/{ => experimental}/designate/designate-mdns-container-puppet.yaml (98%) rename deployment/{ => experimental}/designate/designate-producer-container-puppet.yaml (98%) rename deployment/{ => experimental}/designate/designate-sink-container-puppet.yaml (98%) rename deployment/{ => experimental}/designate/designate-worker-container-puppet.yaml (99%) diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml index 1d6ea01bd0..b351ac33a8 100644 --- a/ci/environments/scenario003-multinode-containers.yaml +++ b/ci/environments/scenario003-multinode-containers.yaml @@ -13,11 +13,11 @@ resource_registry: OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml - OS::TripleO::Services::DesignateApi: ../../deployment/designate/designate-api-container-puppet.yaml - OS::TripleO::Services::DesignateCentral: ../../deployment/designate/designate-central-container-puppet.yaml - OS::TripleO::Services::DesignateProducer: ../../deployment/designate/designate-producer-container-puppet.yaml - OS::TripleO::Services::DesignateWorker: ../../deployment/designate/designate-worker-container-puppet.yaml - OS::TripleO::Services::DesignateMDNS: ../../deployment/designate/designate-mdns-container-puppet.yaml + OS::TripleO::Services::DesignateApi: ../../deployment/experimental/designate/designate-api-container-puppet.yaml + OS::TripleO::Services::DesignateCentral: ../../deployment/experimental/designate/designate-central-container-puppet.yaml + OS::TripleO::Services::DesignateProducer: ../../deployment/experimental/designate/designate-producer-container-puppet.yaml + OS::TripleO::Services::DesignateWorker: ../../deployment/experimental/designate/designate-worker-container-puppet.yaml + OS::TripleO::Services::DesignateMDNS: ../../deployment/experimental/designate/designate-mdns-container-puppet.yaml OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml OS::TripleO::Services::Keepalived: OS::Heat::None # Some infra instances don't pass the ping test but are otherwise working. diff --git a/ci/environments/scenario003-standalone.yaml b/ci/environments/scenario003-standalone.yaml index 41bfd72643..dcf3f460ff 100644 --- a/ci/environments/scenario003-standalone.yaml +++ b/ci/environments/scenario003-standalone.yaml @@ -14,11 +14,11 @@ resource_registry: OS::TripleO::Services::MistralEventEngine: ../../deployment/mistral/mistral-event-engine-container-puppet.yaml OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml - OS::TripleO::Services::DesignateApi: ../../deployment/designate/designate-api-container-puppet.yaml - OS::TripleO::Services::DesignateCentral: ../../deployment/designate/designate-central-container-puppet.yaml - OS::TripleO::Services::DesignateProducer: ../../deployment/designate/designate-producer-container-puppet.yaml - OS::TripleO::Services::DesignateWorker: ../../deployment/designate/designate-worker-container-puppet.yaml - OS::TripleO::Services::DesignateMDNS: ../../deployment/designate/designate-mdns-container-puppet.yaml + OS::TripleO::Services::DesignateApi: ../../deployment/experimental/designate/designate-api-container-puppet.yaml + OS::TripleO::Services::DesignateCentral: ../../deployment/experimental/designate/designate-central-container-puppet.yaml + OS::TripleO::Services::DesignateProducer: ../../deployment/experimental/designate/designate-producer-container-puppet.yaml + OS::TripleO::Services::DesignateWorker: ../../deployment/experimental/designate/designate-worker-container-puppet.yaml + OS::TripleO::Services::DesignateMDNS: ../../deployment/experimental/designate/designate-mdns-container-puppet.yaml # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml diff --git a/deployment/experimental/README.rst b/deployment/experimental/README.rst new file mode 100644 index 0000000000..def30b386a --- /dev/null +++ b/deployment/experimental/README.rst @@ -0,0 +1,6 @@ +===================== +Experimental services +===================== + +This directory contains services that are experimental. They can be deployed +but there is no garantee that they are tested and work correctly. diff --git a/deployment/designate/designate-api-container-puppet.yaml b/deployment/experimental/designate/designate-api-container-puppet.yaml similarity index 99% rename from deployment/designate/designate-api-container-puppet.yaml rename to deployment/experimental/designate/designate-api-container-puppet.yaml index 6ac22dc47d..3ec8bca6e5 100644 --- a/deployment/designate/designate-api-container-puppet.yaml +++ b/deployment/experimental/designate/designate-api-container-puppet.yaml @@ -62,7 +62,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../../../docker/services/containers-common.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/designate/designate-base.yaml b/deployment/experimental/designate/designate-base.yaml similarity index 100% rename from deployment/designate/designate-base.yaml rename to deployment/experimental/designate/designate-base.yaml diff --git a/deployment/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml similarity index 98% rename from deployment/designate/designate-central-container-puppet.yaml rename to deployment/experimental/designate/designate-central-container-puppet.yaml index a62c83bc2d..76d0a3ccb8 100644 --- a/deployment/designate/designate-central-container-puppet.yaml +++ b/deployment/experimental/designate/designate-central-container-puppet.yaml @@ -57,10 +57,10 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../../../docker/services/containers-common.yaml MySQLClient: - type: ../database/mysql-client.yaml + type: ../../database/mysql-client.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/designate/designate-mdns-container-puppet.yaml b/deployment/experimental/designate/designate-mdns-container-puppet.yaml similarity index 98% rename from deployment/designate/designate-mdns-container-puppet.yaml rename to deployment/experimental/designate/designate-mdns-container-puppet.yaml index a83670771c..85e5ba6b6c 100644 --- a/deployment/designate/designate-mdns-container-puppet.yaml +++ b/deployment/experimental/designate/designate-mdns-container-puppet.yaml @@ -54,10 +54,10 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../../../docker/services/containers-common.yaml MySQLClient: - type: ../database/mysql-client.yaml + type: ../../database/mysql-client.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/designate/designate-producer-container-puppet.yaml b/deployment/experimental/designate/designate-producer-container-puppet.yaml similarity index 98% rename from deployment/designate/designate-producer-container-puppet.yaml rename to deployment/experimental/designate/designate-producer-container-puppet.yaml index ef549e4e1c..492539233b 100644 --- a/deployment/designate/designate-producer-container-puppet.yaml +++ b/deployment/experimental/designate/designate-producer-container-puppet.yaml @@ -55,7 +55,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../../../docker/services/containers-common.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/designate/designate-sink-container-puppet.yaml b/deployment/experimental/designate/designate-sink-container-puppet.yaml similarity index 98% rename from deployment/designate/designate-sink-container-puppet.yaml rename to deployment/experimental/designate/designate-sink-container-puppet.yaml index 4fae25a3a1..edde71fd7b 100644 --- a/deployment/designate/designate-sink-container-puppet.yaml +++ b/deployment/experimental/designate/designate-sink-container-puppet.yaml @@ -50,7 +50,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../../../docker/services/containers-common.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/designate/designate-worker-container-puppet.yaml b/deployment/experimental/designate/designate-worker-container-puppet.yaml similarity index 99% rename from deployment/designate/designate-worker-container-puppet.yaml rename to deployment/experimental/designate/designate-worker-container-puppet.yaml index 8b72d32b59..e6f0f6b8f0 100644 --- a/deployment/designate/designate-worker-container-puppet.yaml +++ b/deployment/experimental/designate/designate-worker-container-puppet.yaml @@ -62,7 +62,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../../../docker/services/containers-common.yaml DesignateBase: type: ./designate-base.yaml diff --git a/environments/enable-designate.yaml b/environments/enable-designate.yaml index b440406a99..ed73dabd96 100644 --- a/environments/enable-designate.yaml +++ b/environments/enable-designate.yaml @@ -12,8 +12,8 @@ # This environment enables the Designate services. One of the # designate-config* environment files must also be included. resource_registry: - OS::TripleO::Services::DesignateApi: ../deployment/designate/designate-api-container-puppet.yaml - OS::TripleO::Services::DesignateCentral: ../deployment/designate/designate-central-container-puppet.yaml - OS::TripleO::Services::DesignateMDNS: ../deployment/designate/designate-mdns-container-puppet.yaml - OS::TripleO::Services::DesignateProducer: ../deployment/designate/designate-producer-container-puppet.yaml - OS::TripleO::Services::DesignateWorker: ../deployment/designate/designate-worker-container-puppet.yaml + OS::TripleO::Services::DesignateApi: ../deployment/experimental/designate/designate-api-container-puppet.yaml + OS::TripleO::Services::DesignateCentral: ../deployment/experimental/designate/designate-central-container-puppet.yaml + OS::TripleO::Services::DesignateMDNS: ../deployment/experimental/designate/designate-mdns-container-puppet.yaml + OS::TripleO::Services::DesignateProducer: ../deployment/experimental/designate/designate-producer-container-puppet.yaml + OS::TripleO::Services::DesignateWorker: ../deployment/experimental/designate/designate-worker-container-puppet.yaml diff --git a/sample-env-generator/enable-services.yaml b/sample-env-generator/enable-services.yaml index ecd10a6041..1aa0100e90 100644 --- a/sample-env-generator/enable-services.yaml +++ b/sample-env-generator/enable-services.yaml @@ -11,11 +11,11 @@ environments: # FIXME(bnemec): files should not be a required key. files: {} resource_registry: - OS::TripleO::Services::DesignateApi: ../deployment/designate/designate-api-container-puppet.yaml - OS::TripleO::Services::DesignateCentral: ../deployment/designate/designate-central-container-puppet.yaml - OS::TripleO::Services::DesignateProducer: ../deployment/designate/designate-producer-container-puppet.yaml - OS::TripleO::Services::DesignateWorker: ../deployment/designate/designate-worker-container-puppet.yaml - OS::TripleO::Services::DesignateMDNS: ../deployment/designate/designate-mdns-container-puppet.yaml + OS::TripleO::Services::DesignateApi: ../deployment/experimental/designate/designate-api-container-puppet.yaml + OS::TripleO::Services::DesignateCentral: ../deployment/experimental/designate/designate-central-container-puppet.yaml + OS::TripleO::Services::DesignateProducer: ../deployment/experimental/designate/designate-producer-container-puppet.yaml + OS::TripleO::Services::DesignateWorker: ../deployment/experimental/designate/designate-worker-container-puppet.yaml + OS::TripleO::Services::DesignateMDNS: ../deployment/experimental/designate/designate-mdns-container-puppet.yaml - name: designate-config title: Configure Designate Parameters @@ -29,7 +29,7 @@ environments: deployment/neutron/neutron-dhcp-container-puppet.yaml: parameters: - NeutronEnableInternalDNS - deployment/designate/designate-central-container-puppet.yaml: + deployment/experimental/designate/designate-central-container-puppet.yaml: parameters: - DesignatePools sample_values: