[provisioner] Add autoyast self update option

Author: nicolasbock

chef/cookbooks/provisioner/recipes/update_nodes.rb

@@ -290,6 +290,7 @@ def find_node_boot_mac_addresses(node, admin_data_net)
           append << "ifcfg=dhcp4 netwait=60"
           append << "squash=0" # workaround bsc#962397
           append << "autoupgrade=1" if mnode[:state] == "os-upgrading"
+          append << "self_update"
 
           target_platform_distro = os.gsub(/-.*$/, "")
           target_platform_version = os.gsub(/^.*-/, "")
@@ -333,6 +334,7 @@ def find_node_boot_mac_addresses(node, admin_data_net)
                       web_port: web_port,
                       packages: packages,
                       repos: repos,
+                      self_update_url: node[:provisioner][:self_update_url],
                       rootpw_hash: node[:provisioner][:root_password_hash] || "",
                       timezone: timezone,
                       boot_device: (mnode[:crowbar_wall][:boot_device] rescue nil),

chef/cookbooks/provisioner/templates/default/autoyast.xml.erb

@@ -26,7 +26,22 @@
       <import_gpg_key config:type="boolean">true</import_gpg_key>
     </signature-handling>
     <storage/>
+    <% unless @self_update_url.nil? || @self_update_url.empty? -%>
+    <self_update_url><%= @self_update_url %></self_update_url>
+    <% end -%>
   </general>
+  <report>
+      <errors>
+          <log config:type="boolean">true</log>
+          <show config:type="boolean">true</show>
+          <timeout config:type="integer">10</timeout>
+      </errors>
+      <warnings>
+          <log config:type="boolean">true</log>
+          <show config:type="boolean">true</show>
+          <timeout config:type="integer">10</timeout>
+      </warnings>
+  </report>
   <add-on>
     <add_on_products config:type="list">
     <% @repos.keys.sort.each do |name| %>

chef/data_bags/crowbar/migrate/provisioner/103_self_update.rb

@@ -0,0 +1,9 @@
+def upgrade(ta, td, a, d)
+  a["self_update_url"] = ta["self_update_url"]
+  return a, d
+end
+
+def downgrade(ta, td, a, d)
+  delete a["self_update_url"]
+  return a, d
+end

chef/data_bags/crowbar/template-provisioner.json

@@ -9,6 +9,7 @@
       "access_keys": "",
       "shell_prompt": "USER@HOST:CWD SUFFIX",
       "enable_pxe": true,
+      "self_update_url": "http://<ADMINWEB>/suse-12.2/$arch/repos/installer-update",
       "discovery": {
         "append": ""
       },
@@ -200,7 +201,7 @@
     "provisioner": {
       "crowbar-revision": 0,
       "crowbar-applied": false,
-      "schema-revision": 102,
+      "schema-revision": 103,
       "element_states": {
         "provisioner-server": [ "readying", "ready", "applying" ],
         "provisioner-base": [ "hardware-installing", "readying", "ready", "applying" ]

chef/data_bags/crowbar/template-provisioner.schema

@@ -19,6 +19,7 @@
             "access_keys": { "type": "str", "required": true },
             "shell_prompt": { "type": "str", "required": true },
             "enable_pxe": { "type": "bool", "required": true },
+            "self_update_url": { "type": "str", "required": true },
             "web_port": { "type": "int", "required": true },
             "keep_existing_hostname": { "type": "bool", "required": true },
             "timezone": { "type": "str", "required": true },

crowbar_framework/app/controllers/barclamp_controller.rb

@@ -704,6 +704,7 @@ def proposal_delete
   error 404, "Proposal of barclamp not found"
   error 500, "Failed to commit proposal, details in the response"
   def proposal_commit
+    Rails.logger.info("starting proposal_commit, params = #{params.inspect}")
     code, message = @service_object.proposal_commit(
       params[:id]
     )

crowbar_framework/app/models/provisioner_service.rb

@@ -42,6 +42,7 @@ def role_constraints
   end
 
   def validate_proposal_after_save proposal
+    @logger.info("provisioner_service.validate_proposal_after_save")
     proposal["attributes"]["provisioner"]["packages"].each do |platform, packages|
       packages.each do |package|
         unless Crowbar::Validator::PackageNameValidator.new.validate(package)
@@ -50,6 +51,21 @@ def validate_proposal_after_save proposal
       end
     end
 
+    @logger.info("validating existence of #{proposal["attributes"]["provisioner"]["self_update_url"]}")
+
+    #if /<ADMINWEB>/ =~ proposal["attributes"]["provisioner"]["self_update_url"]
+    #  localdir = proposal["attributes"]["provisioner"]["self_update_url"]
+    #  Rails::logger.info("localdir = #{localdir}")
+    #  output = `wget #{proposal["attributes"]["provisioner"]["self_update_url"]}`
+    #  Rails::logger.info("[provisioner] #{$?}: #{output}")
+    #  if output != 0
+    #    validation_error(html_escape(
+    #      "Unable to reach AutoYaST self update at "
+    #      "#{proposal["attributes"]["provisioner"]["self_update_url"]}"
+    #    ))
+    #  end
+    #end
+
     validate_one_for_role proposal, "provisioner-server"
 
     super
@@ -233,4 +249,20 @@ def disable_repository(platform, arch, repo)
 
     [200, ""]
   end
+
+  def apply_role_pre_chef_call(old_role, role, all_nodes)
+    @logger.debug("[provisioner] apply_role_pre_chef_call: entering #{all_nodes.inspect}")
+    return if all_nodes.empty?
+
+    nodes = NodeObject.find("roles:provisioner-server")
+    unless nodes.nil? or nodes.length < 1
+      admin_ip = nodes[0].get_network_by_type("admin")["address"]
+      web_port = nodes[0]["provisioner"]["web_port"]
+      @logger.info("self_update_url: #{role.default_attributes["provisioner"]["self_update_url"]}")
+      role.default_attributes["provisioner"]["self_update_url"].gsub!(
+        /<ADMINWEB>/, "#{admin_ip}:#{web_port}"
+      )
+      @logger.info("self_update_url: #{role.default_attributes["provisioner"]["self_update_url"]}")
+    end
+  end
 end

crowbar_framework/app/models/service_object.rb

@@ -476,6 +476,7 @@ def create_proposal
 
   # FIXME: looks like purely controller methods
   def proposal_create(params)
+    @logger.debug("proposal_create")
     base_id = params["id"]
     params["id"] = "#{@bc_name}-#{params["id"]}"
     if FORBIDDEN_PROPOSAL_NAMES.any?{ |n| n == base_id }
@@ -513,6 +514,7 @@ def proposal_create_bootstrap(params)
   end
 
   def proposal_edit(params, validate_after_save = true)
+    @logger.debug("proposal_edit")
     base_id = params["id"] || params[:name]
     params["id"] = "#{@bc_name}-#{base_id}"
     proposal = {}.merge(params)
@@ -533,6 +535,7 @@ def proposal_delete(inst)
   # FIXME: most of these can be validations on the model itself,
   # preferrably refactored into Validator classes.
   def save_proposal!(prop, options = {})
+    @logger.debug("save_proposal")
     options.reverse_merge!(validate_after_save: true)
     clean_proposal(prop.raw_data)
     validate_proposal(prop.raw_data)
@@ -545,7 +548,9 @@ def save_proposal!(prop, options = {})
   # is computed (in apply_role) and chef client gets called on the nodes.
   # Hopefully, this will get moved into a background job.
   def proposal_commit(inst, in_queue = false, validate_after_save = true, bootstrap = false)
+    @logger.info("starting proposal_commit")
     prop = Proposal.where(barclamp: @bc_name, name: inst).first
+    @logger.info("prop = #{prop.inspect}")
 
     if prop.nil?
       [404, "#{I18n.t('.cannot_find', scope: 'model.service')}: #{@bc_name}.#{inst}"]
@@ -600,6 +605,7 @@ def accept_remotes
   #
   # FIXME: move into validator classes
   def validate_proposal_elements proposal_elements
+    @logger.debug("validate_proposal_elements")
     proposal_elements.each do |role_and_elements|
       role, elements = role_and_elements
       uniq_elements  = elements.uniq
@@ -660,6 +666,7 @@ def validate_proposal proposal
   # after your overriden method for error handling and constraints validation.
   #
   def validate_proposal_after_save proposal
+    Rails.logger.info("service_object.validate_proposal_after_save")
     validate_proposal_constraints proposal
     handle_validation_errors
   end
@@ -990,6 +997,8 @@ def apply_role(role, inst, in_queue, bootstrap = false)
       new_deployment.delete("elements_expanded")
     end
 
+    @logger.debug("role = #{role.pretty_inspect}")
+
     # make sure the role is saved
     role.save
 

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

@@ -7,6 +7,8 @@
     %span.help-block
       = t(".access_keys_hint")
 
+    = string_field :self_update_url
+
     = string_field :shell_prompt
     %span.help-block
       = t(".shell_prompt_hint")

crowbar_framework/config/locales/provisioner/en.yml

@@ -21,6 +21,7 @@ en:
       edit_attributes:
         access_keys: 'Additional SSH keys'
         access_keys_hint: 'Each SSH key must be on its own line'
+        self_update_url: 'AutoYaST Self-update URL (The alias <ADMINWEB> can be used to specify the admin server)'
         shell_prompt: 'Custom Shell Prompt'
         shell_prompt_hint: 'You can use the placeholders USER, ALIAS, HOST, FQDN, CWD and SUFFIX to customize the shell prompt on all nodes. Add a \n for a new line within the prompt.'
         serial_console: 'Serial Console'