Merge "Deprecate env/enable-designate in favor of env/services/designate.yaml"

This commit is contained in:
Zuul 2021-12-15 18:04:19 +00:00 committed by Gerrit Code Review
commit 1a33ba1fd3
4 changed files with 29 additions and 41 deletions

View File

@ -1,16 +1,7 @@
# *******************************************************************
# This file was created automatically by the sample environment
# generator. Developers should use `tox -e genconfig` to update it.
# Users are recommended to make changes to a copy of the file instead
# of the original, if any customizations are needed.
# *******************************************************************
# 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.
# NOTE: use of environments/enable-designate.yaml is deprecated, please use
# environments/services/designate.yaml instead as it is the preferred location for environment files
# that configure and enable services in TripleO
#
# This environment enables the Designate services. One of the
# designate-config* environment files must also be included.
parameter_defaults:
# If True, enable the internal Neutron DNS server that provides name
# resolution between VMs. This parameter has no effect if

View File

@ -0,0 +1,20 @@
parameter_defaults:
# If True, enable the internal Neutron DNS server that provides name
# resolution between VMs. This parameter has no effect if
# NeutronDhcpAgentDnsmasqDnsServers is set.
# Type: boolean
NeutronEnableInternalDNS: True
# Comma-separated list of extensions enabled for the Neutron plugin.
# Type: comma_delimited_list
NeutronPluginExtensions: qos,port_security,dns
resource_registry:
OS::TripleO::Services::DesignateApi: ../../deployment/designate/designate-api-container-puppet.yaml
OS::TripleO::Services::DesignateBind: ../../deployment/designate/designate-bind-container.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::Redis: ../../deployment/database/redis-container-puppet.yaml
OS::TripleO::Services::Unbound: ../../deployment/unbound/unbound-container-ansible.yaml

View File

@ -0,0 +1,6 @@
---
deprecations:
- |
Using environments/enable-designate.yaml has been deprecated in
favor of environments/services/designate.yaml, the current location
for environment files that enable TripleO components.

View File

@ -1,29 +0,0 @@
environments:
-
name: enable-designate
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/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:
deployment/neutron/neutron-plugin-ml2.yaml:
parameters:
- NeutronPluginExtensions
deployment/neutron/neutron-dhcp-container-puppet.yaml:
parameters:
- NeutronEnableInternalDNS
sample_values:
NeutronPluginExtensions: qos,port_security,dns
NeutronEnableInternalDNS: True