openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

The designate environment files predate the move to the separate
services directory for service environment files. This patch creates a
copy in the standard location and future documentation should reference
the new location. The old location should be removed post Xena.

Change-Id: I5a479c7235d7851a1895446d481a9ae044f9c3b5
(cherry picked from commit 0fe7045fa0)
This commit is contained in:
Brent Eagles 2021-10-12 11:32:20 -02:30
parent 7c969c51a4
commit 2c0742ceb4
4 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
environments/enable-designate.yaml
View File

@ -1,23 +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: |
# 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
# 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
#
parameter_defaults:
# If True, enable the internal Neutron DNS server that provides name
# resolution between VMs. This parameter has no effect if
@ -29,3 +13,12 @@ parameter_defaults:
# 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::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

20
environments/services/designate.yaml Normal file
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

6
releasenotes/notes/designate-environment-file-bd08eef69758a996.yaml Normal file
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.

29
sample-env-generator/enable-services.yaml
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