Implement attribute to avoid auto assigning the server

If the `auto_assign_server` attribute is set to false then the server auto assign process is skipped on the initial deploy.
rsalevsky · Apr 28, 2015 · 8ffbbfc · rhafer · Apr 28, 2015 · 8ffbbfc
1 parent ad2b468
commit 8ffbbfc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/chef/data_bags/crowbar/bc-template-dns.json b/chef/data_bags/crowbar/bc-template-dns.json
@@ -7,14 +7,15 @@
       "forwarders": [ ],
       "allow_transfer": [ ],
       "nameservers": [ ],
-      "records": { }
+      "records": { },
+      "auto_assign_server": true
     }
   },
   "deployment": {
     "dns": {
       "crowbar-revision": 0,
       "crowbar-applied": false,
-      "schema-revision": 3,
+      "schema-revision": 4,
       "element_states": {
         "dns-server": [ "readying", "ready", "applying" ],
         "dns-client": [ "all" ]

diff --git a/chef/data_bags/crowbar/bc-template-dns.schema b/chef/data_bags/crowbar/bc-template-dns.schema
@@ -44,6 +44,10 @@
                   }
                 }
               }
+            },
+            "auto_assign_server": {
+              "type": "bool",
+              "required": false
             }
           }
         }

diff --git a/chef/data_bags/crowbar/migrate/dns/004_add_auto_assign_server.rb b/chef/data_bags/crowbar/migrate/dns/004_add_auto_assign_server.rb
@@ -0,0 +1,9 @@
+def upgrade ta, td, a, d
+  a['auto_assign_server'] = ta['auto_assign_server']
+  return a, d
+end
+
+def downgrade ta, td, a, d
+  a.delete('auto_assign_server')
+  return a, d
+end
diff --git a/crowbar_framework/app/models/dns_service.rb b/crowbar_framework/app/models/dns_service.rb
@@ -71,10 +71,12 @@ def transition(inst, name, state)
       db = ProposalObject.find_proposal "dns", inst
       role = RoleObject.find_role_by_name "dns-config-#{inst}"
 
-      if role.override_attributes["dns"]["elements"]["dns-server"].nil? or
-         role.override_attributes["dns"]["elements"]["dns-server"].empty?
-        @logger.debug("DNS transition: adding #{name} to dns-server role")
-        result = add_role_to_instance_and_node("dns", inst, name, db, role, "dns-server")
+      if proposal["attributes"]["dns"]["auto_assign_server"] then
+        if role.override_attributes["dns"]["elements"]["dns-server"].nil? or
+           role.override_attributes["dns"]["elements"]["dns-server"].empty?
+          @logger.debug("DNS transition: adding #{name} to dns-server role")
+          result = add_role_to_instance_and_node("dns", inst, name, db, role, "dns-server")
+        end
       end
 
       # Always add the dns client