staypuft 0.0.1 → 0.0.2

checksums.yaml

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

data/README.md

@@ -11,72 +11,9 @@ Symlink `config/staypuft.local.rb` to yours Foreman `bundle.d`.
 
     ln -s ../../Staypuft/config/staypuft.local.rb staypuft.local.rb
 
-## Enabling Puppet SSH
+## Development setup
 
-This is required for invoking puppet runs on remote machines.
-This is needed in Staypuft for orchestration tasks.
-
-### Enable Puppet Run (Based on Foreman 1.4.1)
-
-Go to the foreman web UI.  
-
-Administer -> Settings -> Puppet
-
-Set Puppet Run to 'true'
-
-### Configure Foreman Proxy
-
-Add the following lines to the foreman proxy settings.yml
-
-```
-:puppet_provider: puppetssh
-:puppetssh_sudo: false
-:puppetssh_user: root
-:puppetssh_keyfile: /etc/foreman-proxy/id_rsa
-:puppetssh_command: /usr/bin/puppet agent --onetime --no-usecacheonfailure
-```
-
-### Create SSH Key fore foreman-proxy
-
-```
-# Create SSH Key using ssh-keygen
-
-# cp private key to /etc/foreman-proxy/
-
-chown foreman-proxy /etc/foreman-proxy/id_rsa
-
-chmod 600 /etc/foreman-proxy/id_rsa
-```
-
-### Turn off StrictHostChecking for the foreman-proxy user
-
-Create the following file:
-
-<foreman HOME directory>/.ssh/config
-```
-Host *
-    StrictHostKeyChecking no
-```
-
-N.B. This is a temporary solution.  We are tracking this issue here: http://projects.theforeman.org/issues/4543
-
-### Distribute Foreman Public Key to Hosts
-
-Add the id_rsa.pub public key to .ssh/authorized_keys file for user root on all Hosts
-
-N.B. This is a temporary solution. We are tracking this issue here: http://projects.theforeman.org/issues/4542
-
-### Restart foreman-proxy
-
-sudo service foreman-proxy restart
-
-## Usage
-
-#### PUPPET RUN
-
-Assuming that host is created and running and you have enabled puppetssh.  See the section Enabling Puppet SSH.
-
-    ForemanTasks.trigger Actions::Host::PuppetRun, Host.find(1)
+See [this](docs/setup.md) document.
 
 ## TODO
 

data/app/controllers/staypuft/deployment_steps_controller.rb

@@ -34,6 +34,19 @@ module Staypuft
       when :services_configuration
         # Collect services across all deployment's roles
         @services = @deployment.roles(:services).map(&:services).flatten.uniq
+        if params[:staypuft_deployment]
+          param_data = params[:staypuft_deployment][:hostgroup_params]
+          diffs = []
+          param_data.each do |hostgroup_id, hostgroup_params|
+            hostgroup = Hostgroup.find(hostgroup_id)
+            hostgroup_params[:puppetclass_params].each do |puppetclass_id, puppetclass_params|
+              puppetclass = Puppetclass.find(puppetclass_id)
+              puppetclass_params.each do |param_name, param_value|
+                hostgroup.set_param_value_if_changed(puppetclass, param_name, param_value)
+              end
+            end
+          end
+        end
       end
 
       render_wizard @deployment
@@ -42,6 +55,7 @@ module Staypuft
     private
     def get_deployment
       @deployment = Deployment.first
+      @deployment.name = nil if @deployment.name.starts_with?(Deployment::NEW_NAME_PREFIX)
     end
 
     def redirect_to_finish_wizard(options = {})

data/app/controllers/staypuft/deployments_controller.rb

@@ -7,12 +7,17 @@ module Staypuft
     end
 
     def new
+      if Deployment.first
+        flash[:warning] = _('Deployment already exists.')
+        redirect_to deployments_url
+        return
+      end
+
       # TODO get the hostgroup base id from settings
       base_hostgroup = Hostgroup.where(:name => 'base_hostgroup').first or
           raise 'missing base_hostgroup'
 
-      deployment             = Deployment.new(:name => SecureRandom.hex)
-      deployment.description = "This is a deployment"
+      deployment             = Deployment.new(:name => Deployment::NEW_NAME_PREFIX+SecureRandom.hex)
       deployment.layout      = Layout.where(:name       => "Distributed",
                                             :networking => "neutron").first
       deployment_hostgroup   = ::Hostgroup.nest deployment.name, base_hostgroup
