소스 검색

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

Øystein Bedin 8 년 전
부모
커밋
5820aa4371
3개의 변경된 파일2개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 4
      playbooks/provisioning/openstack/post-provision-openstack.yml
  2. 0 0
      roles/dns-records/tasks/main.yml
  3. 0 0
      roles/dns-views/tasks/main.yml

+ 2 - 4
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

playbooks/provisioning/openstack/openstack_dns_records.yml → roles/dns-records/tasks/main.yml


playbooks/provisioning/openstack/openstack_dns_views.yml → roles/dns-views/tasks/main.yml