diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-02 18:08:03 +0100 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-07 14:35:47 +1100 |
| commit | 67791867abbeb06c9bd11a1583ab6b976902fd15 (patch) | |
| tree | b7000d29982c71e93630c2a4fa9d413a616fd4c3 | |
| parent | b95170503613bb97c00175324b31ed91f6f41ea1 (diff) | |
| download | openshift-67791867abbeb06c9bd11a1583ab6b976902fd15.tar.gz openshift-67791867abbeb06c9bd11a1583ab6b976902fd15.tar.bz2 openshift-67791867abbeb06c9bd11a1583ab6b976902fd15.tar.xz openshift-67791867abbeb06c9bd11a1583ab6b976902fd15.zip | |
Fix tox
| -rw-r--r-- | roles/openshift_openstack/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_openstack/tasks/populate-dns.yml | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_openstack/defaults/main.yml b/roles/openshift_openstack/defaults/main.yml index 3eca52963..5f182e0d6 100644 --- a/roles/openshift_openstack/defaults/main.yml +++ b/roles/openshift_openstack/defaults/main.yml @@ -51,7 +51,6 @@ openshift_openstack_full_dns_domain: "{{ (openshift_openstack_clusterid|trim == openshift_openstack_app_subdomain: "apps" - # heat vars openshift_openstack_clusterid: openshift openshift_openstack_stack_name: "{{ openshift_openstack_clusterid }}.{{ openshift_openstack_public_dns_domain }}" diff --git a/roles/openshift_openstack/tasks/populate-dns.yml b/roles/openshift_openstack/tasks/populate-dns.yml index 080c3aca9..c03aceb94 100644 --- a/roles/openshift_openstack/tasks/populate-dns.yml +++ b/roles/openshift_openstack/tasks/populate-dns.yml @@ -1,3 +1,4 @@ +--- - name: "Generate list of private A records" set_fact: private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': hostvars[item]['ansible_hostname'], 'ip': hostvars[item]['private_v4'] } ] }}" @@ -119,8 +120,8 @@ # TODO(shadower): add a cleanup playbook that removes these records, too! state: present with_subelements: - - "{{ openshift_openstack_dns_records_add | default({}) }}" - - entries + - "{{ openshift_openstack_dns_records_add | default({}) }}" + - entries register: nsupdate_add_result until: nsupdate_add_result|succeeded retries: 10 |