staypuft 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzc3MTQ0YmQyOWU3Y2FkNmYzYmE2NjRhMjdlNGRiZDI0NGU5MTM1MA==
+    ZjllNGYyYjkzYTQwOTFhMDBiYmVmMzdiN2E4ZjlhY2EyZDRmN2VjNw==
   data.tar.gz: !binary |-
-    ZTc0MmI4YzRiOGViMTY0NzgxYWIxMDUzNzBiYTM4NWY0M2U0MmI5NQ==
+    MzNiNDViNTcwZWJmNTg3N2VlNzAxZDM2MWIzNTVlNDEyZWUyZmQ5Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZTQxMTExMDJhOTc3ZjNmNjE1NGQ2M2UyOTZhMjZlYjY3NmMwMTBiMDVkODY0
-    OGY4ZTMxZDBiMzlhOTJjYjRhNTZkNDA5Yjc3MWZmNGMzZjE3MGNmNjgyZWFk
-    NzBkMjg1ZTJiODc0ODJhZTA3NDYwMTU5ZmIwNGVlNmYyM2I3MmM=
+    NzUzNDAwZTNlMzQxYzdkNDY5YzM2MWNiNTRjMzgyMjNlNDNjMDhlOTQ2OGIz
+    MmE3NTQxMjgyNGNhZTA1ODM4YjJlODY2YzdlNzRlYjMzOThmNmJlZjI2Mjkx
+    YmM1NDE3MTcwNWIzMDc5OWQxODgwYTFhZjBkNjkzOWUzNGQ4OTE=
   data.tar.gz: !binary |-
-    NTA1MDI0OGZmODFkNWIwNzlhOGQyZDBjNDUwODQwZmIyZGMxMjc0ZWMzOGFl
-    YWY0NzNiYzM0M2M0MmQ1MDEwYjkyMWRlYzZlMzc0NTM4ZWM2MmY0NWRmMzM1
-    MzIyMjZhNTUyNTFjNzM0NDYxM2I1YWY3ZDIxNWYyYTBmODlhMzM=
+    MjYyMTg1ODk3NTc2MmQzZmI4YjEzZTRlYzU1NTFiYjhkZmY2YmJmZjk1M2E1
+    MGE3MDU5Y2M3MDQ5Y2RhNDE2NjljYzU1ZWU0MzI4NjViNTFlOTczMzc2ZjM0
+    MGFjZGQyZTI4NGUyMGRmMmNlMmY0ZDNjYzEzZTVlYWM3MzQzNzI=

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

@@ -24,7 +24,105 @@ $(function () {
     var tr = $(this).closest("tr");
     tr.toggleClass("info", this.checked);
     if (tr.hasClass("deployed")) {
-      tr.toggleClass("danger", !this.checked);
+      tr.toggleClass("danger", this.checked);
     }
   });
