Ondrej
2020-03-03 2b2dbbf393317a2918d8644f7a97231b5177cd91
CHANGE included ddns_key_algorithm variable in all related files
15 files modified
20 ■■■■ changed files
ansible/cloud_providers/osp_default_vars.yml 1 ●●●● patch | view | raw | blame | history
ansible/configs/ocp-clientvm/default_vars_osp.yml 1 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-cluster/destroy_env.yml 1 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-cluster/post_infra.yml 1 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-disconnected-osp-lab/destroy_env.yml 1 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-disconnected-osp-lab/env_vars.yml 1 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-disconnected-osp-lab/files/rfc2136.ini.j2 2 ●●● patch | view | raw | blame | history
ansible/configs/ocp4-disconnected-osp-lab/post_infra.yml 1 ●●●● patch | view | raw | blame | history
ansible/configs/osp-migration/dns_loop.yml 2 ●●●●● patch | view | raw | blame | history
ansible/configs/osp-migration/env_vars.yml 1 ●●●● patch | view | raw | blame | history
ansible/configs/osp-sandbox/env_vars.yml 1 ●●●● patch | view | raw | blame | history
ansible/configs/osp-sandbox/files/secret.yaml.j2 3 ●●●● patch | view | raw | blame | history
ansible/roles/infra-osp-dns/tasks/nested_loop.yml 1 ●●●● patch | view | raw | blame | history
ansible/roles/ocp4-workload-enable-lets-encrypt-certificates/templates/rfc2136.ini.j2 2 ●●● patch | view | raw | blame | history
docs/First_OSP_Env_walkthrough.adoc 1 ●●●● patch | view | raw | blame | history
ansible/cloud_providers/osp_default_vars.yml
@@ -6,6 +6,7 @@
# Authenticaion for DDNS
# ddns_key_name:
# ddns_key_algorithm:                # default value set to: "hmac-md5"
# ddns_secret_name:
# The name of the project that will be created in OpenStack for the user
ansible/configs/ocp-clientvm/default_vars_osp.yml
@@ -31,6 +31,7 @@
# Authenticaion for DDNS, Must be set in secrets
# ddns_key_name:
# ddns_key_algorithm:                # default value set to: "hmac-md5"
# ddns_secret_name:
# Set this to true if you want a FIPs provisioned for an OpenShift on OpenStack install
ansible/configs/ocp4-cluster/destroy_env.yml
@@ -20,6 +20,7 @@
        record: "{{ item }}.{{ guid }}"
        type: A
        key_name: "{{ ddns_key_name }}"
        key_algorithm: "{{ ddns_key_algorithm | d('hmac-md5') }}"
        key_secret: "{{ ddns_key_secret }}"
        state: absent
      loop:
ansible/configs/ocp4-cluster/post_infra.yml
@@ -39,6 +39,7 @@
      ttl: 5
      value: "{{ item.name }}"
      key_name: "{{ ddns_key_name }}"
      key_algorithm: "{{ ddns_key_algorithm | d('hmac-md5') }}"
      key_secret: "{{ ddns_key_secret }}"
    loop:
      - name: "{{ ocp_api_fip }}"
ansible/configs/ocp4-disconnected-osp-lab/destroy_env.yml
@@ -21,6 +21,7 @@
        type: A
        port: "{{ osp_cluster_dns_port | d('53') }}"
        key_name: "{{ ddns_key_name }}"
        key_algorithm: "{{ ddns_key_algorithm | d('hmac-md5') }}"
        key_secret: "{{ ddns_key_secret }}"
        state: absent
      loop:
