Moving common DNS roles out of the playbook area (#605)

openshift · Aug 2, 2017 · cef7af2 · cef7af2
1 parent b9c93eb
commit cef7af2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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/...oning/openstack/openstack_dns_records.yml → roles/dns-records/tasks/main.yml b/...oning/openstack/openstack_dns_records.yml → roles/dns-records/tasks/main.yml
diff --git a/...sioning/openstack/openstack_dns_views.yml → roles/dns-views/tasks/main.yml b/...sioning/openstack/openstack_dns_views.yml → roles/dns-views/tasks/main.yml