RubyGems - staypuft - Versions diffs - 0.0.2 → 0.0.3 - Mend

staypuft 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/README.md +1 -1
data/app/controllers/staypuft/deployments_controller.rb +47 -5
data/app/lib/actions/staypuft/host/provision.rb +50 -0
data/app/lib/actions/staypuft/host/wait_until_host_ready.rb +18 -0
data/app/models/staypuft/concerns/hostgroup_extensions.rb +1 -1
data/app/views/staypuft/deployments/show.html.erb +6 -3
data/db/seeds.rb +1 -0
data/lib/staypuft/version.rb +1 -1
metadata +78 -67
checksums.yaml +0 -7

data/README.md CHANGED Viewed

@@ -13,7 +13,7 @@ Symlink `config/staypuft.local.rb` to yours Foreman `bundle.d`.
 ## Development setup
-See [this](docs/setup.md) document.
+See [this](doc/setup.md) document.
 ## TODO

data/app/controllers/staypuft/deployments_controller.rb CHANGED Viewed

@@ -56,15 +56,57 @@ module Staypuft
       hostgroup = ::Hostgroup.find params[:hostgroup_id]
       hosts     = Array(::Host::Base.find *params[:host_ids])
       hosts.each do |host|
-        host           = host.becomes(::Host::Managed)
-        host.type      = 'Host::Managed'
-        host.managed   = true
-        host.build     = false
-        host.hostgroup = hostgroup
+        host              = host.becomes(::Host::Managed)
+        host.attributes   = { "environment_id"        => "2",
+                              "puppet_ca_proxy_id"    => "1",
+                              "puppet_proxy_id"       => "1",
+                              "puppetclass_ids"       => [""],
+                              "managed"               => "true",
+                              "type"                  => "Host::Managed",
+                              "domain_id"             => "1",
+                              "subnet_id"             => "2",
+                              "interfaces_attributes" =>
+                                  { "new_interfaces" =>
+                                        { "_destroy"  => "false",
+                                          "type"      => "Nic::Managed",
+                                          "mac"       => "",
+                                          "name"      => "",
+                                          "domain_id" => "",
+                                          "ip"        => "",
+                                          "provider"  => "IPMI" } },
+                              "architecture_id"       => "1",
+                              "operatingsystem_id"    => "2",
+                              "provision_method"      => "build",
+                              "build"                 => "0",
+                              "medium_id"             => "7",
+                              "ptable_id"             => "6",
+                              "disk"                  => "",
+                              "root_pass"             => "",
+                              "enabled"               => "1",
+                              "overwrite"             => "false" }
+        # host.type       = 'Host::Managed'
+        # # host.name      = 'a' + rand(1000).to_s
+        # host.managed    = true
+        # host.build      = true
+        host.hostgroup_id = hostgroup.id
         host.save!
+        #
+        # host.build = false
+        # host.save!
       end
       redirect_to deployment_path(id: ::Staypuft::Deployment.first)
     end
   end
+  def self.test
+    User.current   = User.first
+    discovered     = Host::Discovered.first
+    host           = discovered.becomes Host::Managed
+    hostgroup      = Hostgroup.find(17)
+    host.hostgroup = hostgroup
+    p host.name
+    $host = host
+    host.save!
+  end
 end

data/app/lib/actions/staypuft/host/provision.rb ADDED Viewed

@@ -0,0 +1,50 @@
+#
+# 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
+      # creates and provisions Host waiting until it's ready
+      class Provision < Actions::Base
+        middleware.use Actions::Staypuft::Middleware::AsCurrentUser
+        def plan(name, hostgroup, compute_resource)
+          Type! hostgroup, ::Hostgroup
+          Type! compute_resource, ComputeResource
+          input[:name] = name
+          sequence do
+            creation = plan_action Host::Create, name, hostgroup, compute_resource
+            plan_action Host::Build, creation.output[:host][:id]
+            plan_action Host::WaitUntilInstalled, creation.output[:host][:id]
+            # TODO: wait until restarted
+          end
+        end
+        def humanized_input
+          input[:name]
+        end
+        def task_output
+          planned_actions(Host::Create).first.output
+        end
+        def humanized_output
+          task_output.fetch(:host, {})[:name]
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/staypuft/host/wait_until_host_ready.rb CHANGED Viewed

@@ -60,6 +60,24 @@ module Actions
             fail(::Staypuft::Exception, "Latest Puppet Run Contains Failures for Host: #{host.id}")
           end
         end
+        def host_ready?(host_id)
+          host = ::Host.find(host_id)
+          host.reports.order('reported_at DESC').any? do |report|
+            check_for_failures(report)
+            report_change?(report)
+          end
+        end
+        def report_change?(report)
+          report.status['applied'] > 0
+        end
+        def check_for_failures(report)
+          #if report.status['failed'] > 0
+          #  fail(::Staypuft::Exception, "Latest Puppet Run Contains Failures for Host with Report: #{report.id}")
+          #end
+        end
       end
     end
   end

data/app/models/staypuft/concerns/hostgroup_extensions.rb CHANGED Viewed

@@ -50,7 +50,7 @@ module Staypuft::Concerns::HostgroupExtensions
   module ClassMethods
     Gem::Version.new(SETTINGS[:version].to_s.gsub(/-develop$/, '')) < Gem::Version.new('1.5') or
-        raise 'remove nest method, nesting Hostgroups is fixed in Foreman 1.5, use just parent_id'
+        Rails.logger.warn 'remove nest method, nesting Hostgroups is fixed in Foreman 1.5, use just parent_id'
     def nest(name, parent)
       new           = parent.dup

data/app/views/staypuft/deployments/show.html.erb CHANGED Viewed

@@ -32,9 +32,12 @@
     <% @deployment.child_hostgroups.each_with_index do |child_hostgroup, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a href="#<%= child_hostgroup.name.parameterize.underscore %>" data-toggle="tab" class="roles_list">
-          <div class="col-xs-2 text-center"><span class="glyphicon glyphicon-ok"></span><span>0</span></div>
-          <div class="col-xs-2 text-center"><span class="glyphicon glyphicon-warning-sign"></span><span>0</span></div>
-          <div class="col-xs-2 text-center"><span class="glyphicon glyphicon-time"></span><span>0</span></div>
+          <div class="col-xs-2 text-center">
+            <span class="glyphicon glyphicon-ok"></span><span>0</span></div>
+          <div class="col-xs-2 text-center">
+            <span class="glyphicon glyphicon-warning-sign"></span><span>0</span></div>
+          <div class="col-xs-2 text-center">
+            <span class="glyphicon glyphicon-time"></span><span>0</span></div>
           <div class="col-xs-6"><%= child_hostgroup.name %></div>
           <span class="clearfix"></span>
         </a>

data/db/seeds.rb CHANGED Viewed