+
+  // Workaround to properly activate and deactivate tabs in tabbed_side_nav_table
+  // Should be probably done properly by extending Bootstrap Tab
+  $(".tabbed_side_nav_table").on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+    e.preventDefault();
+    $(this).closest('ul').find('.activated').removeClass('activated');
+    $(this).addClass("activated");
+    $(this).closest('li').addClass('activated');
+  });
+
+  $('.tabbed_side_nav_table').on('click', 'button.close', function() {
+    $(this).closest('.tab-pane.active').removeClass('active');
+    $(this).closest('.tabbed_side_nav_table').find('.activated').removeClass('activated');
+  })
+
+  var duration = 150;
+
+  showPasswords();
+  $("input[name='staypuft_deployment[passwords][mode]']").change(showPasswords);
+  function showPasswords() {
+    if ($('#staypuft_deployment_passwords_mode_single').is(":checked")) {
+      $('.single_password').fadeIn(duration);
+    }
+    else {
+      $('.single_password').fadeOut(duration)
+    }
+  }
+
+  showNovaVlanRange();
+  $("input[name='staypuft_deployment[nova][network_manager]']").change(showNovaVlanRange);
+  function showNovaVlanRange() {
+    if ($('#staypuft_deployment_nova_network_manager_vlanmanager').is(":checked")) {
+      $('.nova_vlan_range').fadeIn(duration);
+    }
+    else {
+      $('.nova_vlan_range').fadeOut(duration)
+    }
+  }
+
+  showNeutronVlanRange();
+  $("input[name='staypuft_deployment[neutron][network_segmentation]']").change(showNeutronVlanRange);
+  function showNeutronVlanRange() {
+    if ($('#staypuft_deployment_neutron_network_segmentation_vlan').is(":checked")) {
+      $('.neutron_tenant_vlan_ranges').fadeIn(duration);
+    }
+    else {
+      $('.neutron_tenant_vlan_ranges').fadeOut(duration)
+    }
+  }
+
+  showNeutronExternalInterface();
+  $("input[name='staypuft_deployment[neutron][use_external_interface]']").change(showNeutronExternalInterface);
+  function showNeutronExternalInterface() {
+    if ($('#staypuft_deployment_neutron_use_external_interface').is(":checked")) {
+      $('.neutron_external_interface').fadeIn(duration);
+    }
+    else {
+      $('.neutron_external_interface').fadeOut(duration)
+    }
+  }
+
+  showNeutronExternalVlan();
+  $("input[name='staypuft_deployment[neutron][use_vlan_for_external_network]']").change(showNeutronExternalVlan);
+  function showNeutronExternalVlan() {
+    if ($('#staypuft_deployment_neutron_use_vlan_for_external_network').is(":checked")) {
+      $('.neutron_external_vlan').fadeIn(duration);
+    }
+    else {
+      $('.neutron_external_vlan').fadeOut(duration)
+    }
+  }
+
+  showGlanceNfsNetworkPath();
+  $("input[name='staypuft_deployment[glance][driver_backend]']").change(showGlanceNfsNetworkPath);
+  function showGlanceNfsNetworkPath() {
+    if ($('#staypuft_deployment_glance_driver_backend_nfs').is(":checked")) {
+      $('.glance_nfs_network_path').show();
+    }
+    else {
+      $('.glance_nfs_network_path').hide();
+    }
+  }
+
+  showCinderNfsUri();
+  $("input[name='staypuft_deployment[cinder][driver_backend]']").change(showCinderNfsUri);
+  function showCinderNfsUri() {
+    if ($('#staypuft_deployment_cinder_driver_backend_nfs').is(":checked")) {
+      $('.cinder_nfs_uri').show();
+    }
+    else {
+      $('.cinder_nfs_uri').hide();
+    }
+  }
+
+  if ($('.configuration').length > 0) {
+    $('.configuration').find('li').first().find('a')[0].click();
+  }
+
 });

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

