From cef7af2ce97f59841774f957896370ddf8af8e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Bedin?= Date: Wed, 2 Aug 2017 14:40:08 +0000 Subject: [PATCH] Moving common DNS roles out of the playbook area (#605) --- .../provisioning/openstack/post-provision-openstack.yml | 6 ++---- .../dns-records/tasks/main.yml | 0 .../dns-views/tasks/main.yml | 0 3 files changed, 2 insertions(+), 4 deletions(-) rename playbooks/provisioning/openstack/openstack_dns_records.yml => roles/dns-records/tasks/main.yml (100%) rename playbooks/provisioning/openstack/openstack_dns_views.yml => roles/dns-views/tasks/main.yml (100%) 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 similarity index 100% rename from playbooks/provisioning/openstack/openstack_dns_records.yml rename to roles/dns-records/tasks/main.yml diff --git a/playbooks/provisioning/openstack/openstack_dns_views.yml b/roles/dns-views/tasks/main.yml similarity index 100% rename from playbooks/provisioning/openstack/openstack_dns_views.yml rename to roles/dns-views/tasks/main.yml