diff options
| author | Øystein Bedin <oybed@users.noreply.github.com> | 2017-08-02 14:40:08 +0000 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-08-02 16:40:08 +0200 |
| commit | 5820aa4371aec8218426cdceab3360c6955fe018 (patch) | |
| tree | 020c43dc1645c37d4f03d59d2ad9625781efb2d0 | |
| parent | ca4a695c421236f9f4fe4863b5d1b6545c483b08 (diff) | |
| download | openshift-5820aa4371aec8218426cdceab3360c6955fe018.tar.gz openshift-5820aa4371aec8218426cdceab3360c6955fe018.tar.bz2 openshift-5820aa4371aec8218426cdceab3360c6955fe018.tar.xz openshift-5820aa4371aec8218426cdceab3360c6955fe018.zip | |
Moving common DNS roles out of the playbook area (#605)
| -rw-r--r-- | playbooks/provisioning/openstack/post-provision-openstack.yml | 6 | ||||
| -rw-r--r-- | roles/dns-records/tasks/main.yml (renamed from playbooks/provisioning/openstack/openstack_dns_records.yml) | 0 | ||||
| -rw-r--r-- | roles/dns-views/tasks/main.yml (renamed from playbooks/provisioning/openstack/openstack_dns_views.yml) | 0 |
3 files changed, 2 insertions, 4 deletions
diff --git a/playbooks/provisioning/openstack/post-provision-openstack.yml b/playbooks/provisioning/openstack/post-provision-openstack.yml index c7df74a87..f683b77be 100644 --- a/playbooks/provisioning/openstack/post-provision-openstack.yml +++ b/playbooks/provisioning/openstack/post-provision-openstack.yml @@ -52,9 +52,8 @@ become: true pre_tasks: - include: pre_tasks.yml - - name: "Generate dns-server views" - include: openstack_dns_views.yml roles: + - role: dns-views - role: infra-ansible/roles/dns-server - name: Build and process DNS Records @@ -63,9 +62,8 @@ become: False pre_tasks: - include: pre_tasks.yml - - name: "Generate dns records" - include: openstack_dns_records.yml roles: + - role: dns-records - role: infra-ansible/roles/dns - name: Switch the stack subnet to the configured private DNS server diff --git a/playbooks/provisioning/openstack/openstack_dns_records.yml b/roles/dns-records/tasks/main.yml index 3672a8ea6..3672a8ea6 100644 --- a/playbooks/provisioning/openstack/openstack_dns_records.yml +++ b/roles/dns-records/tasks/main.yml diff --git a/playbooks/provisioning/openstack/openstack_dns_views.yml b/roles/dns-views/tasks/main.yml index 7165b4269..7165b4269 100644 --- a/playbooks/provisioning/openstack/openstack_dns_views.yml +++ b/roles/dns-views/tasks/main.yml |