Merge "Add the Unbound DNS resolver service"
This commit is contained in:
commit
86e13bbf36
|
@ -175,6 +175,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::TripleoUI: OS::Heat::None
|
OS::TripleO::Services::TripleoUI: OS::Heat::None
|
||||||
OS::TripleO::Services::Tuned: OS::Heat::None
|
OS::TripleO::Services::Tuned: OS::Heat::None
|
||||||
# OS::TripleO::Services::UndercloudMinionMessaging: ../../deployment/undercloud/minion-rabbitmq-puppet.yaml
|
# OS::TripleO::Services::UndercloudMinionMessaging: ../../deployment/undercloud/minion-rabbitmq-puppet.yaml
|
||||||
|
OS::TripleO::Services::Unbound: OS::Heat::None
|
||||||
OS::TripleO::Services::UndercloudTLS: OS::Heat::None
|
OS::TripleO::Services::UndercloudTLS: OS::Heat::None
|
||||||
OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None
|
OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None
|
||||||
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
|
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
|
||||||
|
|
|
@ -18,6 +18,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::DesignateWorker: ../../deployment/experimental/designate/designate-worker-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::DesignateMDNS: ../../deployment/experimental/designate/designate-mdns-container-puppet.yaml
|
||||||
OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml
|
OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml
|
||||||
|
OS::TripleO::Services::Unbound: ../../deployment/unbound/unbound-container-ansible.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
Debug: true
|
Debug: true
|
||||||
|
|
|
@ -0,0 +1,134 @@
|
||||||
|
heat_template_version: rocky
|
||||||
|
|
||||||
|
description: >
|
||||||
|
OpenStack containerized Unbound DNS resolver
|
||||||
|
|
||||||
|
parameters:
|
||||||
|
ContainerUnboundImage:
|
||||||
|
description: image
|
||||||
|
type: string
|
||||||
|
ContainerUnboundConfigImage:
|
||||||
|
description: The container image to use for the unbound config_volume
|
||||||
|
type: string
|
||||||
|
EndpointMap:
|
||||||
|
default: {}
|
||||||
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
|
via parameter_defaults in the resource registry.
|
||||||
|
type: json
|
||||||
|
ServiceData:
|
||||||
|
default: {}
|
||||||
|
description: Dictionary packing service data
|
||||||
|
type: json
|
||||||
|
ServiceNetMap:
|
||||||
|
default: {}
|
||||||
|
description: Mapping of service_name -> network name. Typically set
|
||||||
|
via parameter_defaults in the resource registry. This
|
||||||
|
mapping overrides those in ServiceNetMapDefaults.
|
||||||
|
type: json
|
||||||
|
RoleName:
|
||||||
|
default: ''
|
||||||
|
description: Role name on which the service is applied
|
||||||
|
type: string
|
||||||
|
RoleParameters:
|
||||||
|
default: {}
|
||||||
|
description: Parameters specific to the role
|
||||||
|
type: json
|
||||||
|
MonitoringSubscriptionUnbound:
|
||||||
|
default: 'overcloud-unbound'
|
||||||
|
type: string
|
||||||
|
|
||||||
|
# Unbound specific parameters
|
||||||
|
UnboundAllowedCIDRs:
|
||||||
|
default: []
|
||||||
|
description: A list of CIDRs allowed to make queries through Unbound.
|
||||||
|
Example, ['192.0.2.0/24', '198.51.100.0/24']
|
||||||
|
type: comma_delimited_list
|
||||||
|
UnboundLogQueries:
|
||||||
|
default: false
|
||||||
|
description: If true, Unbound will log the query requests.
|
||||||
|
type: boolean
|
||||||
|
UnboundSecurityHarden:
|
||||||
|
default: true
|
||||||
|
description: When true, Unbound will block certain queries that could
|
||||||
|
have security implications to the Unbound service.
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
resources:
|
||||||
|
|
||||||
|
ContainersCommon:
|
||||||
|
type: ../containers-common.yaml
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
role_data:
|
||||||
|
description: Role data for the Unbound instance.
|
||||||
|
value:
|
||||||
|
service_name: unbound
|
||||||
|
firewall_rules:
|
||||||
|
'140 unbound udp':
|
||||||
|
proto: 'udp'
|
||||||
|
dport:
|
||||||
|
- 53
|
||||||
|
'141 unbound tcp':
|
||||||
|
proto: 'tcp'
|
||||||
|
dport:
|
||||||
|
- 53
|
||||||
|
- 853
|
||||||
|
monitoring_subscription: {get_param: MonitoringSubscriptionUnbound}
|
||||||
|
config_settings: {}
|
||||||
|
service_config_settings: {}
|
||||||
|
kolla_config:
|
||||||
|
/var/lib/kolla/config_files/unbound.json:
|
||||||
|
command: /usr/sbin/unbound -d -d -p
|
||||||
|
config_files:
|
||||||
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
|
dest: "/etc/unbound/conf.d/"
|
||||||
|
merge: true
|
||||||
|
owner: unbound:unbound
|
||||||
|
perm: '0640'
|
||||||
|
permissions:
|
||||||
|
- path: /var/log/unbound
|
||||||
|
owner: unbound:unbound
|
||||||
|
recurse: true
|
||||||
|
docker_config:
|
||||||
|
step_3:
|
||||||
|
unbound:
|
||||||
|
start_order: 1
|
||||||
|
image: {get_param: ContainerUnboundImage}
|
||||||
|
net: host
|
||||||
|
privileged: false
|
||||||
|
restart: always
|
||||||
|
healthcheck:
|
||||||
|
test: /usr/sbin/unbound-streamtcp -u . SOA IN
|
||||||
|
volumes:
|
||||||
|
list_concat:
|
||||||
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
-
|
||||||
|
- /run/:/run/
|
||||||
|
- /var/lib/kolla/config_files/unbound.json:/var/lib/kolla/config_files/config.json:ro
|
||||||
|
- /var/log/containers/unbound:/var/log/unbound:z
|
||||||
|
- /var/lib/config-data/ansible-generated/unbound:/var/lib/kolla/config_files/src:ro
|
||||||
|
environment:
|
||||||
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
|
host_prep_tasks:
|
||||||
|
- name: create persistent directories
|
||||||
|
file:
|
||||||
|
path: "{{ item.path }}"
|
||||||
|
state: directory
|
||||||
|
setype: "{{ item.setype }}"
|
||||||
|
mode: "{{ item.mode }}"
|
||||||
|
with_items:
|
||||||
|
- { 'path': /var/log/containers/unbound, 'setype': container_file_t, 'mode': '0750' }
|
||||||
|
- { 'path': /var/lib/config-data/ansible-generated/unbound, 'setype': container_file_t, 'mode': '0750' }
|
||||||
|
deploy_steps_tasks:
|
||||||
|
- name: Configure Unbound
|
||||||
|
when: step|int == 0
|
||||||
|
import_role:
|
||||||
|
name: tripleo_unbound
|
||||||
|
vars:
|
||||||
|
tripleo_unbound_config_basedir: /var/lib/config-data/ansible-generated/unbound
|
||||||
|
tripleo_unbound_network_name: {get_param: [ServiceNetMap, UnboundNetwork]}
|
||||||
|
tripleo_unbound_external_network_name: {get_param: [ServiceNetMap, PublicNetwork]}
|
||||||
|
tripleo_unbound_internal_network_name: {get_param: [ServiceNetMap, NeutronApiNetwork]}
|
||||||
|
tripleo_unbound_allowed_cidrs: {get_param: UnboundAllowedCIDRs}
|
||||||
|
tripleo_unbound_log_queries: {get_param: UnboundLogQueries}
|
||||||
|
tripleo_unbound_security_harden: {get_param: UnboundSecurityHarden}
|
|
@ -18,3 +18,4 @@ resource_registry:
|
||||||
OS::TripleO::Services::DesignateProducer: ../deployment/experimental/designate/designate-producer-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::DesignateWorker: ../deployment/experimental/designate/designate-worker-container-puppet.yaml
|
||||||
OS::TripleO::Services::Redis: ../deployment/database/redis-container-puppet.yaml
|
OS::TripleO::Services::Redis: ../deployment/database/redis-container-puppet.yaml
|
||||||
|
OS::TripleO::Services::Unbound: ../deployment/unbound/unbound-container-ansible.yaml
|
||||||
|
|
|
@ -88,6 +88,7 @@ parameters:
|
||||||
EtcdNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
EtcdNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
# HaproxyNetwork currently only controls the haproxy.stats network binding
|
# HaproxyNetwork currently only controls the haproxy.stats network binding
|
||||||
HaproxyNetwork: ctlplane
|
HaproxyNetwork: ctlplane
|
||||||
|
UnboundNetwork: {{ _service_nets.get('external', 'ctlplane') }}
|
||||||
# We special-case the default ResolveNetwork and MetricsQdrNetwork for the Ceph roles
|
# We special-case the default ResolveNetwork and MetricsQdrNetwork for the Ceph roles
|
||||||
# for backwards compatibility, all other roles default to internal_api
|
# for backwards compatibility, all other roles default to internal_api
|
||||||
{%- for role in roles %}
|
{%- for role in roles %}
|
||||||
|
|
|
@ -324,6 +324,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::GlanceApiEdge: OS::Heat::None
|
OS::TripleO::Services::GlanceApiEdge: OS::Heat::None
|
||||||
OS::TripleO::Services::HAproxyEdge: OS::Heat::None
|
OS::TripleO::Services::HAproxyEdge: OS::Heat::None
|
||||||
OS::TripleO::Services::Frr: OS::Heat::None
|
OS::TripleO::Services::Frr: OS::Heat::None
|
||||||
|
OS::TripleO::Services::Unbound: OS::Heat::None
|
||||||
|
|
||||||
# Logging
|
# Logging
|
||||||
OS::TripleO::Services::Tmpwatch: deployment/logrotate/tmpwatch-install.yaml
|
OS::TripleO::Services::Tmpwatch: deployment/logrotate/tmpwatch-install.yaml
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Added TripleO support for the Unbound DNS resolver service.
|
|
@ -181,5 +181,6 @@
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
- OS::TripleO::Services::TripleoPackages
|
- OS::TripleO::Services::TripleoPackages
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
- OS::TripleO::Services::Unbound
|
||||||
- OS::TripleO::Services::Vpp
|
- OS::TripleO::Services::Vpp
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
|
|
|
@ -122,5 +122,6 @@
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
- OS::TripleO::Services::TripleoPackages
|
- OS::TripleO::Services::TripleoPackages
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
- OS::TripleO::Services::Unbound
|
||||||
- OS::TripleO::Services::Vpp
|
- OS::TripleO::Services::Vpp
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
|
|
|
@ -169,5 +169,6 @@
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
- OS::TripleO::Services::TripleoPackages
|
- OS::TripleO::Services::TripleoPackages
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
- OS::TripleO::Services::Unbound
|
||||||
- OS::TripleO::Services::Vpp
|
- OS::TripleO::Services::Vpp
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
|
|
|
@ -135,5 +135,6 @@
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
- OS::TripleO::Services::TripleoPackages
|
- OS::TripleO::Services::TripleoPackages
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
- OS::TripleO::Services::Unbound
|
||||||
- OS::TripleO::Services::Vpp
|
- OS::TripleO::Services::Vpp
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
|
|
|
@ -175,5 +175,6 @@
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
- OS::TripleO::Services::TripleoPackages
|
- OS::TripleO::Services::TripleoPackages
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
- OS::TripleO::Services::Unbound
|
||||||
- OS::TripleO::Services::Vpp
|
- OS::TripleO::Services::Vpp
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
|
|
|
@ -179,5 +179,6 @@
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
- OS::TripleO::Services::TripleoPackages
|
- OS::TripleO::Services::TripleoPackages
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
- OS::TripleO::Services::Unbound
|
||||||
- OS::TripleO::Services::Vpp
|
- OS::TripleO::Services::Vpp
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
|
|
|
@ -180,5 +180,6 @@
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
- OS::TripleO::Services::TripleoPackages
|
- OS::TripleO::Services::TripleoPackages
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
- OS::TripleO::Services::Unbound
|
||||||
- OS::TripleO::Services::Vpp
|
- OS::TripleO::Services::Vpp
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
|
|
|
@ -183,6 +183,7 @@
|
||||||
- OS::TripleO::Services::Tmpwatch
|
- OS::TripleO::Services::Tmpwatch
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
- OS::TripleO::Services::TripleoPackages
|
- OS::TripleO::Services::TripleoPackages
|
||||||
|
- OS::TripleO::Services::Unbound
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
- OS::TripleO::Services::Vpp
|
- OS::TripleO::Services::Vpp
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
|
|
|
@ -184,6 +184,7 @@
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
- OS::TripleO::Services::TripleoPackages
|
- OS::TripleO::Services::TripleoPackages
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
- OS::TripleO::Services::Unbound
|
||||||
- OS::TripleO::Services::Vpp
|
- OS::TripleO::Services::Vpp
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
|
@ -17,6 +17,7 @@ environments:
|
||||||
OS::TripleO::Services::DesignateWorker: ../deployment/experimental/designate/designate-worker-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::DesignateMDNS: ../deployment/experimental/designate/designate-mdns-container-puppet.yaml
|
||||||
OS::TripleO::Services::Redis: ../deployment/database/redis-container-puppet.yaml
|
OS::TripleO::Services::Redis: ../deployment/database/redis-container-puppet.yaml
|
||||||
|
OS::TripleO::Services::Unbound: ../deployment/unbound/unbound-container-ansible.yaml
|
||||||
-
|
-
|
||||||
name: designate-config
|
name: designate-config
|
||||||
title: Configure Designate Parameters
|
title: Configure Designate Parameters
|
||||||
|
|
Loading…
Reference in New Issue