staypuft 0.0.3 → 0.0.4

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

@@ -17,5 +17,10 @@ $(function() {
   $('#check_all').on('change', function(e) {
     var table = $(e.target).closest('table');
     $('td input:checkbox', table).attr('checked', e.target.checked);
+    $('td input:checkbox', table).closest("tr").toggleClass("info", this.checked);
+  });
+
+  $("tr.checkbox_highlight input:checkbox").on('change', function(e) {
+    $(this).closest("tr").toggleClass("info", this.checked);
   });
 });

data/app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss

@@ -1,5 +1,46 @@
+@import "bootstrap/variables";
 @import "bootstrap/mixins";
-@import "colors";
+
+// BEGIN Override non functioning table row backgrounds with table-stripped, remove
+// when Bootstrap is updated to 3.1 and higher
+@mixin table-row-variant($state, $background) {
+  // Exact selectors below required to override `.table-striped` and prevent
+  // inheritance to nested tables.
+  .table > thead > tr,
+  .table > tbody > tr,
+  .table > tfoot > tr {
+    > td.#{$state},
+    > th.#{$state},
+    &.#{$state} > td,
+    &.#{$state} > th {
+      background-color: $background;
+    }
+  }
+
+  // Hover states for `.table-hover`
+  // Note: this is not available for cells or rows within `thead` or `tfoot`.
+  .table-hover > tbody > tr {
+    > td.#{$state}:hover,
+    > th.#{$state}:hover,
+    &.#{$state}:hover > td,
+    &:hover > .#{$state},
+    &.#{$state}:hover > th {
+      background-color: darken($background, 5%);
+    }
+  }
+}
+// Table backgrounds
+//
+// Exact selectors below required to override `.table-striped` and prevent
+// inheritance to nested tables.
+
+// Generate the contextual variants
+@include table-row-variant('active', $table-bg-active);
+@include table-row-variant('info', $state-info-bg);
+@include table-row-variant('success', $state-success-bg);
+@include table-row-variant('danger', $state-danger-bg);
+@include table-row-variant('warning', $state-warning-bg);
+// END of the table-stripped backgrounds fix
 
 .well {
   padding: 19px 36px;

data/app/assets/stylesheets/staypuft/staypuft.css.scss

@@ -33,3 +33,7 @@
     }
   }
 }
+
+.association.well {
+  min-height: 500px;
+}

data/app/controllers/staypuft/deployments_controller.rb

@@ -13,14 +13,13 @@ module Staypuft
         return
       end
 
-      # TODO get the hostgroup base id from settings
-      base_hostgroup = Hostgroup.where(:name => 'base_hostgroup').first or
+      base_hostgroup = Hostgroup.where(:name => Setting[:base_hostgroup]).first or
           raise 'missing base_hostgroup'
 
-      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
+      deployment           = Deployment.new(:name => Deployment::NEW_NAME_PREFIX+SecureRandom.hex)
+      deployment.layout    = Layout.where(:name       => "Distributed",
+                                          :networking => "neutron").first
+      deployment_hostgroup = ::Hostgroup.new name: deployment.name, parent: base_hostgroup
       deployment_hostgroup.save!
 
       deployment.hostgroup = deployment_hostgroup
@@ -56,57 +55,15 @@ 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.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           = host.becomes(::Host::Managed)
+        host.type      = 'Host::Managed'
+        host.managed   = true
+        host.build     = false
+        host.hostgroup = hostgroup
         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/wait_until_host_ready.rb

@@ -60,24 +60,6 @@ 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/{settings/staypuft.rb → setting/staypuft_provisioning.rb}

@@ -1,4 +1,4 @@
-class Setting::Staypuft < ::Setting
+class Setting::StaypuftProvisioning < ::Setting
   BLANK_ATTRS << "base_hostgroup"
 
   def self.load_defaults
@@ -8,10 +8,10 @@ class Setting::Staypuft < ::Setting
     # fixme: not sure about the best way to store AR objects in settings.
     # for now, since we know type, store ID. It might be good to add custom
     # get/set code to decode the ID value into a hostgroup (which methods to call?)
-    Setting.transaction do
+    self.transaction do
       [
-       self.set("base_hostgroup", _("The base hostgroup which contains the base provisioning config"), nil)
-      ].compact.each { |s| self.create s.update(:category => "Setting::Staypuft")}
+       self.set("base_hostgroup", _("The base hostgroup which contains the base provisioning config"), 'base_hostgroup')
+      ].compact.each { |s| self.create s.update(:category => "Setting::StaypuftProvisioning")}
     end
 
     true

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

@@ -43,28 +43,12 @@ module Staypuft::Concerns::HostgroupExtensions
     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
-    Gem::Version.new(SETTINGS[:version].to_s.gsub(/-develop$/, '')) < Gem::Version.new('1.5') or
-        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
-      new.parent_id = parent.id
-      new.name      = name
-
-      new.puppetclasses = parent.puppetclasses
-      new.locations     = parent.locations
-      new.organizations = parent.organizations
-
-      # Clone any parameters as well
-      new.group_parameters.each { |param| parent.group_parameters << param.dup }
-      new
+      # TODO update to Discovered only?
+      Host::Base.where('hostgroup_id = ? OR hostgroup_id IS NULL', id)
     end
   end
 
+  Gem::Version.new(SETTINGS[:version].to_s.gsub(/-develop$/, '')) < Gem::Version.new('1.5') and
+      Rails.logger.warn 'Foreman 1.5 is required for nesting of Hostgroups to work properly,' +
+                            "please upgrade or expect failures.\n#{__FILE__}:#{__LINE__}"
 end

data/app/models/staypuft/deployment.rb

@@ -14,7 +14,7 @@ module Staypuft
                                 :source => :hostgroup
     has_many :roles, :through => :deployment_role_hostgroups
 
-    validates  :name, :presence => true, :uniqueness => true
+    validates :name, :presence => true, :uniqueness => true
 
     validates :layout, :presence => true
     validates :hostgroup, :presence => true
@@ -35,8 +35,8 @@ module Staypuft
     def update_hostgroup_list
       old_role_hostgroups_arr = deployment_role_hostgroups.to_a
       layout.layout_roles.each do |layout_role|
-        role_hostgroup = deployment_role_hostgroups.where(:role_id=>layout_role.role).first_or_initialize do |drh|
-          drh.hostgroup = Hostgroup.nest(layout_role.role.name, hostgroup)
+        role_hostgroup = deployment_role_hostgroups.where(:role_id => layout_role.role).first_or_initialize do |drh|
+          drh.hostgroup = Hostgroup.new(name: layout_role.role.name, parent: hostgroup)
         end
 
         role_hostgroup.hostgroup.add_puppetclasses_from_resource(layout_role.role)

data/app/models/staypuft/service.rb

@@ -24,7 +24,10 @@ module Staypuft
                              "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"],
+                             "nova_db_password", "nova_user_password", "ssl",
+                             "swift_admin_password", "swift_ringserver_ip",
+                             "swift_shared_secret", "swift_storage_device",
+                             "swift_storage_ips"],
       "Neutron (Controller)" => ["admin_email", "admin_password",
                                  "cisco_nexus_plugin", "cisco_vswitch_plugin",
                                  "controller_admin_host", "controller_priv_host",
@@ -42,7 +45,10 @@ module Staypuft
                                  "nova_user_password", "ovs_vlan_ranges",
                                  "provider_vlan_auto_create", "provider_vlan_auto_trunk",
                                  "ssl", "tenant_network_type", "tunnel_id_ranges",
-                                 "verbose"],
+                                 "verbose",
+                                 "swift_admin_password", "swift_ringserver_ip",
+                                 "swift_shared_secret", "swift_storage_device",
+                                 "swift_storage_ips"],
       "Glance"=> ["glance_db_password", "glance_user_password"],
       "Cinder"=> ["cinder_backend_gluster", "cinder_backend_iscsi",
                   "cinder_db_password", "cinder_gluster_servers",
@@ -50,9 +56,17 @@ module Staypuft
       "Heat"=> ["heat_cfn", "heat_cloudwatch", "heat_db_password", "heat_user_password"],
       "Ceilometer"=> ["ceilometer_metering_secret", "ceilometer_user_password"
                      ],
-      "Neutron - L3" => [],
+      "Neutron - L3" => ["controller_priv_host", "enable_tunneling",
+                         "external_network_bridge", "fixed_network_range",
+                         "mysql_ca", "mysql_host", "neutron_db_password",
+                         "neutron_metadata_proxy_secret", "neutron_user_password",
+                         "nova_db_password", "nova_user_password",
+                         "qpid_host", "ssl",
+                         "tenant_network_type", "tunnel_id_ranges", "verbose"],
       "DHCP" => [],
-      "OVS" => [],
+      "OVS" => ["ovs_bridge_mappings", "ovs_bridge_uplinks",
+                "ovs_tunnel_iface", "ovs_tunnel_types", "ovs_vlan_ranges",
+                "ovs_vxlan_udp_port" ],
       "Nova-compute" => ["admin_password", "auto_assign_floating_ip",
                          "ceilometer_metering_secret", "ceilometer_user_password",
                          "cinder_backend_gluster", "controller_priv_host",
@@ -73,9 +87,9 @@ module Staypuft
                             "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"]
+      "Swift" => ["swift_all_ips", "swift_ext4_device", "swift_local_interface",
+                  "swift_loopback", "swift_ring_server", "swift_shared_secret"] 
+
     }
 
     def ui_params_for_form(hostgroup = self.hostgroups.first)

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

@@ -2,24 +2,25 @@
 
 <% 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>
+  <% if Rails.env.development? %>
+    <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>
+  <% end %>
 
 
   <%= display_link_if_authorized(_("Deploy"), hash_for_deploy_deployment_path, :class => 'btn-success') %>
@@ -32,12 +33,9 @@
     <% @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><%= child_hostgroup.hosts.count %></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>
@@ -49,30 +47,34 @@
     <% @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| %>