@@ -39,6 +39,7 @@ params = {
   "neutron_user_password"         => SecureRandom.hex,
   "nova_db_password"              => SecureRandom.hex,
   "nova_user_password"            => SecureRandom.hex,
+  "nova_default_floating_pool"    => "nova",
   "swift_admin_password"          => SecureRandom.hex,
   "swift_shared_secret"           => SecureRandom.hex,
   "swift_all_ips"                 => ['192.168.203.1', '192.168.203.2', '192.168.203.3', '192.168.203.4'],

data/lib/staypuft/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = "0.0.2"
+  VERSION = '0.0.3'
 end

metadata CHANGED Viewed

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
+  prerelease:
 platform: ruby
 authors:
 - Staypuft team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wicked
+  name: dynflow
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: wicked
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman_discovery
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: OpenStack Foreman Installer
@@ -73,62 +82,63 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/helpers/staypuft/application_helper.rb
-- app/helpers/staypuft/deployments_helper.rb
 - app/assets/javascripts/staypuft/staypuft.js
-- app/assets/stylesheets/staypuft/staypuft.css.scss
 - app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss
-- app/models/staypuft/service.rb
-- app/models/staypuft/role_class.rb
-- app/models/staypuft/deployment.rb
-- app/models/staypuft/role_service.rb
-- app/models/staypuft/deployment_role_hostgroup.rb
-- app/models/staypuft/layout.rb
-- app/models/staypuft/service_class.rb
+- app/assets/stylesheets/staypuft/staypuft.css.scss
+- app/controllers/staypuft/application_controller.rb
+- app/controllers/staypuft/deployment_steps_controller.rb
+- app/controllers/staypuft/deployments_controller.rb
+- app/helpers/staypuft/application_helper.rb
+- app/helpers/staypuft/deployments_helper.rb
+- app/lib/actions/staypuft/deployment/deploy.rb
+- app/lib/actions/staypuft/deployment/populate.rb
+- app/lib/actions/staypuft/host/build.rb
+- app/lib/actions/staypuft/host/create.rb
+- app/lib/actions/staypuft/host/deploy.rb
+- app/lib/actions/staypuft/host/provision.rb
+- app/lib/actions/staypuft/host/puppet_run.rb
+- app/lib/actions/staypuft/host/wait_until_host_ready.rb
+- app/lib/actions/staypuft/host/wait_until_installed.rb
+- app/lib/actions/staypuft/hostgroup/deploy.rb
+- app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
+- app/lib/actions/staypuft/middleware/as_current_user.rb
+- app/lib/staypuft/exception.rb
+- app/models/settings/staypuft.rb
 - app/models/staypuft/concerns/host_orchestration_build_hook.rb
 - app/models/staypuft/concerns/hostgroup_extensions.rb
 - app/models/staypuft/concerns/puppetclass_extensions.rb
+- app/models/staypuft/deployment.rb
+- app/models/staypuft/deployment_role_hostgroup.rb
+- app/models/staypuft/layout.rb
 - app/models/staypuft/layout_role.rb
 - app/models/staypuft/role.rb
-- app/models/settings/staypuft.rb
-- app/lib/staypuft/exception.rb
-- app/lib/actions/staypuft/middleware/as_current_user.rb
-- app/lib/actions/staypuft/hostgroup/deploy.rb
-- app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
-- app/lib/actions/staypuft/host/deploy.rb
-- app/lib/actions/staypuft/host/build.rb
-- app/lib/actions/staypuft/host/wait_until_host_ready.rb
-- app/lib/actions/staypuft/host/puppet_run.rb
-- app/lib/actions/staypuft/host/create.rb
-- app/lib/actions/staypuft/host/wait_until_installed.rb
-- app/lib/actions/staypuft/deployment/deploy.rb
-- app/lib/actions/staypuft/deployment/populate.rb
-- app/controllers/staypuft/deployments_controller.rb
-- app/controllers/staypuft/application_controller.rb
-- app/controllers/staypuft/deployment_steps_controller.rb
-- app/views/staypuft/deployments/index.html.erb
-- app/views/staypuft/deployments/show.html.erb
-- app/views/staypuft/deployment_steps/deployment_settings.html.erb
-- app/views/staypuft/deployment_steps/services_selection.html.erb
+- app/models/staypuft/role_class.rb
+- app/models/staypuft/role_service.rb
+- app/models/staypuft/service.rb
+- app/models/staypuft/service_class.rb
 - app/views/staypuft/deployment_steps/_title.html.erb
+- app/views/staypuft/deployment_steps/deployment_settings.html.erb
 - app/views/staypuft/deployment_steps/services_configuration.html.erb
+- app/views/staypuft/deployment_steps/services_selection.html.erb
+- app/views/staypuft/deployments/index.html.erb
+- app/views/staypuft/deployments/show.html.erb
 - app/views/staypuft/layouts/staypuft.html.erb
-- config/staypuft.local.rb
 - config/routes.rb
-- db/migrate/20140312050615_create_staypuft_role_classes.rb
+- config/staypuft.local.rb
 - db/migrate/20140309021811_create_staypuft_layouts.rb
-- db/migrate/20140310203855_create_staypuft_role_services.rb
+- db/migrate/20140310004533_create_staypuft_deployments.rb
 - db/migrate/20140310023613_create_staypuft_roles.rb
-- db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
-- db/migrate/20140326032027_drop_staypuft_hostgroup_roles.rb
+- db/migrate/20140310174152_create_staypuft_layout_roles.rb
 - db/migrate/20140310194221_create_staypuft_services.rb
+- db/migrate/20140310203855_create_staypuft_role_services.rb
+- db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
 - db/migrate/20140312050001_create_staypuft_hostgroup_roles.rb
-- db/migrate/20140310174152_create_staypuft_layout_roles.rb
-- db/migrate/20140318163222_add_deploy_order_to_staypuft_layout_role.rb
-- db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
+- db/migrate/20140312050615_create_staypuft_role_classes.rb
 - db/migrate/20140312051144_create_staypuft_service_classes.rb
-- db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
-- db/migrate/20140310004533_create_staypuft_deployments.rb
+- db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
+- db/migrate/20140318163222_add_deploy_order_to_staypuft_layout_role.rb
+- db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
+- db/migrate/20140326032027_drop_staypuft_hostgroup_roles.rb
 - db/seeds.rb
 - lib/staypuft/engine.rb
 - lib/staypuft/version.rb
@@ -137,39 +147,40 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-- test/test_helper.rb
-- test/staypuft_test.rb
-- test/unit/staypuft_test.rb
-- test/integration/navigation_test.rb
 - test/factories/staypuft_factories.rb
+- test/integration/navigation_test.rb
+- test/staypuft_test.rb
+- test/test_helper.rb
 - test/test_plugin_helper.rb
+- test/unit/staypuft_test.rb
 homepage: https://github.com/theforeman/staypuft
 licenses: []
-metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key:
-specification_version: 4
+specification_version: 3
 summary: OpenStack Foreman Installer
 test_files:
-- test/test_helper.rb
-- test/staypuft_test.rb
-- test/unit/staypuft_test.rb
-- test/integration/navigation_test.rb
 - test/factories/staypuft_factories.rb
+- test/integration/navigation_test.rb
+- test/staypuft_test.rb
+- test/test_helper.rb
 - test/test_plugin_helper.rb
+- test/unit/staypuft_test.rb

checksums.yaml DELETED Viewed

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 63e9f17728bf3ff2084000a2eb08f08d68340c87
-  data.tar.gz: 9d7e070d3e2055b448de53c39dbaa5c7f8830232
-SHA512:
-  metadata.gz: 167c564e5be0f73cb35f04292e2ac98f0bf515c8d5cbf2070e87d3fccb9ad948fbc7fb087897c7a8692fe495518219b493408e21339ed77db2edcd00440ac39c
-  data.tar.gz: dd33319c9a552308e5ed909038140494c2c0d07304d1016eaf24175956c1b9c6922a03e0615bec1137f043b5299b3a89f2f958988fdfd9dd55f272502b2176c3