@@ -86,12 +86,12 @@
 }
 
 .tabbed_side_nav_table{
-  .nav.nav-pills.nav-stacked {
+  .nav {
     padding-top: 5px;
     padding-right: 4px;
-    & > li.active {
+    & > li.activated {
       z-index: 1;
-      & > a:after, & > a:before {
+      &:after, &:before {
         content: "";
         position: absolute;
         top: 0px;
@@ -103,13 +103,51 @@
         border-color: rgba(238, 238, 238, 0) rgb(238, 238, 238) rgba(238, 238, 238, 0) rgba(238, 238, 238, 0);
         -webkit-transform:rotate(360deg);
       }
-      & > a:before {
+      &:before {
         border-width: 21px 16px 21px 0;
         top: -1px;
         right: -9px;
         border-right-color: rgb(217, 217, 217);
       }
     }
+    li {
+      border: 1px solid rgb(227, 227, 227);
+      height: 42px;
+      margin-bottom: 3px;
+      border-radius: 4px;
+      line-height: 40px;
+      box-sizing: border-box;
+      padding: 0;
+      text-align: center;
+      &:hover, &.activated {
+        background: rgb(238, 238, 238);
+      }
+      & > div {
+        padding: 0;
+        div.group_name {
+          text-align: left;
+          padding: 0 8px;
+        }
+        &:not(:first-child) {
+          border-left: 1px solid rgb(227, 227, 227);
+        }
+        &:last-child > a {
+          border-top-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+        }
+        & > a {
+          box-sizing: border-box;
+          display: block;
+          &.activated {
+            background: $brand-primary;
+            color: white;
+          }
+          &.disabled {
+            color: $btn-link-disabled-color;
+          }
+        }
+      }
+    }
   }
   .tab-content {
     padding-left: 4px;
@@ -119,3 +157,9 @@
     }
   }
 }
+
+.panel-body {
+  ul {
+    padding-left: 1em;
+  }
+}

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

@@ -24,17 +24,13 @@
   overflow: auto;
 }
 
-.nav > li > a.roles_list {
-  padding: 0;
-  border: 1px solid #ddd;
-  & > div {
-    padding: 10px;
-    &:not(:first-child) {
-      border-left: 1px solid #ddd;
-    }
-  }
-}
-
 .association.well {
   min-height: 500px;
+  margin-top: 50px;
+  h4{
+    margin: 6px 0 6px 0;
+    &.pull-left {
+      margin-left: 10px;
+    }
+  }
 }

data/app/controllers/staypuft/deployments_controller.rb

@@ -1,5 +1,5 @@
 module Staypuft
-  class DeploymentsController < ApplicationController
+  class DeploymentsController < Staypuft::ApplicationController
     include Foreman::Controller::AutoCompleteSearch
 
     def index
@@ -7,16 +7,7 @@ module Staypuft
     end
 
     def new
-      base_hostgroup = Hostgroup.get_base_hostgroup
-
-      deployment           = Deployment.new(:name          => Deployment::NEW_NAME_PREFIX+SecureRandom.hex,
-                                            :amqp_provider => Deployment::AMQP_RABBITMQ)
-      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
+      deployment = Deployment.new(:name => Deployment::NEW_NAME_PREFIX+SecureRandom.hex)
       deployment.save!
 
       redirect_to deployment_steps_path(deployment_id: deployment)
@@ -33,6 +24,12 @@ module Staypuft
       @service_hostgroup_map = @deployment.services_hostgroup_map
     end
 
+    # FIXME: missing update action, there is no way how to submit the edited params
+    def edit
+      @deployment            = Deployment.find(params[:id])
+      @service_hostgroup_map = @deployment.services_hostgroup_map
+    end
+
     def destroy
       Deployment.find(params[:id]).destroy
       process_success
@@ -58,10 +55,7 @@ module Staypuft
       hostgroup              = ::Hostgroup.find params[:hostgroup_id]
       deployment_in_progress = ForemanTasks::Lock.locked?(deployment, nil)
 
-      targeted_hosts  = ::Host::Base.find Array(params[:host_ids])
-      assigned_hosts  = hostgroup.hosts
-      hosts_to_assign = targeted_hosts - assigned_hosts
-      hosts_to_remove = assigned_hosts - targeted_hosts
+      hosts_to_assign  = ::Host::Base.find Array(params[:host_ids])
 
       unassigned_hosts = hosts_to_assign.reduce([]) do |unassigned_hosts, discovered_host|
         success, host = assign_host_to_hostgroup discovered_host, hostgroup
@@ -77,11 +71,20 @@ module Staypuft
                     join("\n"))
       end
 
-      hosts_to_remove.each do |host|
-        if host.open_stack_deployed? && deployment_in_progress
-          # do not remove
-        else
-          host.hostgroup   = nil
+      redirect_to show_with_hostgroup_selected_deployment_path(
+                      id: deployment, hostgroup_id: hostgroup)
+    end
+
+    def unassign_host
+      deployment             = Deployment.find(params[:id])
+      hostgroup              = ::Hostgroup.find params[:hostgroup_id]
+      deployment_in_progress = ForemanTasks::Lock.locked?(deployment, nil)
+
+      hosts_to_unassign  = ::Host::Base.find Array(params[:host_ids])
+
+      hosts_to_unassign.each do |host|
+        unless host.open_stack_deployed? && deployment_in_progress
+          host.open_stack_unassign
           host.environment = Environment.get_discovery
           host.save!
           host.setBuild

data/app/controllers/staypuft/steps_controller.rb

@@ -1,7 +1,7 @@
 module Staypuft
-  class StepsController < ApplicationController
+  class StepsController < Staypuft::ApplicationController
     include Wicked::Wizard
-    steps :deployment_settings, :services_selection, :services_configuration
+    steps :deployment_settings, :services_overview, :services_configuration
 
     before_filter :get_deployment
 
@@ -10,7 +10,7 @@ module Staypuft
       when :deployment_settings
         @layouts = ordered_layouts
       when :services_configuration
-        @service_hostgroup_map = @deployment.services_hostgroup_map
+        @services_map = [:nova, :neutron, :glance, :cinder]
       end
 
       render_wizard
@@ -18,33 +18,27 @@ module Staypuft
 
     def update
       case step
+
       when :deployment_settings
-        @layouts = ordered_layouts
+        @layouts               = ordered_layouts
+        # FIXME: validate that deployment is valid when leaving wizard with cancel button
+        @deployment.form_step  = Deployment::STEP_SETTINGS
+        @deployment.passwords.attributes = params[:staypuft_deployment].delete(:passwords)
+        @deployment.attributes = params[:staypuft_deployment]
+
+      when :services_overview
+        @deployment.form_step = Deployment::STEP_OVERVIEW
 
-        Deployment.transaction do
-          @deployment.form_step = Deployment::STEP_SETTINGS unless @deployment.form_complete?
-          @deployment.update_attributes(params[:staypuft_deployment])
-          @deployment.update_hostgroup_list
-          @deployment.set_custom_params
-        end
-      when :services_selection
-        @deployment.form_step = Deployment::STEP_SELECTION unless @deployment.form_complete?
       when :services_configuration
-        # Collect services across all deployment's roles
-        @service_hostgroup_map = @deployment.services_hostgroup_map
+        @services_map = [:nova, :neutron, :glance, :cinder]
         if params[:staypuft_deployment]
-          @deployment.form_step = Deployment::STEP_CONFIGURATION unless @deployment.form_complete?
-          param_data = params[:staypuft_deployment][:hostgroup_params]
-          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
+          @deployment.form_step = Deployment::STEP_CONFIGURATION
+          @services_map.each do |service|
+            @deployment.send(service).attributes = params[:staypuft_deployment].delete(service)
           end
         end
+      else
+        raise 'unknown step'
       end
 
       render_wizard @deployment

data/app/helpers/staypuft/application_helper.rb

@@ -1,7 +1,7 @@
 module Staypuft
   module ApplicationHelper
     def radio_button_f_non_inline(f, attr, options = {})
-      text = options.delete(:text)
+      text  = options.delete(:text)
       value = options.delete(:value)
       content_tag(:div, :class => 'radio') do
         label_tag('') do
@@ -9,5 +9,20 @@ module Staypuft
         end
       end
     end
+
+    def check_box_f_non_inline(f, attr, options = {})
+      text            = options.delete(:text)
+      checked_value   = options.delete(:checked_value)
+      unchecked_value = options.delete(:unchecked_value)
+      content_tag(:div, :class => 'checkbox') do
+        label_tag('') do
+          f.check_box(attr, options, checked_value, unchecked_value) + " #{text} "
+        end
+      end
+    end
+
+    def change_label_width(width, html)
+      html.gsub(/class="col-md-2 control-label"/, "class=\"col-md-#{width} control-label\"").html_safe
+    end
   end
 end

data/app/helpers/staypuft/deployments_helper.rb

@@ -4,7 +4,7 @@ module Staypuft
       wizard_header(
           step,
           _("Deployment Settings"),
-          _("Services Selection"),
+          _("Services Overview"),
           _("Services Configuration")
       )
     end

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

@@ -57,15 +57,10 @@ module Actions
           5
         end
 
-        # TODO The puppet modules sometimes fail then become ready
-        # after subsequent hosts have started.  For this reason
-        # we can not check to see if the host is ready using the
-        # stats on the host only.  This needs fixing in the puppet
-        # modules then reflecting here.
         def host_ready?(host_id)
           host = ::Host.find(host_id)
           host.reports.order('reported_at DESC').any? do |report|
-            #check_for_failures(report, host.id)
+            check_for_failures(report, host.id)
             report_change?(report)
           end
         end
@@ -74,10 +69,9 @@ module Actions
           report.status['applied'] > 0
         end
 
-        # TODO To aid logging add the report ID to the exception or
-        # the output object.
         def check_for_failures(report, id)
           if report.status['failed'] > 0
+            output[:report_id] = report.id
             fail(::Staypuft::Exception, "Latest Puppet Run Contains Failures for Host: #{id}")
           end
         end