opendev/system-config
Code Issues Proposed changes

Merge "dns: abstract names"

Browse Source
This commit is contained in:
Zuul 2023-04-21 07:43:46 +00:00 committed by Gerrit Code Review
commit 259db945e8
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
View File

@ -3,11 +3,11 @@
results:
adns1.opendev.org:
adns99.opendev.org:
- adns
- adns-primary
ns1.opendev.org:
ns99.opendev.org:
- adns
- adns-secondary

7
playbooks/roles/letsencrypt-install-txt-record/templates/zone.db.j2
View File

@ -1,14 +1,15 @@
; -*- mode: zone -*-
$ORIGIN acme.opendev.org.
$TTL 1m
@ IN SOA adns1.opendev.org. hostmaster.opendev.org. (
@ IN SOA {{ inventory_hostname }}. hostmaster.opendev.org. (
{{ lookup('pipe', 'date +%s') }} ; serial number unixtime
1h ; refresh (secondary checks for updates)
10m ; retry (secondary retries failed axfr)
10d ; expire (secondary ends serving old data)
5m ) ; min ttl (cache time for failed lookups)
@ IN NS ns1.opendev.org.
@ IN NS ns2.opendev.org.
{% for ns in groups['adns-secondary'] %}
@ IN NS {{ ns }}.
{% endfor %}
; NOTE: DO NOT HAND EDIT. THESE KEYS ARE MANAGED BY ANSIBLE

2
testinfra/test_adns.py
View File

@ -13,7 +13,7 @@
# under the License.
testinfra_hosts = ['adns1.opendev.org']
testinfra_hosts = ['adns99.opendev.org']
def test_bind(host):

2
testinfra/test_ns.py
View File

@ -13,7 +13,7 @@
# under the License.
testinfra_hosts = ['ns1.opendev.org']
testinfra_hosts = ['ns99.opendev.org']
def test_nsd(host):

12
zuul.d/system-config-run.yaml
View File

@ -225,7 +225,7 @@
name: system-config-run-letsencrypt
parent: system-config-run
description: |
Run the playbook for letsencrypt key acquisition.
Run the playbook for letsencrypt key acquisition
nodeset:
nodes:
- <<: *bridge_node_x86
@ -237,7 +237,9 @@
# it will populate to the test DNS servers. LE won't actually
# authenticate those records, but we are validating the path
# of at least creating and collecting them here.
- name: adns-letsencrypt.opendev.org
- name: adns99.opendev.org
label: ubuntu-jammy
- name: ns99.opendev.org
label: ubuntu-jammy
- name: letsencrypt01.opendev.org
label: ubuntu-jammy
@ -432,9 +434,9 @@
nodeset:
nodes:
- <<: *bridge_node_x86
- name: adns1.opendev.org
- name: adns99.opendev.org
label: ubuntu-jammy
- name: ns1.opendev.org
- name: ns99.opendev.org
label: ubuntu-jammy
groups:
- <<: *bastion_group
@ -442,7 +444,7 @@
run_playbooks:
- playbooks/service-nameserver.yaml
host-vars:
adns1.opendev.org:
adns99.opendev.org:
host_copy_output:
'/etc/bind/named.conf': logs
'/var/lib/bind/zones': logs