ansible/configs/ocp4-disconnected-osp-lab/env_vars.yml
@@ -156,6 +156,7 @@
# Authenticaion for DDNS
# ddns_key_name:
# ddns_key_algorithm:                # default value set to: "hmac-md5"
# ddns_secret_name:
# Set this to true if you want a FIPs provisioned for an OpenShift on OpenStack install
ansible/configs/ocp4-disconnected-osp-lab/files/rfc2136.ini.j2
@@ -7,4 +7,4 @@
# TSIG key secret
dns_rfc2136_secret = {{ ddns_key_secret }}
# TSIG key algorithm
dns_rfc2136_algorithm = HMAC-MD5
dns_rfc2136_algorithm = {{ ddns_key_algorithm | d('hmac-md5') }}
ansible/configs/ocp4-disconnected-osp-lab/post_infra.yml
@@ -40,6 +40,7 @@
        port: "{{ osp_cluster_dns_port | d('53') }}"
        value: "{{ item.name }}"
        key_name: "{{ ddns_key_name }}"
        key_algorithm: "{{ ddns_key_algorithm | d('hmac-md5') }}"
        key_secret: "{{ ddns_key_secret }}"
      loop:
        - name: "{{ ocp_api_fip }}"
ansible/configs/osp-migration/dns_loop.yml
@@ -16,6 +16,7 @@
        ttl: "{{ _infra_osp_dns_default_ttl }}"
        value: "{{ _instance.public_v4 }}"
        key_name: "{{ ddns_key_name }}"
        key_algorithm: "{{ ddns_key_algorithm | d('hmac-md5') }}"
        key_secret: "{{ ddns_key_secret }}"
# When state == absent, don't use r_osp_facts (should not be needed)
@@ -30,5 +31,6 @@
        type: A
        ttl: "{{ _infra_osp_dns_default_ttl }}"
        key_name: "{{ ddns_key_name }}"
        key_algorithm: "{{ ddns_key_algorithm | d('hmac-md5') }}"
        key_secret: "{{ ddns_key_secret }}"
        state: absent
ansible/configs/osp-migration/env_vars.yml
@@ -104,4 +104,5 @@
# Authenticaion for DDNS
# ddns_key_name:
# ddns_key_algorithm:                # default value set to: "hmac-md5"
# ddns_secret_name:
ansible/configs/osp-sandbox/env_vars.yml
@@ -143,6 +143,7 @@
# Authenticaion for DDNS
# ddns_key_name:
# ddns_key_algorithm:                # default value set to: "hmac-md5"
# ddns_secret_name:
# Quotas to set for new project that is created
ansible/configs/osp-sandbox/files/secret.yaml.j2
@@ -3,6 +3,7 @@
# dynamic DNS
ddns_key_name: {{ student_ddns_key_name }}
ddns_key_algorithm: {{ student_ddns_key_algorithm | d('hmac-md5') }}
ddns_key_secret: {{ student_ddns_key_secret }}
osp_cluster_dns_server: {{ student_dns_server }}
osp_cluster_dns_zone: {{ student_dns_zone }}
@@ -13,4 +14,4 @@
osp_project_name: "{{ guid }}-project"
osp_project_id: {{ hostvars['localhost']['osp_project_info'][0].id }}"
osp_project_create: false
osp_project_create: false
ansible/roles/infra-osp-dns/tasks/nested_loop.yml
@@ -19,6 +19,7 @@
        value: "{{ r_osp_facts | json_query(find_ip_query) }}"
        port: "{{ osp_cluster_dns_port | d('53') }}"
        key_name: "{{ ddns_key_name }}"
        key_algorithm: "{{ ddns_key_algorithm | d('hmac-md5') }}"
        key_secret: "{{ ddns_key_secret }}"
# When state == absent, don't use r_osp_facts (should not be needed)
ansible/roles/ocp4-workload-enable-lets-encrypt-certificates/templates/rfc2136.ini.j2
@@ -7,4 +7,4 @@
# TSIG key secret
dns_rfc2136_secret = {{ ddns_key_secret }}
# TSIG key algorithm
dns_rfc2136_algorithm = HMAC-MD5
dns_rfc2136_algorithm = {{ ddns_key_algorithm | d('hmac-md5') }}
docs/First_OSP_Env_walkthrough.adoc
@@ -150,6 +150,7 @@
osp_cluster_dns_server: ddns01.opentlc.com
osp_cluster_dns_zone: students.osp.opentlc.com
ddns_key_name: opentlc_students
ddns_key_name: PROVIDED_BY_ADMIN          # default value is set to "hmac-dm5"
ddns_key_secret: PROVIDED_BY_ADMIN
# Repo