@@ -25,7 +30,7 @@ module Staypuft
     end
 
     def show
-      @hostgroups = Hostgroup.all
+      @deployment = Deployment.find(params[:id])
     end
 
     def destroy
@@ -33,5 +38,33 @@ module Staypuft
       process_success
     end
 
+    def deploy
+      task = ForemanTasks.async_task ::Actions::Staypuft::Deployment::Deploy, Deployment.first
+      redirect_to foreman_tasks_task_url(id: task)
+    end
+
+    # TODO remove, it's temporary
+    def populate
+      task = ForemanTasks.async_task ::Actions::Staypuft::Deployment::Populate,
+                                     Deployment.first,
+                                     fake:   !!params[:fake],
+                                     assign: !!params[:assign]
+      redirect_to foreman_tasks_task_url(id: task)
+    end
+
+    def associate_host
+      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.save!
+      end
+      redirect_to deployment_path(id: ::Staypuft::Deployment.first)
+    end
+
   end
 end

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

@@ -13,7 +13,6 @@
 module Actions
   module Staypuft
     module Deployment
-      # just a mock, models and seeds are not ready yet
       class Deploy < Actions::Base
 
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
@@ -21,11 +20,21 @@ module Actions
         def plan(deployment)
           Type! deployment, ::Staypuft::Deployment
 
-          ordered_hostgroups    = deployment.child_hostgroups.
-            reorder("staypuft_deployment_role_hostgroups.deploy_order")
+          ordered_hostgroups = deployment.child_hostgroups.
+              reorder("#{::Staypuft::DeploymentRoleHostgroup.table_name}.deploy_order").to_a
+          input.update id: deployment.id, name: deployment.name
 
           plan_action Hostgroup::OrderedDeploy, ordered_hostgroups
         end
+
+        def humanized_input
+          input[:name]
+        end
+
+        def humanized_output
+          planned_actions.map(&:humanized_output).join("\n")
+        end
+
       end
     end
   end

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

@@ -0,0 +1,67 @@
+#
+# 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 Deployment
+      # TODO remove, it's temporary
+      class Populate < Actions::Base
+
+        middleware.use Actions::Staypuft::Middleware::AsCurrentUser
+
+        def plan(deployment, options = {})
+          Type! deployment, ::Staypuft::Deployment
+
+          fake   = options[:fake].nil? ? false : options[:fake]
+          assign = options[:assign].nil? ? false : options[:assign]
+          Type! fake, TrueClass, FalseClass
+
+          compute_resource = options[:compute_resource] ||= ::Foreman::Model::Libvirt.first
+          Type! compute_resource, *[ComputeResource, (NilClass if fake)].compact
+
+          sequence do
+            plan_self deployment_id:   deployment.id,
+                      deployment_name: deployment.name,
+                      fake:            fake,
+                      assign:          assign
+
+            hostgroups = deployment.child_hostgroups
+            hostgroups.each do |hostgroup|
+              plan_action Actions::Staypuft::Host::Create,
+                          rand(1000).to_s,
+                          hostgroup,
+                          compute_resource,
+                          start:  false,
+                          assign: assign,
+                          fake:   fake
+            end
+          end
+        end
+
+        def run
+          deployment = ::Staypuft::Deployment.find input.fetch(:deployment_id)
+          hostgroups = deployment.child_hostgroups
+          hostgroups.each do |hostgroup|
+            hostgroup.hosts.each do |host|
+              host.destroy # TODO make action for it
+            end
+          end
+        end
+
+        def humanized_input
+          "#{input[:deployment_name]} #{input[:fake] ? 'fake' : 'real'}"
+        end
+
+      end
+    end
+  end
+end

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

@@ -18,41 +18,63 @@ module Actions
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
 
         def plan(name, hostgroup, compute_resource, options = {})
-          # TODO: set action_subject
-          # TODO: compute_resource or mac
-
           Type! hostgroup, ::Hostgroup
-          Type! compute_resource, ComputeResource
+          Type! compute_resource, ComputeResource, NilClass
 
