chore(designate): small clean-ups
diff --git a/docs/dns.md b/docs/dns.md
index a530fe8..5815232 100644
--- a/docs/dns.md
+++ b/docs/dns.md
@@ -1,40 +1,57 @@
# DNS
## PowerDNS
+
### Pre-requisites
-You have to instal a PowerDNS server first. PowerDNS server installation is out of the scope.
-### Deploy Designate
-You have to configure your PowerDNS information as designate pools by using the variable `openstack_helm_designate_pools`.
-In this example, `165.231.78.211`, `53` and `8081` are the IP, DNS port and API port of the PowerDNS server. Please use your exact information.
+
+You have to install a PowerDNS server first, this is outside the scope of this
+document. You can review instructions on how to prepare the PowerDNS server
+through the [Designate](https://docs.openstack.org/designate/latest/admin/backends/pdns4.html)
+documentation.
+
+### Configuration
+
+You will need to configure your PowerDNS server to allow the Designate API to
+talk to it. This is done by adding the following to your PowerDNS configuration
+into your inventory file.
+
+In this example, PowerDNS will be configured to validate if the DNS changes have
+been propagated to all DNS servers by hitting the PowerDNS backend. It will
+use the virtual IP address of the cloud to request AXFRs.
+
+In this example, it's assumed that the PowerDNS server is running at `192.168.1.10`
+and reachable by the Kubernetes cluster using `secret123` as the token.
+
+!!! note
+
+ You will need to make sure you configure your Glue DNS records with your
+ registrar to point towards your PowerDNS instances (also frequently called
+ "registering nameservers"). This is out of the scope of this document.
+
```yaml
openstack_helm_designate_pools: |
- name: default
- attributes: {}
+ description: Default PowerDNS Pool
+
ns_records:
- - "hostname": "ns1.example.com."
- "priority": 1
- # List out the nameservers for this pool. These are the actual DNS servers.
- # We use these to verify changes have propagated to all nameservers.
+ - hostname: ns1.example.com.
+ priority: 1
+ - hostname: ns2.example.com.
+ priority: 2
+
nameservers:
- - host: 165.231.78.211
+ - host: 192.168.1.10
port: 53
- # List out the targets for this pool. For BIND there will be one
- # entry for each BIND server, as we have to run rndc command on each server
+
targets:
- type: pdns4
- description: PowerDNS Server
- # MiniDNS Configuration options
+ description: PowerDNS4 DNS Server
masters:
- - host: {{ hostvars['ctl1']['ansible_host'] }}
+ - host: "{{ keepalived_vip }}"
port: 5354
- - host: {{ hostvars['ctl2']['ansible_host'] }}
- port: 5354
- - host: {{ hostvars['ctl3']['ansible_host'] }}
- port: 5354
- # PowerDNS Configuration options
options:
- host: 165.231.78.211
+ host: 192.168.1.10
port: 53
- api_endpoint: http://165.231.78.211:8081
- api_token: REPLACE_ME_WITH_API_TOKEN
+ api_endpoint: http://192.168.1.10:8081
+ api_token: secret123
```
diff --git a/playbooks/openstack.yml b/playbooks/openstack.yml
index 9d7f0cf..355a488 100644
--- a/playbooks/openstack.yml
+++ b/playbooks/openstack.yml
@@ -81,9 +81,6 @@
tags:
- openstack-helm-placement
- - role: openstack_helm_designate
- tags:
- - openstack-helm-designate
- role: openstack_helm_infra_openvswitch
tags:
@@ -109,6 +106,13 @@
tags:
- openstack-helm-senlin
+ # NOTE(mnaser): This is disabled out of the box until we have a native way
+ # of configuring it with a pre-configured backend out of the
+ # box.
+ # - role: openstack_helm_designate
+ # tags:
+ # - openstack-helm-designate
+
- role: openstack_helm_heat
tags:
- openstack-helm-heat
diff --git a/releasenotes/notes/add_designate-73b91c9514f92c22.yaml b/releasenotes/notes/add_designate-73b91c9514f92c22.yaml
deleted file mode 100644
index 58c3143..0000000
--- a/releasenotes/notes/add_designate-73b91c9514f92c22.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-features: Add Designate
diff --git a/roles/openstack_helm_designate/defaults/main.yml b/roles/openstack_helm_designate/defaults/main.yml
index 32700ab..0a54f7d 100644
--- a/roles/openstack_helm_designate/defaults/main.yml
+++ b/roles/openstack_helm_designate/defaults/main.yml
@@ -38,13 +38,13 @@
# .. envvar:: openstack_helm_designate_image_tag [[[
#
# Image tag for container
-openstack_helm_designate_image_tag: wallaby
+openstack_helm_designate_image_tag: zed
# ]]]
# .. envvar:: openstack_helm_designate_heat_image_tag [[[
#
# Image tag for Heat to be used for jobs running via Helm hooks
-openstack_helm_designate_heat_image_tag: wallaby
+openstack_helm_designate_heat_image_tag: zed
# ]]]
# .. envvar:: openstack_helm_designate_values [[[
diff --git a/roles/openstack_helm_designate/vars/main.yml b/roles/openstack_helm_designate/vars/main.yml
index 6b35985..54d88d5 100644
--- a/roles/openstack_helm_designate/vars/main.yml
+++ b/roles/openstack_helm_designate/vars/main.yml
@@ -43,4 +43,4 @@
worker: 3
manifests:
ingress_api: false
- service_ingress_api: false
\ No newline at end of file
+ service_ingress_api: false