+        <%= form_tag(associate_host_deployments_path, class: 'form-horizontal well association') 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>
-                <%= check_box_tag :check_all %>
-              </th>
-              <th><%= sort :label, :as => _('Host MAC Address') %></th>
-              <th><%= sort :label, :as => _('Host IP Address') %></th>
-              <th><%= _('Type') %></th>
-            </tr>
-            <% child_hostgroup.own_and_free_hosts.each do |host| %>
+            <thead>
               <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>
+                <th class="ca">
+                  <%= check_box_tag :check_all %>
+                </th>
+                <th><%= sort :name, :as => _('Name') %></th>
+                <th class="hidden-s hidden-xs"><%= sort :mac, :as => _('MAC Address') %></th>
+                <th class="hidden-s hidden-xs"><%= sort :type, :as => _('Type') %></th>
               </tr>
-            <% end %>
+            </thead>
+            <tbody>
+              <% child_hostgroup.own_and_free_hosts.each do |host| %>
+                <tr class="checkbox_highlight <%= "success" if child_hostgroup.host_ids.include?(host.id) %>">
+                  <td class="ca">
+                    <%= check_box_tag "host_ids[]", host.id, child_hostgroup.host_ids.include?(host.id), :id => "host_ids_#{host.id}" %>
+                  </td>
+                  <td class="ellipsis"><%= host.name %></td>
+                  <td class="hidden-s hidden-xs"><%= host.mac %></td>
+                  <td class="hidden-s hidden-xs"><%= host.type %></td>
+                </tr>
+              <% end %>
+            </tbody>
           </table>
         <% end %>
       </div>

data/db/seeds.rb

@@ -62,7 +62,7 @@ params = {
   "mysql_resource_group_name"     => 'mysqlgrp',
   "mysql_clu_member_addrs"        => '192.168.203.11 192.168.203.12 192.168.203.13',
   "qpid_host"                     => '172.16.0.1',
-  "admin_email"                   => "admin@#{Facter.domain}",
+  "admin_email"                   => "admin@#{Facter.value(:domain)}",
   "neutron_metadata_proxy_secret" => SecureRandom.hex,
   "enable_ovs_agent"              => "true",
   "ovs_vlan_ranges"               => '',
@@ -193,7 +193,7 @@ roles = [
      :services=>[:neutron_compute, :neutron_ovs_agent]},
     {:name=>"Neutron Networker",
      :class=>"quickstack::neutron::networker",
-     :layouts=>[[:ha_neutron, 2]],
+     :layouts=>[[:ha_neutron, 2], [:non_ha_neutron, 2]],
      :services=>[:neutron_l3, :dhcp, :ovs]},
     {:name=>"LVM Block Storage",
      :class=>"quickstack::storage_backend::lvm_cinder",
@@ -202,7 +202,11 @@ roles = [
     {:name=>"Load Balancer",
      :class=>"quickstack::load_balancer",
      :layouts=>[[:ha_nova, 4], [:ha_neutron, 4]],
-     :services=>[]}
+     :services=>[]},
+    {:name=>"Swift Storage Node",
+     :class=>"quickstack::swift::storage",
+     :layouts=>[[:non_ha_nova, 5], [:non_ha_neutron, 5]],
+     :services=>[:swift]}
         ]
 
 roles.each do |r|
@@ -228,11 +232,6 @@ roles.each do |r|
 
   role.description = r[:description]
   r[:services].each do |key|
-    role.id
-    services[key]
-    services[key][:obj]
-    services[key][:obj].id
-    Staypuft::RoleService.where(:role_id => role.id, :service_id => services[key][:obj].id).first
     Staypuft::RoleService.where(:role_id => role.id, :service_id => services[key][:obj].id).first_or_create!
   end
   role.save!

data/lib/staypuft/engine.rb

@@ -1,6 +1,7 @@
 module Staypuft
   ENGINE_NAME = "staypuft"
   class Engine < ::Rails::Engine
+    engine_name Staypuft::ENGINE_NAME
 
     config.autoload_paths += Dir["#{config.root}/app/lib"]
 
@@ -42,6 +43,23 @@ module Staypuft
       app.config.assets.precompile += %w(staypuft/staypuft.css staypuft/staypuft.js)
     end
 
+    initializer "load default settings" do |app|
+      if (Setting.table_exists? rescue(false))
+        Setting::StaypuftProvisioning.load_defaults
+      end
+    end
+
+    initializer 'staypuft.configure_assets', :group => :assets do
+      SETTINGS[:staypuft] = {
+        :assets => {
+          :precompile => [
+            'staypuft/staypuft.js',
+            'staypuft/staypuft.css'
+          ],
+        }
+      }
+    end
+
   end
 
   def table_name_prefix

data/lib/staypuft/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -103,7 +103,7 @@ files:
 - 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/setting/staypuft_provisioning.rb
 - app/models/staypuft/concerns/host_orchestration_build_hook.rb
 - app/models/staypuft/concerns/hostgroup_extensions.rb
 - app/models/staypuft/concerns/puppetclass_extensions.rb