-          compute_attributes = hostgroup.
-              compute_profile.
-              compute_attributes.
-              where(compute_resource_id: compute_resource.id).
-              first.
-              vm_attrs
+          options = { start: true, assign: true, fake: false }.merge options
 
-          options = { :start => true }.merge options
+          compute_attributes = if options[:fake]
+                                 {}
+                               else
+                                 hostgroup.
+                                     compute_profile.
+                                     compute_attributes.
+                                     where(compute_resource_id: compute_resource.id).
+                                     first.
+                                     vm_attrs
+                               end
 
-          plan_self name:                name,
-                    hostgroup_id:        hostgroup.id,
-                    compute_resource_id: compute_resource.id,
-                    compute_attributes:  compute_attributes,
-                    options:             options
 
+          plan_self name:               name,
+                    hostgroup_id:       hostgroup.id,
+                    compute_attributes: compute_attributes,
+                    options:            options
+          input.update compute_resource_id: compute_resource.id if compute_resource
         end
 
         def run
-          #noinspecti on RubyArgCount
-          host = ::Host::Managed.new(
-              name:                input[:name],
-              hostgroup_id:        input[:hostgroup_id],
-              compute_resource_id: input[:compute_resource_id],
-              compute_attributes:  input[:compute_attributes],
-              build:               false,
-              managed:             true,
-              enabled:             true)
+          fake   = input.fetch(:options).fetch(:fake)
+          assign = input.fetch(:options).fetch(:assign)
+
+          host = if fake
+                   raise if assign
+                   ::Host::Managed.new(
+                       name:         input[:name],
+                       hostgroup_id: input[:hostgroup_id],
+                       build:        false,
+                       managed:      true,
+                       enabled:      true,
+                       mac:          '0a:' + Array.new(5).map { format '%0.2X', rand(256) }.join(':'))
+                 else
+                   ::Host::Managed.new(
+                       name:                input[:name],
+                       hostgroup_id:        input[:hostgroup_id],
+                       build:               false,
+                       managed:             true,
+                       enabled:             true,
+                       compute_resource_id: input.fetch(:compute_resource_id),
+                       compute_attributes:  input[:compute_attributes])
+                 end
+
           host.save!
