Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Merge "Move designate from experimental" into stable/wallaby
Browse files Browse the repository at this point in the history
  • Loading branch information
@openstack-gerrit
Zuul authored and openstack-gerrit committed Jul 1, 2021
2 parents 77db47a + 3781164 commit 5ee6a59
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 30 deletions.
12 changes: 6 additions & 6 deletions ci/environments/scenario003-standalone.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
OS::TripleO::Services::Unbound: ../../deployment/unbound/unbound-container-ansible.yaml

Expand Down
2 changes: 1 addition & 1 deletion ...gnate/designate-api-container-puppet.yaml → ...gnate/designate-api-container-puppet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ conditions:
resources:

ContainersCommon:
type: ../../containers-common.yaml
type: ../containers-common.yaml

DesignateBase:
type: ./designate-base.yaml
Expand Down
0 ...xperimental/designate/designate-base.yaml → deployment/designate/designate-base.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...l/designate/designate-bind-container.yaml → ...t/designate/designate-bind-container.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ parameters:
resources:

ContainersCommon:
type: ../../containers-common.yaml
type: ../containers-common.yaml

DesignateBase:
type: ./designate-base.yaml
Expand Down
4 changes: 2 additions & 2 deletions ...e/designate-central-container-puppet.yaml → ...e/designate-central-container-puppet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...nate/designate-mdns-container-puppet.yaml → ...nate/designate-mdns-container-puppet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../designate-producer-container-puppet.yaml → .../designate-producer-container-puppet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ conditions:
resources:

ContainersCommon:
type: ../../containers-common.yaml
type: ../containers-common.yaml

DesignateBase:
type: ./designate-base.yaml
Expand Down
2 changes: 1 addition & 1 deletion ...nate/designate-sink-container-puppet.yaml → ...nate/designate-sink-container-puppet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ conditions:
resources:

ContainersCommon:
type: ../../containers-common.yaml
type: ../containers-common.yaml

DesignateBase:
type: ./designate-base.yaml
Expand Down
2 changes: 1 addition & 1 deletion ...te/designate-worker-container-puppet.yaml → ...te/designate-worker-container-puppet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ conditions:
resources:

ContainersCommon:
type: ../../containers-common.yaml
type: ../containers-common.yaml

DesignateBase:
type: ./designate-base.yaml
Expand Down
15 changes: 6 additions & 9 deletions environments/enable-designate.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions sample-env-generator/enable-services.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 5ee6a59

Please sign in to comment.