Merge pull request crowbar#82 from tboerger/feature/add-records

Added functionality to add A records with the UI to the main zone file

chef/cookbooks/bind9/recipes/default.rb

@@ -183,6 +183,7 @@ def make_zone(zone)
   end
 end
 
+cluster_zone[:records] = node[:dns][:records] || {}
 zones[node[:dns][:domain]]=cluster_zone
 
 case node[:platform]

chef/cookbooks/bind9/templates/default/db.erb

@@ -28,6 +28,13 @@ $TTL <%= @zone[:ttl] %>
 @ MX <%= prio -%> <%= host %>
 <% end if @zone[:mail_exchangers]-%>
 
+; Manual records
+<% @zone[:records].each do |host, values| -%>
+<% values[:ips].each do |ip| -%>
+<%= host %> IN A <%= ip %>
+<% end -%>
+<% end if @zone[:records] -%>
+
 ; Per-host records
 <% @zone[:hosts].keys.sort.each do |host|
    record=@zone[:hosts][host]

chef/data_bags/crowbar/bc-template-dns.json

@@ -6,13 +6,14 @@
       "domain": "pod.your.cloud.org",
       "forwarders": [ ],
       "allow_transfer": [ ],
-      "nameservers": [ ]
+      "nameservers": [ ],
+      "records": { }
     }
   },
   "deployment": {
     "dns": {
       "crowbar-revision": 0,
-      "schema-revision": 1,
+      "schema-revision": 2,
       "element_states": {
         "dns-server": [ "readying", "ready", "applying" ],
         "dns-client": [ "all" ]
@@ -33,4 +34,3 @@
     }
   }
 }
-

chef/data_bags/crowbar/bc-template-dns.schema

@@ -27,6 +27,23 @@
               "type": "seq",
               "required": false,
               "sequence": [ { "type": "str" } ]
+            },
+            "records": {
+              "type": "map",
+              "required": false,
+              "mapping": {
+                = : {
+                  "type" : "map",
+                  "required" : false,
+                  "mapping" : {
+                    "ips": {
+                      "type" : "seq",
+                      "required" : true,
+                      "sequence": [ { "type": "str", "name": "IpAddress" } ]
+                    }
+                  }
+                }
+              }
             }
           }
         }

chef/data_bags/crowbar/migrate/dns/002_add_records.rb

@@ -0,0 +1,9 @@
+def upgrade ta, td, a, d
+  a["records"] = {}
+  return a, d
+end
+
+def downgrade ta, td, a, d
+  a.delete "records"
+  return a, d
+end

crowbar_framework/app/views/barclamp/dns/_edit_attributes.html.haml

@@ -16,3 +16,43 @@
     = array_string_field :allow_transfer
     %span.help-block
       = t('.ip_list_hint')
+
+    %fieldset
+      %legend
+        = t(".records")
+
+      %table.table.table-middle{ "data-dynamic" => "#record-entries", "data-namespace" => "records", "data-optional" => "", "data-invalid" => t(".record_invalid"), "data-duplicate" => t(".record_duplicate") }
+        %thead
+          %tr
+            %th.col-sm-3
+              = t(".record_name")
+            %th.col-sm-8
+              = t(".record_ips")
+            %th.col-sm-1
+
+        %tbody
+
+        %tfoot
+          %tr
+            %td
+              = text_field_tag "record[name]", "", :placeholder => t(".record_name"), :class => "form-control", "data-name" => "name", "data-type" => "string"
+            %td
+              = text_field_tag "record[ips]", "", :placeholder => t(".record_ips"), :class => "form-control", "data-name" => "ips", "data-type" => "array-string"
+            %td
+              = link_to t(".record_add"), "#", :class => "btn btn-default btn-block", "data-add" => true
+
+%script#record-entries{ :type => "text/x-handlebars-template" }
+  {{#each entries}}
+  %tr.edit
+    %td
+      = text_field_tag "record[name]", "{{name}}", :placeholder => t(".record_name"), :class => "form-control", :disabled => "disabled"
+    %td
+      = text_field_tag "record[ips]", "{{ips}}", :placeholder => t(".record_ips"), :class => "form-control", "data-update" => "records/{{name}}/ips", "data-name" => "ips", "data-type" => "array-string"
+    %td
+      = link_to t(".record_remove"), "#", :class => "btn btn-default btn-block", "data-remove" => "{{name}}"
+  {{else}}
+  %tr
+    %td{ :colspan => 3 }
+      .empty.alert.alert-info.text-center
+        = t(".no_records")
+  {{/each}}

crowbar_framework/config/locales/dns.en.yml

@@ -7,3 +7,12 @@ en:
         forwarders: Forwarders
         allow_transfer: Allow Transfer
         ip_list_hint: A comma-separated list of IP Addresses
+
+        records: Manual A Records
+        record_name: Name
+        record_ips: IP Addresses
+        record_add: Add
+        record_remove: Remove
+        record_invalid: Name and IP Addresses must not be empty!
+        record_duplicate: There is already a record for this name defined!
+        no_records: Currently there are no records defined