From b991086fea01ec9b98dd7b2eb947df1b8ade5d0e Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Thu, 20 May 2021 15:43:53 -0230 Subject: [PATCH] Move designate from experimental A lot of work has been done on designate in the wallaby cycle and its basic functionality deploys normally. There is an active team working on the component and the deployment support. Change-Id: I5cda7df93cc56dd9691a9d5857de455d0f539897 --- ci/environments/scenario003-standalone.yaml | 12 ++++++------ .../designate/designate-api-container-puppet.yaml | 2 +- .../designate/designate-base.yaml | 0 .../designate/designate-bind-container.yaml | 2 +- .../designate-central-container-puppet.yaml | 4 ++-- .../designate-mdns-container-puppet.yaml | 4 ++-- .../designate-producer-container-puppet.yaml | 2 +- .../designate-sink-container-puppet.yaml | 2 +- .../designate-worker-container-puppet.yaml | 2 +- environments/enable-designate.yaml | 15 ++++++--------- sample-env-generator/enable-services.yaml | 12 ++++++------ 11 files changed, 27 insertions(+), 30 deletions(-) rename deployment/{experimental => }/designate/designate-api-container-puppet.yaml (99%) rename deployment/{experimental => }/designate/designate-base.yaml (100%) rename deployment/{experimental => }/designate/designate-bind-container.yaml (99%) rename deployment/{experimental => }/designate/designate-central-container-puppet.yaml (99%) rename deployment/{experimental => }/designate/designate-mdns-container-puppet.yaml (98%) rename deployment/{experimental => }/designate/designate-producer-container-puppet.yaml (99%) rename deployment/{experimental => }/designate/designate-sink-container-puppet.yaml (99%) rename deployment/{experimental => }/designate/designate-worker-container-puppet.yaml (99%) diff --git a/ci/environments/scenario003-standalone.yaml b/ci/environments/scenario003-standalone.yaml index 237b2cfb19..19903aa9bf 100644 --- a/ci/environments/scenario003-standalone.yaml +++ b/ci/environments/scenario003-standalone.yaml @@ -12,12 +12,12 @@ resource_registry: OS::TripleO::Services::MistralEventEngine: ../../deployment/deprecated/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-shared-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::DesignateBind: ../../deployment/experimental/designate/designate-bind-container.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::DesignateBind: ../../deployment/designate/designate-bind-container.yaml OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml parameter_defaults: diff --git a/deployment/experimental/designate/designate-api-container-puppet.yaml b/deployment/designate/designate-api-container-puppet.yaml similarity index 99% rename from deployment/experimental/designate/designate-api-container-puppet.yaml rename to deployment/designate/designate-api-container-puppet.yaml index 2d59d831f3..c869a42f65 100644 --- a/deployment/experimental/designate/designate-api-container-puppet.yaml +++ b/deployment/designate/designate-api-container-puppet.yaml @@ -64,7 +64,7 @@ conditions: resources: ContainersCommon: - type: ../../containers-common.yaml + type: ../containers-common.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/experimental/designate/designate-base.yaml b/deployment/designate/designate-base.yaml similarity index 100% rename from deployment/experimental/designate/designate-base.yaml rename to deployment/designate/designate-base.yaml diff --git a/deployment/experimental/designate/designate-bind-container.yaml b/deployment/designate/designate-bind-container.yaml similarity index 99% rename from deployment/experimental/designate/designate-bind-container.yaml rename to deployment/designate/designate-bind-container.yaml index fe15fb9b18..65c07a924e 100644 --- a/deployment/experimental/designate/designate-bind-container.yaml +++ b/deployment/designate/designate-bind-container.yaml @@ -45,7 +45,7 @@ parameters: resources: ContainersCommon: - type: ../../containers-common.yaml + type: ../containers-common.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/designate/designate-central-container-puppet.yaml similarity index 99% rename from deployment/experimental/designate/designate-central-container-puppet.yaml rename to deployment/designate/designate-central-container-puppet.yaml index d097c4508d..dc23109224 100644 --- a/deployment/experimental/designate/designate-central-container-puppet.yaml +++ b/deployment/designate/designate-central-container-puppet.yaml @@ -63,10 +63,10 @@ conditions: resources: ContainersCommon: - type: ../../containers-common.yaml + type: ../containers-common.yaml MySQLClient: - type: ../../database/mysql-client.yaml + type: ../database/mysql-client.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/experimental/designate/designate-mdns-container-puppet.yaml b/deployment/designate/designate-mdns-container-puppet.yaml similarity index 98% rename from deployment/experimental/designate/designate-mdns-container-puppet.yaml rename to deployment/designate/designate-mdns-container-puppet.yaml index 9b45f2b49e..6814145ea5 100644 --- a/deployment/experimental/designate/designate-mdns-container-puppet.yaml +++ b/deployment/designate/designate-mdns-container-puppet.yaml @@ -57,10 +57,10 @@ conditions: resources: ContainersCommon: - type: ../../containers-common.yaml + type: ../containers-common.yaml MySQLClient: - type: ../../database/mysql-client.yaml + type: ../database/mysql-client.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/experimental/designate/designate-producer-container-puppet.yaml b/deployment/designate/designate-producer-container-puppet.yaml similarity index 99% rename from deployment/experimental/designate/designate-producer-container-puppet.yaml rename to deployment/designate/designate-producer-container-puppet.yaml index b6c8a03208..b75c1fd3d0 100644 --- a/deployment/experimental/designate/designate-producer-container-puppet.yaml +++ b/deployment/designate/designate-producer-container-puppet.yaml @@ -56,7 +56,7 @@ conditions: resources: ContainersCommon: - type: ../../containers-common.yaml + type: ../containers-common.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/experimental/designate/designate-sink-container-puppet.yaml b/deployment/designate/designate-sink-container-puppet.yaml similarity index 99% rename from deployment/experimental/designate/designate-sink-container-puppet.yaml rename to deployment/designate/designate-sink-container-puppet.yaml index 345357cf2b..ccd7c173f1 100644 --- a/deployment/experimental/designate/designate-sink-container-puppet.yaml +++ b/deployment/designate/designate-sink-container-puppet.yaml @@ -47,7 +47,7 @@ conditions: resources: ContainersCommon: - type: ../../containers-common.yaml + type: ../containers-common.yaml DesignateBase: type: ./designate-base.yaml diff --git a/deployment/experimental/designate/designate-worker-container-puppet.yaml b/deployment/designate/designate-worker-container-puppet.yaml similarity index 99% rename from deployment/experimental/designate/designate-worker-container-puppet.yaml rename to deployment/designate/designate-worker-container-puppet.yaml index 35d7fae704..bc4c108d52 100644 --- a/deployment/experimental/designate/designate-worker-container-puppet.yaml +++ b/deployment/designate/designate-worker-container-puppet.yaml @@ -56,7 +56,7 @@ conditions: resources: ContainersCommon: - type: ../../containers-common.yaml + type: ../containers-common.yaml DesignateBase: type: ./designate-base.yaml diff --git a/environments/enable-designate.yaml b/environments/enable-designate.yaml index e7ab1f59ae..89eb5414d4 100644 --- a/environments/enable-designate.yaml +++ b/environments/enable-designate.yaml @@ -6,18 +6,15 @@ # ******************************************************************* # title: Enable Designate Service # description: | -# EXPERIMENTAL: This service is not considered ready for production and -# should only be used for development and test purposes at this time. -# # This environment enables the Designate services. One of the # designate-config* environment files must also be included. resource_registry: - 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 - OS::TripleO::Services::DesignateBind: ../deployment/experimental/designate/designate-bind-container.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::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::DesignateBind: ../deployment/designate/designate-bind-container.yaml OS::TripleO::Services::Redis: ../deployment/database/redis-container-puppet.yaml OS::TripleO::Services::Unbound: ../deployment/unbound/unbound-container-ansible.yaml diff --git a/sample-env-generator/enable-services.yaml b/sample-env-generator/enable-services.yaml index bc27699b7a..d1103c0ce3 100644 --- a/sample-env-generator/enable-services.yaml +++ b/sample-env-generator/enable-services.yaml @@ -9,12 +9,12 @@ environments: This environment enables the Designate services. One of the designate-config* environment files must also be included. resource_registry: - 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 - OS::TripleO::Services::DesignateBind: ../deployment/experimental/designate/designate-bind-container.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::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::DesignateBind: ../deployment/designate/designate-bind-container.yaml OS::TripleO::Services::Redis: ../deployment/database/redis-container-puppet.yaml OS::TripleO::Services::Unbound: ../deployment/unbound/unbound-container-ansible.yaml files: