staypuft 0.4.15 → 0.5.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 321059b6c0b8215487c4923f3c767da8b0dc98d5
-  data.tar.gz: abaa9a415228d9cc6859c95e3277fbfb41d2755e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDYwM2Y4Nzc0YWE3Y2NjMGU2MzEwNDg3MTU0ZjY2Y2IzYjBhNzc3Ng==
+  data.tar.gz: !binary |-
+    NDcyMjFkN2Q5OWZhZDU0MzA0M2RmOWM2ZjkyMTFlZTAyNmFmZDhhMw==
 SHA512:
-  metadata.gz: a99eae2273ce70538323bb33065d5b8b9ee45342975157b26b97702f7ae20cd25714add0c15fc58a72da05cf626cd0afdd12c3b501c44f50fa9e694ef55974c2
-  data.tar.gz: 69436bf024671e0a8b273fb75ff6f00e7089463271eaf469e68c74595f4eff866863cb0b05b6bba7ac2ba277672b29f48ad1e121b94064a91bc55380877e21a8
+  metadata.gz: !binary |-
+    ZWRlZWU5YWMzMjMyODcyMGIxZjRhNzIxYzJiNTEwZDhhZDNiMzFiNzcxYzQ1
+    ZTEyNWYzNjY4YjI2NDMyM2I5MThjZGVmYWFhMWU0ZTI3ZTk3ZGUzMWQ4YWVh
+    YjI4ZTE5NDE4NGYzMmQ3OGUyYjI4YWZhOGZjMzQzNWZkZTc5M2M=
+  data.tar.gz: !binary |-
+    NGNmYzQwOWE5NDUxOTFjMTc5NzllNmI0NzAyNmYxZDA4ZGFmNjY4ZTY4ZDJj
+    NjQyZTdlYWI2ZWQ5MWE0OGM0MjFhMTA1OTFkN2UwYjEyMWZkZTc2ZGI2Mzc0
+    MGFlNDFmNjYyODdkNmUxOThlZjc1ZGVkNDA2MDliYmZlYTBiMTM=

data/app/assets/javascripts/staypuft/staypuft.js

@@ -299,6 +299,12 @@ $(function () {
     });
   });
 
