diff --git a/deployment/designate/designate-central-container-puppet.yaml b/deployment/designate/designate-central-container-puppet.yaml index 9d665a07c5..ab2ac9c622 100644 --- a/deployment/designate/designate-central-container-puppet.yaml +++ b/deployment/designate/designate-central-container-puppet.yaml @@ -75,6 +75,7 @@ parameters: unset results in service defaults being used. type: string default: '' + DesignateRndcKey: description: The rndc key secret for communication with BIND. type: string @@ -84,6 +85,26 @@ parameters: on the external/public access network. type: number default: 16000 + DesignateExternalBindServers: + description: > + Used to configure desginate with bind servers managed + externally to the overcloud. Example format: + [ { + # entry with minimal required values + "host": "10.4.22.99", + "rndc_key": "FJOdVqZr5gVXbU9kIagY0IJVDq7CV/mDVb/M7mlLMgY=" + }, + { + "host": "10.5.22.99", + "port": "53", + "rndc_host": "10.5.22.98", + "rndc_port": "953", + "rndc_key": "FJOdVqZr5gVXbU9kIagY0IJVDq7CV/mDVb/M7mlLMgY=" + } + ] + type: json + default: [] + hidden: true conditions: designate_workers_set: @@ -215,6 +236,7 @@ outputs: alternate_bind: true designate_rndc_key: {get_param: DesignateRndcKey} minidns_proxy_base_port: {get_param: DesignateMdnsProxyBasePort} + tripleo_external_bind_servers: {get_param: DesignateExternalBindServers} docker_config: # db sync runs before permissions set by kolla_config step_2: diff --git a/deployment/designate/designate-worker-container-puppet.yaml b/deployment/designate/designate-worker-container-puppet.yaml index df839ac88d..351c831454 100644 --- a/deployment/designate/designate-worker-container-puppet.yaml +++ b/deployment/designate/designate-worker-container-puppet.yaml @@ -53,6 +53,26 @@ parameters: description: The rndc key secret for communication with BIND. type: string hidden: true + DesignateExternalBindServers: + description: > + Used to configure desginate with bind servers managed + externally to the overcloud. Example format: + [ { + # entry with minimal required values + "host": "10.4.22.99", + "rndc_key": "FJOdVqZr5gVXbU9kIagY0IJVDq7CV/mDVb/M7mlLMgY=" + }, + { + "host": "10.5.22.99", + "port": "53", + "rndc_host": "10.5.22.98", + "rndc_port": "953", + "rndc_key": "FJOdVqZr5gVXbU9kIagY0IJVDq7CV/mDVb/M7mlLMgY=" + } + ] + type: json + default: [] + hidden: true conditions: designate_workers_zero: {equals : [{get_param: DesignateWorkers}, 0]} @@ -144,6 +164,7 @@ outputs: name: designate_rndc_config vars: designate_rndc_key: {get_param: DesignateRndcKey} + tripleo_external_bind_servers: {get_param: DesignateExternalBindServers} docker_config: step_4: designate_worker: diff --git a/deployment/unbound/unbound-container-ansible.yaml b/deployment/unbound/unbound-container-ansible.yaml index e6c390fc0e..18eb8b0fc7 100644 --- a/deployment/unbound/unbound-container-ansible.yaml +++ b/deployment/unbound/unbound-container-ansible.yaml @@ -89,6 +89,26 @@ parameters: the request. It will only answer for queries using local information. type: boolean + DesignateExternalBindServers: + description: > + Used to configure desginate with bind servers managed + externally to the overcloud. Example format: + [ { + # entry with minimal required values + "host": "10.4.22.99", + "rndc_key": "FJOdVqZr5gVXbU9kIagY0IJVDq7CV/mDVb/M7mlLMgY=" + }, + { + "host": "10.5.22.99", + "port": "53", + "rndc_host": "10.5.22.98", + "rndc_port": "953", + "rndc_key": "FJOdVqZr5gVXbU9kIagY0IJVDq7CV/mDVb/M7mlLMgY=" + } + ] + type: json + default: [] + hidden: true resources: @@ -191,3 +211,4 @@ outputs: tripleo_unbound_forward_resolvers: {get_param: UnboundForwardResolvers} tripleo_unbound_forward_fallback: {get_param: UnboundForwardFallback} tripleo_unbound_allow_recursion: {get_param: UnboundAllowRecursion} + tripleo_external_bind_servers: {get_param: DesignateExternalBindServers}