-          host.power.start if input[:options][:start]
+          host.power.start if input.fetch(:options).fetch(:start)
+
+          unless assign
+            host.reload
+            host.hostgroup = nil
+            host.save!
+          end
+
           output.update host: { id:   host.id,
                                 name: host.name,
                                 ip:   host.ip,

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

@@ -30,7 +30,7 @@ module Actions
         def humanized_output
           # TODO: fix dynflow to allow better progress getting
           steps    = planned_actions.inject([]) { |s, a| s + a.steps[1..2] }.compact
-          progress = steps.map(&:progress).map(&:first).reduce(&:+) / steps.size
+          progress = steps.map(&:progress_done).reduce(&:+) / steps.size
           format '%3d%% Host: %s', progress * 100, input[:host][:name]
         end
 

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

@@ -51,18 +51,12 @@ module Actions
 
         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
+          check_for_failures(host)
+          host.skipped == 0 && host.pending == 0
         end
 
-        def check_for_failures(report)
-          if report.status['failed'] > 0
+        def check_for_failures(host)
+          if host.failed > 0
             fail(::Staypuft::Exception, "Latest Puppet Run Contains Failures for Host: #{host.id}")
           end
         end

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

@@ -17,6 +17,35 @@ module Staypuft::Concerns::HostgroupExtensions
         end
       end
     end
+
+    def current_param_value(key)
+      if (v = LookupValue.where(:lookup_key_id => key.id, :id => lookup_values).first)
+        return v.value, to_label
+      end
+      return inherited_lookup_value(key)
+    end
+
+    def current_param_value_str(key)
+      val = current_param_value(key)[0]
+      val.is_a?(Array) ? val.join(", ") : val
+    end
+
+    def set_param_value_if_changed(puppetclass, key, value)
+      lookup_key    = puppetclass.class_params.where(:key => key).first
+      current_value = current_param_value(lookup_key)[0]
+      new_value     = current_value.is_a?(Array) ? value.split(", ") : value
+      unless current_value == new_value
+        lookup       = LookupValue.where(:match         => hostgroup.send(:lookup_value_match),
+                                         :lookup_key_id => lookup_key.id).first_or_initialize
+        lookup.value = new_value
+        lookup.save!
+      end
+    end
+
+    def own_and_free_hosts
+      # TODO update to Discovered
+      Host::Base.where("hostgroup_id = ? OR hostgroup_id IS NULL", id)
+    end
   end
 
   module ClassMethods

data/app/models/staypuft/deployment.rb

@@ -1,5 +1,8 @@
 module Staypuft
   class Deployment < ActiveRecord::Base
+
+    NEW_NAME_PREFIX="uninitialized_"
+
     attr_accessible :description, :name, :layout_id, :layout
     after_save :update_hostgroup_name
 

data/app/models/staypuft/service.rb

@@ -2,6 +2,7 @@ module Staypuft
   class Service < ActiveRecord::Base
     has_many :role_services, :dependent => :destroy
     has_many :roles, :through => :role_services
+    has_many :hostgroups, :through => :roles
 
     has_many :service_classes, :dependent => :destroy
     has_many :puppetclasses, :through => :service_classes
@@ -9,5 +10,91 @@ module Staypuft
     attr_accessible :description, :name
 
     validates  :name, :presence => true, :uniqueness => true
+
+    # for each service, a list of param names. Optionally, instead of a string
+    # for a param name, an array of [param_name, puppetclass] in the case where
+    # there are possibly multiple puppetclass matches. without this, we'll
+    # just grab the first puppetclass from the matching hostgroup
+    UI_PARAMS = { 
+      "qpid"=> ["qpid_ca", "qpid_cert", "qpid_host", "qpid_key", "qpid_nssdb_password"],
+      "MySQL"=> ["mysql_ca", "mysql_cert", "mysql_host", "mysql_key",
+                 "mysql_root_password"],
+      "Keystone"=> ["keystone_admin_token", "keystone_db_password"],
+      "Nova (Controller)"=> ["admin_email", "admin_password", "auto_assign_floating_ip",
+                             "controller_admin_host", "controller_priv_host",
+                             "controller_pub_host", "freeipa", "horizon_ca",
+                             "horizon_cert", "horizon_key", "horizon_secret_key",
+                             "nova_db_password", "nova_user_password", "ssl"],
+      "Neutron (Controller)" => ["admin_email", "admin_password",
+                                 "cisco_nexus_plugin", "cisco_vswitch_plugin",
+                                 "controller_admin_host", "controller_priv_host",
+                                 "controller_pub_host", "enable_tunneling",
+                                 "freeipa", "horizon_ca", "horizon_cert",
+                                 "horizon_key", "horizon_secret_key",
+                                 "ml2_flat_networks", "ml2_install_deps",
+                                 "ml2_mechanism_drivers", "ml2_network_vlan_ranges",
+                                 "ml2_tenant_network_types", "ml2_tunnel_id_ranges",
+                                 "ml2_type_drivers", "ml2_vni_ranges",
+                                 "ml2_vxlan_group", "neutron_core_plugin",
+                                 "neutron_db_password", "neutron_metadata_proxy_secret",
+                                 "neutron_user_password", "nexus_config",
+                                 "nexus_credentials", "nova_db_password",
+                                 "nova_user_password", "ovs_vlan_ranges",
+                                 "provider_vlan_auto_create", "provider_vlan_auto_trunk",
+                                 "ssl", "tenant_network_type", "tunnel_id_ranges",
+                                 "verbose"],
+      "Glance"=> ["glance_db_password", "glance_user_password"],
+      "Cinder"=> ["cinder_backend_gluster", "cinder_backend_iscsi",
+                  "cinder_db_password", "cinder_gluster_servers",
+                  "cinder_gluster_volume", "cinder_user_password"],
+      "Heat"=> ["heat_cfn", "heat_cloudwatch", "heat_db_password", "heat_user_password"],
+      "Ceilometer"=> ["ceilometer_metering_secret", "ceilometer_user_password"
+                     ],
+      "Neutron - L3" => [],
+      "DHCP" => [],
+      "OVS" => [],
+      "Nova-compute" => ["admin_password", "auto_assign_floating_ip",
+                         "ceilometer_metering_secret", "ceilometer_user_password",
+                         "cinder_backend_gluster", "controller_priv_host",
+                         "controller_pub_host", "fixed_network_range",
+                         "floating_network_range", "mysql_ca", "mysql_host",
+                         "nova_db_password", "nova_network_private_iface",
+                         "nova_network_public_iface", "nova_user_password",
+                         "qpid_host", "ssl", "verbose"],
+      "Neutron-compute" => ["admin_password", "ceilometer_metering_secret",
+                            "ceilometer_user_password", "cinder_backend_gluster",
+                            "controller_admin_host", "controller_priv_host",
+                            "controller_pub_host", "enable_tunneling", "mysql_ca",
+                            "mysql_host", "neutron_core_plugin",
+                            "neutron_db_password", "neutron_user_password",
+                            "nova_db_password", "nova_user_password",
+                            "ovs_bridge_mappings", "ovs_tunnel_iface",
+                            "ovs_tunnel_types", "ovs_vlan_ranges",
+                            "ovs_vxlan_udp_port", "qpid_host", "ssl",
+                            "tenant_network_type", "tunnel_id_ranges", "verbose"],
+      "Neutron-ovs-agent"=> [],
+      "Swift" => ["swift_admin_password", "swift_ringserver_ip",
+                  "swift_shared_secret", "swift_storage_device",
+                  "swift_storage_ips"]
+    }
+
+    def ui_params_for_form(hostgroup = self.hostgroups.first)
+      return [] if (hostgroup.nil? || hostgroup.puppetclasses.nil?)
+      puppetclass = hostgroup.puppetclasses.first
+      # nil puppetclass means grab the first one from matching hostgroup
+      UI_PARAMS[self.name].collect do |param_key|
+        if param_key.is_a?(Array)
+          param_name = param_key[0]
+          param_puppetclass = param_key[1]
+        else
+          param_name = param_key
+          param_puppetclass = puppetclass
+        end
+        param_lookup_key = param_puppetclass.class_params.where(:key=>param_key).first
+        param_lookup_key.nil? ? nil : {:hostgroup => hostgroup,
+                                       :puppetclass => param_puppetclass,
+                                       :param_key => param_lookup_key}
+      end.compact
+    end
   end
 end

data/app/views/staypuft/deployment_steps/services_configuration.html.erb

@@ -19,8 +19,22 @@
         <% @services.each_with_index do |service, i| %>
           <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= service.name.parameterize.underscore %>">
             <h3><%= "#{service.name} " + _("Service Configuration") %></h3>
-            <%= text_f f, :name %><br />
-            <%= text_f f, :description %><br />
+            <% if (params_hash = service.ui_params_for_form).size > 0 %>
+              <% params_hash.each do |param_hash| %>
+              <div class="row">
+                <div class="col-md-4 control-label">
+                  <%= label_tag param_hash[:param_key].key %>
+                </div>
+                <div class="col-md-5">
+                  <%= text_field_tag "staypuft_deployment[hostgroup_params][#{param_hash[:hostgroup].id}][puppetclass_params][#{param_hash[:puppetclass].id}][#{param_hash[:param_key].key}]", param_hash[:hostgroup].current_param_value_str(param_hash[:param_key]), :class=>"form-control", :size=>"45"%>
+                </div>
+              </div>
+              <br/>
+              <% end %>
+            <% else %>
+              <p><%= _("No configuration needed for this service.") %></p>
+            <% end %>
+            <% # render "puppetclasses/classes_parameters", { :obj => service.hostgroups.first } %>
           </div>
         <% end %>
       </div>

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

@@ -1,37 +1,56 @@
-<% title Staypuft::Deployment.first.name %>
-<% title_actions display_link_if_authorized(_("Deploy changes"), hash_for_deployment_steps_path, :class => 'btn-success'), help_path %>
+<% title @deployment.name %>
+
+<% content_for(:title_actions) do %>
+
+  <%# TODO remove Populate dropdown, it's temporary %>
+  <div class="btn-group">
+    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+      <%= _('Populate with') %>
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu" role="menu">
+      <li>
+        <%= display_link_if_authorized(_("Real assigned Hosts"), hash_for_populate_deployment_path(assign: true)) %>
+      </li>
+      <li>
+        <%= display_link_if_authorized(_("Real unassigned Hosts"), hash_for_populate_deployment_path) %>
+      </li>
+      <li>
+        <%= display_link_if_authorized(_("Fake unassigned Hosts"), hash_for_populate_deployment_path(:fake => true)) %>
+      </li>
+    </ul>
+  </div>
+
+
+  <%= display_link_if_authorized(_("Deploy"), hash_for_deploy_deployment_path, :class => 'btn-success') %>
+  <%= help_path %>
+<% end %>
 
 <div class="row tabbed_side_nav_table">
   <ul class="nav nav-pills nav-stacked col-md-4" data-tabs="pills">
     <h3><%= _("Host Groups") %></h3>
-    <li class="active">
-      <a href="#controller" 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>0</span></div>
-        <div class="col-xs-2 text-center"><span class="glyphicon glyphicon-time"><span>0</span></div>
-        <div class="col-xs-6"><%= _("Controller") %></div>
-        <span class="clearfix"></span>
-      </a>
-    </li>
-    <li>
-      <a href="#network" 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>0</span></div>
-        <div class="col-xs-2 text-center"><span class="glyphicon glyphicon-time"><span>0</span></div>
-        <div class="col-xs-6"><%= _("Network") %></div>
-        <span class="clearfix"></span>
-      </a>
-    </li>
+    <% @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-6"><%= child_hostgroup.name %></div>
+          <span class="clearfix"></span>
+        </a>
+      </li>
+    <% end %>
   </ul>
 
   <div class="tab-content col-md-8">
-    <div class="tab-pane active" id="controller">
-      <h3><%= _("Available Hosts") %></h3>
-      <%= form_for(:host_group) do |f| %>
-        <p>
-          <%= f.submit _("Apply"), :class => "btn btn-primary btn-sm" %>
-        </p>
-        <%= f.fields_for :hosts do |host_form| %>
+    <% @deployment.child_hostgroups.each_with_index do |child_hostgroup, i| %>
+      <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= child_hostgroup.name.parameterize.underscore %>">
+        <h3><%= _("Hosts") %></h3>
+        <%= form_tag(associate_host_deployments_path, class: 'form-horizontal well') do |f| %>
+          <p>
+            <%= submit_tag _("Apply"), :class => "btn btn-primary btn-sm" %>
+          </p>
+          <%= hidden_field_tag :hostgroup_id, child_hostgroup.id %>
           <table class="table table-bordered table-striped table-condensed">
             <tr>
               <th>
@@ -39,41 +58,22 @@
               </th>
               <th><%= sort :label, :as => _('Host MAC Address') %></th>
               <th><%= sort :label, :as => _('Host IP Address') %></th>
+              <th><%= _('Type') %></th>
             </tr>
-            <tr>
-              <td>
-                <%= check_box_tag "hostgroup[host_ids][]", 1, true , :id => "hostgroup_host_ids_#{1}" %>
-              </td>
-              <td>44:1e:a1:71:a9:be</td>
-              <td>10.35.160.11</td>
-            </tr>
-            <tr>
-              <td>
-                <%= check_box_tag "hostgroup[host_ids][]", 2, true , :id => "hostgroup_host_ids_#{2}" %>
-              </td>
-              <td>44:1e:a1:71:a9:be</td>
-              <td>10.35.160.11</td>
-            </tr>
-            <tr>
-              <td>
-                <%= check_box_tag "hostgroup[host_ids][]", 3, false , :id => "hostgroup_host_ids_#{3}" %>
-              </td>
-              <td>44:1e:a1:71:a9:be</td>
-              <td>10.35.160.11</td>
-            </tr>
-            <tr>
-              <td>
-                <%= check_box_tag "hostgroup[host_ids][]", 4, false , :id => "hostgroup_host_ids_#{4}" %>
-              </td>
-              <td>44:1e:a1:71:a9:be</td>
-              <td>10.35.160.11</td>
-            </tr>
+            <% child_hostgroup.own_and_free_hosts.each do |host| %>
+              <tr>
+                <td>
+                  <%= check_box_tag "host_ids[]", host.id, child_hostgroup.host_ids.include?(host.id), :id => "host_ids_#{host.id}" %>
+                </td>
+                <td><%= host.mac %></td>
+                <td><%= host.ip %></td>
+                <td><%= host.type %></td>
+              </tr>
+            <% end %>
           </table>
         <% end %>
-      <% end %>
-    </div>
-    <div class="tab-pane" id="network">
-      <h3><%= _("Available Hosts") %></h3>
-    </div>
+      </div>
+    <% end %>
   </div>
 </div>
+

data/app/views/staypuft/layouts/staypuft.html.erb

@@ -1,5 +1,6 @@
-<%= stylesheet "staypuft/staypuft" %>
-
+<%= content_for(:stylesheets) do %>
+  <%= stylesheet "staypuft/staypuft" %>
+<% end %>
 
 <%= content_for(:javascripts) do %>
   <%= javascript "staypuft/staypuft" %>

data/config/routes.rb

@@ -3,8 +3,12 @@ Rails.application.routes.draw do
     resources :deployments do
       collection do
         get 'auto_complete_search'
+        post 'associate_host'
+      end
+      member do
+        get 'deploy'
+        get 'populate'
       end
-
     end
 
     resources :deployment_steps

data/lib/staypuft/engine.rb

@@ -36,7 +36,10 @@ module Staypuft
       ForemanTasks.dynflow.require!
       action_paths = %W[#{Staypuft::Engine.root}/app/lib/actions]
       ForemanTasks.dynflow.config.eager_load_paths.concat(action_paths)
-      ForemanTasks.dynflow.config.remote = true
+    end
+
+    initializer "staypuft.assets.precompile" do |app|
+      app.config.assets.precompile += %w(staypuft/staypuft.css staypuft/staypuft.js)
     end
 
   end

data/lib/staypuft/version.rb

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

data/lib/staypuft.rb

@@ -1,4 +1,5 @@
 require "foreman-tasks"
+require "foreman_discovery"
 require "wicked"
 require "staypuft/engine"
 

metadata

@@ -1,46 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-04 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
   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: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: foreman_discovery
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: OpenStack Foreman Installer
@@ -50,62 +73,62 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/staypuft/staypuft.js
-- app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss
-- 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/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/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/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/layout_role.rb
 - app/models/staypuft/role.rb
-- 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/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/views/staypuft/deployment_steps/_title.html.erb
+- app/views/staypuft/deployment_steps/services_configuration.html.erb
 - app/views/staypuft/layouts/staypuft.html.erb
-- config/routes.rb
 - config/staypuft.local.rb
+- config/routes.rb
+- db/migrate/20140312050615_create_staypuft_role_classes.rb
 - db/migrate/20140309021811_create_staypuft_layouts.rb
-- db/migrate/20140310004533_create_staypuft_deployments.rb
+- db/migrate/20140310203855_create_staypuft_role_services.rb
 - db/migrate/20140310023613_create_staypuft_roles.rb
-- db/migrate/20140310174152_create_staypuft_layout_roles.rb
+- db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
+- db/migrate/20140326032027_drop_staypuft_hostgroup_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/20140312050615_create_staypuft_role_classes.rb
-- db/migrate/20140312051144_create_staypuft_service_classes.rb
-- db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
+- db/migrate/20140310174152_create_staypuft_layout_roles.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/migrate/20140315031754_add_networking_to_staypuft_layout.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/seeds.rb
 - lib/staypuft/engine.rb
 - lib/staypuft/version.rb
@@ -114,40 +137,39 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-- test/factories/staypuft_factories.rb
-- test/integration/navigation_test.rb
-- test/staypuft_test.rb
 - test/test_helper.rb
-- test/test_plugin_helper.rb
+- test/staypuft_test.rb
 - test/unit/staypuft_test.rb
-homepage: https://github.com/theforeman/OFI
+- test/integration/navigation_test.rb
+- test/factories/staypuft_factories.rb
+- test/test_plugin_helper.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: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OpenStack Foreman Installer
 test_files:
-- test/factories/staypuft_factories.rb
-- test/integration/navigation_test.rb
-- test/staypuft_test.rb
 - test/test_helper.rb
-- test/test_plugin_helper.rb
+- test/staypuft_test.rb
 - test/unit/staypuft_test.rb
+- test/integration/navigation_test.rb
+- test/factories/staypuft_factories.rb
+- test/test_plugin_helper.rb

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

@@ -1,50 +0,0 @@
-#
-# 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