+  $("#vip_modal_button").on('click', function(e) {
+    $("#vip_modal").modal('show');
+  });
+  $('#vip_modal').on('shown.bs.modal', function(){
+    $("#vip_modal_button").submit();
+  })
   var scrolled = false;
 
   $(window).scroll(function(){

data/app/controllers/staypuft/bonds_controller.rb

@@ -28,6 +28,7 @@ module Staypuft
         results = @bonds.map(&:save)
         @result = results.all?
         clear_nic_assignments(params[:interfaces])
+        reassign_primary
         raise ActiveRecord::Rollback unless @result
       end
 
@@ -93,12 +94,12 @@ module Staypuft
     def find_hosts
       @hosts = Host::Managed.where(:id => params[:host_ids]).includes(:interfaces)
       @host = @hosts.first
-      @interfaces = @host.interfaces.where("type <> 'Nic::BMC'").non_vip.order(:identifier).where(['(virtual = ? OR type = ?)', false, 'Nic::Bond'])
+      @interfaces = @host.interfaces.where("type <> 'Nic::BMC'").order(:identifier).where(['(virtual = ? OR type = ?)', false, 'Nic::Bond'])
       @deployment = Deployment.find(params[:deployment_id])
     end
 
     def find_unassigned_subnets
-      assigned_subnet_ids = ([@host.subnet_id] + @host.interfaces.non_vip.map(&:subnet_id)).compact.uniq
+      assigned_subnet_ids = ([@host.subnet_id] + @host.interfaces.map(&:subnet_id)).compact.uniq
       @subnets = @deployment.subnets.where(["#{Subnet.table_name}.id NOT IN (?)", assigned_subnet_ids]).uniq
     end
 
@@ -127,5 +128,20 @@ module Staypuft
         end
       end
     end
+
+    def reassign_primary
+      @bonds.each do |bond|
+        if bond.attached_devices_identifiers.include? bond.host.primary_interface
+          subnet_typing = Staypuft::SubnetTyping.includes('subnet_type').where(:deployment_id => @deployment, :subnet_id => bond.host.subnet).first
+          if subnet_typing && subnet_typing.subnet_type.name == Staypuft::SubnetType::PXE
+            pxe_subnet = bond.host.subnet
+            assigner = InterfaceAssigner.new(@deployment, bond.host, bond.host.subnet)
+            assigner.unassign
+            pxe_assigner = InterfaceAssigner.new(@deployment, bond, pxe_subnet)
+            pxe_assigner.assign
+          end
+        end
+      end
+    end
   end
 end

data/app/controllers/staypuft/deployments_controller.rb

@@ -115,26 +115,14 @@ module Staypuft
 
       hosts_to_unassign = ::Host::Base.find Array(params[:host_ids])
 
-      removed_vips_hostgroup = nil
       hosts_to_unassign.each do |host|
         unless host.open_stack_deployed? && deployment_in_progress
-          vip_interfaces = host.interfaces.vip
-          removed_vips_hostgroup = host.hostgroup unless vip_interfaces.empty?
-          vip_interfaces.each(&:destroy)
           host.open_stack_unassign
           host.environment = Environment.get_discovery
           host.save!
           host.setBuild
         end
       end
-      if removed_vips_hostgroup
-        removed_vips_hostgroup.reload
-        newhost = removed_vips_hostgroup.hosts.first
-        unless newhost.nil?
-          build_vips_if_needed(newhost)
-          newhost.save!
-        end
-      end
 
       redirect_to deployment_path(deployment)
     end
@@ -167,11 +155,11 @@ module Staypuft
 
     private
 
-    def assign_host_to_hostgroup(discovered_host, hostgroup)
-      converting_discovered = discovered_host.is_a? Host::Discovered
+    def assign_host_to_hostgroup(assignee_host, hostgroup)
+      converting_discovered = assignee_host.is_a? Host::Discovered
 
       if converting_discovered
-        hosts_facts = FactValue.joins(:fact_name).where(host_id: discovered_host.id)
+        hosts_facts = FactValue.joins(:fact_name).where(host_id: assignee_host.id)
         discovery_bootif = hosts_facts.where(fact_names: { name: 'discovery_bootif' }).first or
             raise 'unknown discovery_bootif fact'
 
@@ -187,15 +175,21 @@ module Staypuft
         ip = hosts_facts.where(fact_names: { name: "ipaddress_#{interface}" }).first
       end
 
-      original_type = discovered_host.type
-      host          = discovered_host.becomes(::Host::Managed)
-      host.type     = 'Host::Managed'
-      host.managed  = true
-      host.build    = true
-      host.ip       = ip.value if converting_discovered
-      host.mac      = discovery_bootif.value if converting_discovered
+      original_type = assignee_host.type
+      host          = if converting_discovered
+                        assignee_host.becomes(::Host::Managed).tap do |host|
+                          host.type    = 'Host::Managed'
+                          host.managed = true
+                          host.ip      = ip.value
+                          host.mac     = discovery_bootif.value
+                        end
+                      else
+                        assignee_host
+                      end
 
       host.hostgroup   = hostgroup
+      # set build to true so the PXE config-template takes effect under discovery environment
+      host.build       = true if assignee_host.managed?
       # set discovery environment to keep booting discovery image
       host.environment = Environment.get_discovery
 
@@ -207,27 +201,16 @@ module Staypuft
       # by default foreman will try to manage all NICs unless user disables manually after assignment
       host.make_all_interfaces_managed
 
-      # we create VIPs interfaces if this is the first host in Controller HA hostgroup
-      build_vips_if_needed(host)
-
       # I do not why but the final save! adds following condytion to the update SQL command
       # "WHERE "hosts"."type" IN ('Host::Managed') AND "hosts"."id" = 283"
       # which will not find the record since it's still Host::Discovered.
       # Using #update_column to change it directly in DB
-      # (discovered_host is used to avoid same WHERE condition problem here).
+      # (assignee_host is used to avoid same WHERE condition problem here).
       # FIXME this is definitely ugly, needs to be properly fixed
-      discovered_host.update_column :type, 'Host::Managed'
+      assignee_host.update_column :type, 'Host::Managed'
 
       [host.save, host].tap do |saved, _|
-        discovered_host.becomes(Host::Base).update_column(:type, original_type) unless saved
-      end
-    end
-
-    def build_vips_if_needed(host)
-      hostgroup = host.hostgroup
-      hostgroup.reload if hostgroup
-      if hostgroup && hostgroup.deployment.ha? && (hostgroup == hostgroup.deployment.controller_hostgroup) && hostgroup.hosts.all? { |h| h.interfaces.vip.empty? }
-        host.build_vips(Staypuft::NetworkQuery::VIP_NAMES)
+        assignee_host.becomes(Host::Base).update_column(:type, original_type) unless saved
       end
     end
   end

data/app/controllers/staypuft/interface_assignments_controller.rb

@@ -7,10 +7,10 @@ module Staypuft
       host_ids = host_ids.split(',') unless host_ids.is_a? Array
       @hosts = Host::Managed.where(:id => host_ids).includes(:interfaces)
       @host = @hosts.first
-      assigned_subnet_ids = ([@host.subnet_id] + @host.interfaces.non_vip.map(&:subnet_id)).compact.uniq
+      assigned_subnet_ids = ([@host.subnet_id] + @host.interfaces.map(&:subnet_id)).compact.uniq
       @subnets = @deployment.subnets.where(["#{Subnet.table_name}.id NOT IN (?)", assigned_subnet_ids]).uniq
       if @host
-        @interfaces = @host.interfaces.where("type <> 'Nic::BMC'").non_vip.order(:identifier).where(['(virtual = ? OR type = ?)', false, 'Nic::Bond'])
+        @interfaces = @host.interfaces.where("type <> 'Nic::BMC'").order(:identifier).where(['(virtual = ? OR type = ?)', false, 'Nic::Bond'])
       else
         @interfaces = []
       end
@@ -82,7 +82,7 @@ module Staypuft
     end
 
     def get_interfaces_to_compare(host)
-      host.interfaces.non_vip.where("type <> 'Nic::BMC'").order(:identifier)
+      host.interfaces.where("type <> 'Nic::BMC'").order(:identifier)
     end
   end
 end

data/app/controllers/staypuft/steps_controller.rb

@@ -55,6 +55,7 @@ module Staypuft
       when :network_configuration
         @deployment.form_step = Deployment::STEP_NETWORKING
         @subnets = Subnet.search_for(params[:search], :order => params[:order]).includes(:domains, :dhcp).paginate :page => params[:page]
+        @deployment.build_vips(NetworkQuery::VIP_NAMES) if @deployment.valid?
       else
         raise 'unknown step'
       end

data/app/lib/actions/staypuft/deployment/deploy.rb

@@ -18,11 +18,14 @@ module Actions
         include Actions::Helpers::Lock
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
 
-        def plan(deployment)
+        def plan(deployment, hosts_to_deploy = nil, hosts_to_provision = nil)
           Type! deployment, ::Staypuft::Deployment
 
           input.update id: deployment.id, name: deployment.name
-          plan_action Hostgroup::OrderedDeploy, deployment.child_hostgroups.deploy_order.to_a
+          plan_action Hostgroup::OrderedDeploy,
+                      deployment.child_hostgroups.deploy_order.to_a,
+                      hosts_to_deploy,
+                      hosts_to_provision
           lock! deployment
         end
 

data/app/lib/actions/staypuft/deployment/populate.rb

@@ -33,7 +33,7 @@ module Actions
             hostgroups = deployment.child_hostgroups
             hostgroups.each do |hostgroup|
               plan_action Actions::Staypuft::Host::Create,
-                          rand(1000).to_s,
+                          "host-#{rand(1000).to_s}",
                           hostgroup,
                           compute_resource,
                           start:  false,

data/app/lib/actions/staypuft/host/deploy.rb

@@ -13,26 +13,22 @@
 module Actions
   module Staypuft
     module Host
-      class Deploy < Actions::Base
+      class Deploy < Dynflow::Action
 
         def plan(host)
           Type! host, ::Host::Base
 
           input.update host: { id: host.id, name: host.name }
 
-          unless host.open_stack_deployed?
-            sequence do
-              plan_action Host::Build, host.id
-              plan_action Host::WaitUntilInstalled, host.id
-              plan_action Host::WaitUntilHostReady, host.id
-            end
-          else
-            # it is already deployed
+          sequence do
+            plan_action Actions::Staypuft::Host::Update, host, :environment => nil
+            puppet_run = plan_action Host::PuppetRun, host
+            plan_action Host::ReportCheck, host.id, puppet_run.output[:executed_at]
           end
         end
 
         def task_output
-          steps    = planned_actions.inject([]) { |s, a| s + a.steps[1..2] }.compact
+          steps    = planned_actions(Host::ReportCheck).inject([]) { |s, a| s + a.steps[1..2] }.compact
           progress = if steps.empty?
                        1
                      else
@@ -44,11 +40,6 @@ module Actions
           input[:host].merge progress: progress
         end
 
-        def humanized_output
-          task_output = self.task_output
-          format '%s %s%%', task_output[:name], (task_output[:progress]*100).to_i
-        end
-
       end
     end
   end

data/app/lib/actions/staypuft/host/puppet_run.rb

@@ -13,21 +13,18 @@
 module Actions
   module Staypuft
     module Host
-      class PuppetRun < Actions::Base
+      class PuppetRun < Dynflow::Action
 
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
 
         def plan(host)
-          Type! host, ::Host
-          plan_self id: host.id, name: host.name
+          Type! host, ::Host::Base
+          plan_self host_id: host.id, name: host.name
         end
 
         def run
-          ::Host.find(id).puppetrun!
-        end
-
-        def humanized_input
-          input[:name]
+          output[:executed_at] = DateTime.now.iso8601
+          ::Host.find(input.fetch(:host_id)).puppetrun!
         end
 
       end

data/app/lib/actions/staypuft/host/{wait_until_host_ready.rb → report_check.rb}

@@ -14,13 +14,13 @@ module Actions
   module Staypuft
     module Host
 
-      class WaitUntilHostReady < Actions::Base
+      class ReportCheck < Actions::Base
 
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
         include Dynflow::Action::Polling
 
-        def plan(host_id)
-          plan_self host_id: host_id
+        def plan(host_id, after)
+          plan_self host_id: host_id, after: after
         end
 
         def external_task
@@ -39,6 +39,15 @@ module Actions
           0.1
         end
 
+        def run(event = nil)
+          case event
+          when Dynflow::Action::Skip
+            output[:status] = true
+          else
+            super(event)
+          end
+        end
+
         private
 
         def invoke_external_task
@@ -50,20 +59,20 @@ module Actions
         end
 
         def poll_external_task
-          host_ready?(input[:host_id])
+          host_ready?(input[:host_id], DateTime.parse(input[:after]).to_time)
         end
 
         def poll_interval
           5
         end
 
-        def host_ready?(host_id)
-          host = ::Host.find(host_id)
-          # take reports oldest first ignoring always the first one (auto-sign)
-          host.reports.order('reported_at DESC')[0..-2].any? do |report|
-            check_for_failures(report, host.id)
-            report_change?(report)
-          end
+        def host_ready?(host_id, after)
+          host   = ::Host.find(host_id)
+          report = host.reports.where('reported_at > ?', after).first
+          return false unless report
+
+          check_for_failures(report, host.id)
+          report_change?(report)
         end
 
         def report_change?(report)

data/app/lib/actions/staypuft/host/{build.rb → trigger_provisioning.rb}

@@ -13,23 +13,27 @@
 module Actions
   module Staypuft
     module Host
-      class Build < Dynflow::Action
+      class TriggerProvisioning < Dynflow::Action
 
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
 
-        def plan(host_id)
-          plan_self host_id: host_id
+        def plan(host)
+          fail 'cannot provision unmanaged host' unless host.managed?
+
+          # return back to hostgroup's environment
+          sequence do
+            plan_action Actions::Staypuft::Host::Update, host, :environment => nil
+            plan_self host_id: host.id
+          end
         end
 
         def run
-          host             = ::Host.find(input[:host_id])
-          # return back to hostgroup's environment
-          host.environment = nil
+          host = ::Host.find(input[:host_id])
           host.expire_token
           host.set_token
           host.save!
           host.send :setTFTP
-          restart(host)
+          restart host
         end
 
         private
@@ -48,7 +52,7 @@ module Actions
         def restart_with_power_management(power)
           check_expected_state(power.state)
           if %w(running on).include?(power.state)
-            if !power.reset
+            unless power.reset
               fail(::Staypuft::Exception, 'Resetting Host Failed')
             end
           end
@@ -62,7 +66,7 @@ module Actions
         end
 
         def check_expected_state(state)
-          if !%w(running on cycle shutoff off).include?(state.downcase)
+          unless %w(running on cycle shutoff off).include?(state.downcase)
             raise(::Staypuft::Exception, "Unexpected Host Power State: #{state}")
           end
         end

data/app/lib/actions/staypuft/host/update.rb

@@ -0,0 +1,33 @@
+#
+# Copyright 2014 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public
+# License as published by the Free Software Foundation; either version
+# 2 of the License (GPLv2) or (at your option) any later version.
+# There is NO WARRANTY for this software, express or implied,
+# including the implied warranties of MERCHANTABILITY,
+# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
+# have received a copy of GPLv2 along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+
+module Actions
+  module Staypuft
+    module Host
+      class Update < Dynflow::Action
+
+        middleware.use Actions::Staypuft::Middleware::AsCurrentUser
+
+        def plan(host, updates)
+          plan_self host_id: host.id, updates: updates
+        end
+
+        def run
+          host = ::Host.find(input.fetch :host_id)
+          host.update_attributes input.fetch(:updates)
+          output.update changing: host.changes
+          host.save!
+        end
+      end
+    end
+  end
+end