Merge "dns: move tsig_key into common group variable"

2023-04-13 22:13:38 +00:00 · 2023-04-13 22:13:38 +00:00 · 7011785925
parent 4a101da52a a4efec61af
commit 7011785925
3 changed files with 1 additions and 4 deletions
--- a/playbooks/zuul/run-base.yaml
+++ b/playbooks/zuul/run-base.yaml
@ -114,8 +114,8 @@
        dest: "/etc/ansible/hosts/{{ item }}"
      loop:
        - group_vars/all.yaml
+        - group_vars/adns.yaml
        - group_vars/adns-primary.yaml
-        - group_vars/adns-secondary.yaml
        - group_vars/bastion.yaml
        - group_vars/eavesdrop.yaml
        - group_vars/nodepool.yaml
--- a/playbooks/zuul/templates/group_vars/adns-primary.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/adns-primary.yaml.j2
@ -1,6 +1,3 @@
-tsig_key:
-  algorithm: hmac-md5
-  secret: 9zO/4WnUinnLHISPgDI5Aw==
 dnssec_keys:
  '18093':
    zone: zuulci.org
--- a/playbooks/zuul/templates/group_vars/adns-secondary.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/adns-secondary.yaml.j2