staypuft 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3386cee555561d013c4968867cb54660088bba35
-  data.tar.gz: a2ac68c76e051ea923e3998ccaa220ec50642597
+  metadata.gz: 649c569f711506344527e8d7fde4bc80a02eea35
+  data.tar.gz: 6ad27bedcd36de4fc1fdb0f42778ff7604b0893e
 SHA512:
-  metadata.gz: 72bd5a3ba9c0fe7fb6e9817aec46b6c1c56195273bc41497a3b09f2b7505e6c737eae5c52bcd92a2a0929be4a79967d8d4ef374608c9e0fd73d91972746753f8
-  data.tar.gz: 7526c87be767c0b690aa8960565ab975c1f737d5453fdc9552f40e14636492441202068b254c7109c03d1ca4ae5ea96dbb094f9a22a41ed80f91b1d7ac4dc34c
+  metadata.gz: 530524b460fbe5f721cc316cb9369c7df316430f8d28d95a1822234d7e3399b0ee94e59c130bbee91b9c4c14ddcaa22ff8ff83967c674ee825d5e56697ff4e3d
+  data.tar.gz: f02a79d67f30ad5051bc438d150bae88b04996bfd2c6c188ab9eaff6c8294b890bc6037a983c9cca53c92a327ab717bef0cec0eff90179289d6b95a59487d5c6

data/README.md

@@ -19,6 +19,20 @@ See [this](doc/setup.md) document.
 
 Fork and send a Pull Request. Thanks!
 
+## Release a new version
+
+To release a new gem version you have to be owner of the gem on rubygems.org. 
+If you're not you can ask for ownership or you can build a gem locally. To build 
+a gem locally, cd into staypuft directory and run `rake build`. This builds
+a gem in pkg directory. The version is determined by constant in lib/staypuft/version.rb 
+so if you want to bump version, modify this file before running rake.
+
+If you are the owner and you want to release new gem version, make sure you're building
+from official repository (not your own fork). Clone the repository and make sure the origin
+remote is github.com/theforeman/staypuft. Now bump the version in lib/staypuft/version.rb.
+Finally build and release new gem by running `rake release`. This will build the package,
+tag the commit, push the commit and the tag to origin and uploads the gem to rubygems.org.
+
 ## Copyright
 
 Copyright (c) 2014 Red Hat, Inc. http://redhat.com

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

@@ -15,6 +15,18 @@
 @import "bootstrap/buttons";
 @import "bootstrap/forms";
 
+.deployment-wizard .wizard {
+  width: 100%;
+  float: left;
+  padding-left: 0;
+}
+
+.deployment-wizard label {
+  text-align: left !important;
+  float: left;
+  margin-left: 10px;
+}
+
 .top_actions {
   //same margin as h1 (title)
   margin: 20px 0 10px;

data/app/controllers/staypuft/deployments_controller.rb

@@ -16,11 +16,10 @@ module Staypuft
     def show
       @deployment = Deployment.find(params[:id])
       respond_to do | format |
-        format.html do
-          @hostgroup  = ::Hostgroup.find_by_id(params[:hostgroup_id]) ||
-              @deployment.child_hostgroups.deploy_order.first
+        format.html {}
+        format.json do
+          render :status => 200, :json => @deployment.to_json(:methods => [:progress, :progress_summary])
         end
-        format.js {}
       end
     end
 
@@ -103,8 +102,7 @@ module Staypuft
                     join("\n"))
       end
 
-      redirect_to show_with_hostgroup_selected_deployment_path(
-                      id: deployment, hostgroup_id: hostgroup)
+      redirect_to deployment_path(deployment)
     end
 
     def unassign_host
@@ -123,8 +121,7 @@ module Staypuft
         end
       end
 
-      redirect_to show_with_hostgroup_selected_deployment_path(
-                      id: deployment, hostgroup_id: hostgroup)
+      redirect_to deployment_path(deployment)
     end
 
     def export_config

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

@@ -31,7 +31,11 @@ module Actions
         end
 
         def humanized_output
-          planned_actions.map(&:humanized_output).join("\n")
+          planned_actions.first.humanized_output
+        end
+
+        def task_output
+          planned_actions.first.task_output
         end
 
       end

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

@@ -31,17 +31,22 @@ module Actions
           end
         end
 
-        def humanized_output
-          # TODO: use Action::Progress.calculate in new dynflow version
+        def task_output
           steps    = planned_actions.inject([]) { |s, a| s + a.steps[1..2] }.compact
           progress = if steps.empty?
-                       'done'
+                       1
                      else
                        total          = steps.map { |s| s.progress_done * s.progress_weight }.reduce(&:+)
                        weighted_count = steps.map(&:progress_weight).reduce(&:+)
-                       format '%3d%%', total / weighted_count * 100
+                       total / weighted_count
                      end
-          format '%s Host: %s', progress, input[:host][:name]
+
+          input[:host].merge progress: progress
+        end
+
+        def humanized_output
+          task_output = self.task_output
+          format '%s %s%%', task_output[:name], (task_output[:progress]*100).to_i
         end
 
       end

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

@@ -36,14 +36,18 @@ module Actions
           input[:name]
         end
 
-        def humanized_output
-          format "Hostgroup: %s\n%s", input[:name],
-                 planned_actions.
-                     map(&:humanized_output).
-                     compact.
-                     tap { |lines| lines << '-' if lines.empty? }.
-                     map { |l| '  ' + l }.
-                     join("\n")
+        def task_output
+          task_outputs = planned_actions.map(&:task_output)
+          progress     = if task_outputs.size == 0
+                           1
+                         else
+                           task_outputs.map { |to| to[:progress] }.reduce(&:+).to_f / task_outputs.size
+                         end
+          { id: input[:id], name: input[:name], progress: progress, hosts: task_outputs }
+        end
+
+        def humanized_output(task_output = self.task_output)
+          format '%s %s%%', task_output[:name], (task_output[:progress]*100).to_i
         end
 
       end

data/app/lib/actions/staypuft/hostgroup/ordered_deploy.rb

@@ -34,7 +34,12 @@ module Actions
         end
 
         def humanized_output
-          planned_actions.map(&:humanized_output).join("\n")
+          action = Hostgroup::Deploy.allocate
+          task_output.map { |to| action.humanized_output to }.join(", ")
+        end
+
+        def task_output
+          planned_actions.map(&:task_output).select { |to| !to[:hosts].empty? }
         end
       end
     end

data/app/models/staypuft/deployment/glance_service.rb

@@ -59,9 +59,9 @@ module Staypuft
 
     def pcmk_fs_options
       if self.nfs_backend?
-        "context=\"system_u:object_r:glance_var_lib_t:s0\")"
+        'context=\"system_u:object_r:glance_var_lib_t:s0\"'
       else
-        ""
+        ''
       end
     end
 

data/app/models/staypuft/deployment/neutron_service.rb

@@ -5,8 +5,8 @@ module Staypuft
     end
 
     SEGMENTATION_LIST = ['vxlan', 'vlan', 'gre', 'flat']
-    INTERFACE_HELP    = N_('(i.e. eth0, em1, etc.)')
-    VLAN_HELP         = N_('[1-4094] (i.e. 10:100)')
+    INTERFACE_HELP    = N_('(e.g. eth0 or em1)')
+    VLAN_HELP         = N_('[1-4094] (e.g. 10:100)')
 
 
     param_attr :network_segmentation, :tenant_vlan_ranges, :networker_tenant_interface,
@@ -28,17 +28,21 @@ module Staypuft
     validates :network_segmentation, presence: true, inclusion: { in: NetworkSegmentation::TYPES }
 
     module TenantVlanRanges
-      HUMAN       = N_('Tenant (VM data) VLAN Ranges')
+      HUMAN       = N_('Tenant (VM Data) VLAN Ranges')
       HUMAN_AFTER = VLAN_HELP
     end
 
+    class NeutronVlanRangesValidator < ActiveModel::EachValidator
+      include Staypuft::Deployment::VlanRangeValuesValidator 
+    end
+
     validates :tenant_vlan_ranges,
-              :presence => true,
-              :if       => :vlan_segmentation?
-    # TODO: vlan range format validation
+              :presence            => true,
+              :if                  => :vlan_segmentation?,
+              :neutron_vlan_ranges => true
 
     module NetworkerTenantInterface
-      HUMAN       = N_('Which interface to use for tenant networks:')
+      HUMAN       = N_('Which interface to use for tenant networks')
       HUMAN_AFTER = INTERFACE_HELP
     end
 
@@ -63,7 +67,7 @@ module Staypuft
     # TODO: interface name format validation
 
     module ComputeTenantInterface
-      HUMAN       = N_('Which interface to use for tenant networks:')
+      HUMAN       = N_('Which interface to use for tenant networks')
       HUMAN_AFTER = INTERFACE_HELP
     end
 

data/app/models/staypuft/deployment/nova_service.rb

@@ -64,14 +64,17 @@ module Staypuft
       HUMAN_AFTER = VLAN_HELP
     end
 
+    class NovaVlanRangeValidator < ActiveModel::EachValidator
+      include Staypuft::Deployment::VlanRangeValuesValidator
+    end
+
     validates :vlan_range,
-              :presence => true,
-              :if       => :vlan_manager?
-    # TODO: vlan range format validation
-    # TODO: determine whether this is a true range or a single value
+              :presence        => true,
+              :if              => :vlan_manager?,
+              :nova_vlan_range => true
 
     module ExternalInterfaceName
-      HUMAN       = N_('Which interface to use for external networks:')
+      HUMAN       = N_('Which interface to use for external networks')
       HUMAN_AFTER = INTERFACE_HELP
     end
 
@@ -79,15 +82,15 @@ module Staypuft
     # TODO: interface name format validation
 
     module PublicFloatingRange
-      HUMAN       = N_('Floating IP range for external network:')
-      HUMAN_AFTER = N_('("10.0.0.0/24", for example)')
+      HUMAN       = N_('Floating IP range for external network')
+      HUMAN_AFTER = N_('(e.g. "10.0.0.0/24")')
     end
 
     validates :public_floating_range, presence: true
     # TODO: interface format validation
 
     module ComputeTenantInterface
-      HUMAN       = N_('Which interface to use for tenant networks:')
+      HUMAN       = N_('Which interface to use for tenant networks')
       HUMAN_AFTER = INTERFACE_HELP
     end
 
@@ -96,7 +99,7 @@ module Staypuft
     # TODO: interface name format validation
 
     module PrivateFixedRange
-      HUMAN       = N_('Private IP range for tenant networks:')
+      HUMAN       = N_('Private IP range for tenant networks')
       HUMAN_AFTER = PublicFloatingRange::HUMAN_AFTER
     end
 

data/app/models/staypuft/deployment/vlan_range_values_validator.rb

@@ -0,0 +1,33 @@
+module Staypuft
+  module Deployment::VlanRangeValuesValidator
+    GENERAL_MSG = N_("Start and end vlan IDs required, in format '10:100'")
+    INT_VAL_MSG = N_("is not a valid integer between 1 and 4094")
+    FIRST_VALID = 1
+    LAST_VALID = 4024
+
+    def validate_each(record, attribute, value)
+
+      return if value.empty?
+
+      if value !~ /\A\d+:\d+\Z/
+        record.errors.add attribute, GENERAL_MSG
+        return
+      end
+
+      range_values = value.split(':').map(&:to_i)
+
+      range_values.all? do |value|
+        if value.between?(FIRST_VALID, LAST_VALID)
+          true
+        else
+          record.errors.add attribute, "Range boundary #{value} #{INT_VAL_MSG}"
+          false
+        end
+      end or return
+
+      unless range_values[1] >= range_values[0]
+        record.errors.add attribute, _("End VLAN ID must be equal to or greater than start VLAN ID.")
+      end
+    end
+  end
+end

data/app/models/staypuft/deployment.rb

@@ -122,6 +122,10 @@ module Staypuft
       in_progress? ? {} : hostgroup.openstack_hosts(errors)
     end
 
+    def progress_summary
+      self.in_progress? ? self.task.humanized[:output] : nil 
+    end
+
     # Helper method for getting the progress of this deployment
     def progress
       if self.in_progress?
@@ -142,7 +146,7 @@ module Staypuft
       QPID     = 'qpid'
       LABELS   = { RABBITMQ => N_('RabbitMQ'), QPID => N_('Qpid') }
       TYPES    = LABELS.keys
-      HUMAN    = N_('Messaging provider')
+      HUMAN    = N_('Messaging Provider')
     end
 
     module Networking

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

@@ -1,5 +1,5 @@
 <% if deployment.in_progress? %>
-  <%= "#{deployment.progress}% #{_('Complete')}" %>
+  <span><%= deployment.progress %></span><%= "% #{_('Complete')}" %>
   <div class="progress progress-striped <%= 'active' if deployment.task.state == 'running' %>">
     <% classes = ['progress-bar',
                   case deployment.task.result
@@ -20,8 +20,5 @@
       <span class="sr-only"><%= deployment.progress %>% Complete</span>
     </div>
   </div>
-<% else %>
-  <script>
-    location.reload(true);
-  </script>
+  <span id="progress-summary" class="text-muted"><%= deployment.progress_summary %></span>
 <% end %>

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

@@ -43,18 +43,6 @@
       </div>
     </div>
   <% elsif @deployment.in_progress? %>
-    <script>
-      // Polling for progress bar updates
-      var pollingInterval = 10000;
-      setTimeout(updateProgress, pollingInterval);
-
-      function updateProgress() {
-        var url = $("#deployment_progress_bar").attr("data-poll-url");
-        $.getScript(url);
-        setTimeout(updateProgress, pollingInterval);
-      }
-    </script>
-
     <div class="row">
       <div class="col-sm-12 text-center"><h3 class="text-muted"><%= _("Deploying") %></h3></div>
     </div>
@@ -74,6 +62,35 @@
         <% end %>
       </div>
     </div>
+    <script>
+      // Polling for progress bar updates
+      var pollingInterval = 10000;
+      var $pollElement = $("#deployment_progress_bar");
+
+      setTimeout(updateProgress, pollingInterval);
+
+      function updateProgress() {
+        var url = $pollElement.data('poll-url');
+
+        $.getJSON(url, function (response) {
+          var progress = response.deployment.progress;
+          var $progressBar = $pollElement.find(".progress-bar");
+
+          if(progress == 100) {
+            location.reload(true)
+          }
+
+          $pollElement.children('span').text(progress)
+
+          $progressBar.attr("aria-valuenow", progress);
+          $progressBar.width(progress + "%");
+          $progressBar.find("span.sr-only").text(progress + "% Complete");
+          $("#progress-summary").text(response.deployment.progress_summary);
+
+          setTimeout(updateProgress, pollingInterval);
+        });
+      }
+    </script>
   <% else %>
     <div class="row">
       <div class="col-sm-12 text-center"><h3 class="text-muted"><%= _("Not deployed, yet.") %></h3></div>

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

@@ -1,19 +1,21 @@
 <% title(@deployment.name,
          edit_textfield(@deployment,
                         :name,
-                        options={:update_url => deployment_path(@deployment)}) +
-         content_tag(:small,
-                     @deployment.ha? ? _("with High Availability") : _("without High Availability"),
-                     :class => "text-muted")) %>
-<% subtitle edit_textfield(@deployment, :description, options={:update_url => deployment_path(@deployment)}) %>
+                        options={ :update_url => deployment_path(@deployment) }) +
+             content_tag(:small,
+                         @deployment.ha? ? _("with High Availability") : _("without High Availability"),
+                         :class => "text-muted")) %>
+<% subtitle edit_textfield(@deployment, :description, options={ :update_url => deployment_path(@deployment) }) %>
 
 <% content_for(:top_actions) do %>
   <%= link_to(_("Advanced Configuration"), summary_deployment_path(@deployment.id), :class => 'btn btn-link') %>
-  <%= link_to(_("Revisit Setup Wizard"), if @deployment.deployed?
-                                           deployment_step_path(deployment_id: @deployment, id: 'services_configuration')
-                                         else
-                                           deployment_steps_path(deployment_id: @deployment)
-                                         end, :class => "btn btn-default") %>
+  <%= link_to(_("Revisit Setup Wizard"),
+              if @deployment.deployed?
+                deployment_step_path(deployment_id: @deployment, id: 'services_configuration')
+              else
+                deployment_steps_path(deployment_id: @deployment)
+              end,
+              :class         => @deployment.in_progress? ? %w(btn btn-default disabled) : %w(btn btn-default)) %>
 
   <%= link_to(_("Deploy"),
               "",
@@ -86,14 +88,14 @@
 
   <div class="tab-content col-md-8">
     <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
-      <%= render :partial => "free_hosts_table", :locals => { :deployment => @deployment,
-                                                              :hostgroup => @hostgroup,
+      <%= render :partial => "free_hosts_table", :locals => { :deployment      => @deployment,
+                                                              :hostgroup       => @hostgroup,
                                                               :child_hostgroup => child_hostgroup } %>
-      <%= render :partial => "assigned_hosts_table", :locals => { :deployment => @deployment,
-                                                                  :hostgroup => @hostgroup,
+      <%= render :partial => "assigned_hosts_table", :locals => { :deployment      => @deployment,
+                                                                  :hostgroup       => @hostgroup,
                                                                   :child_hostgroup => child_hostgroup } %>
-      <%= render :partial => "deployed_hosts_table", :locals => { :deployment => @deployment,
-                                                                  :hostgroup => @hostgroup,
+      <%= render :partial => "deployed_hosts_table", :locals => { :deployment      => @deployment,
+                                                                  :hostgroup       => @hostgroup,
                                                                   :child_hostgroup => child_hostgroup } %>
     <% end %>
     <%= render :partial => "deployment_summary", :locals => { :deployment => @deployment } %>

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

@@ -3,7 +3,7 @@
   <%= link_to _("Back to Deployment"), deployment_path(@deployment.id), :class => "btn btn-link" %>
   <%= link_to(icon_text("cloud-upload", _("Import")),
               {},
-              { :class => "btn btn-default",
+              { :class  => "btn btn-default",
                 :remote => true,
                 :rel    => 'popover',
                 :data   => { 'content'        => "#{render partial: 'import_form'}",
@@ -11,7 +11,8 @@
                              'placement'      => 'left' } }) %>
   <%= link_to(icon_text("cloud-download", _("Export")),
               export_config_deployment_path(@deployment.id), :class => "btn btn-default") %>
-  <%= link_to _("Edit"), edit_deployment_path(@deployment.id), :class => "btn btn-default" %>
+  <%= link_to _("Edit"), edit_deployment_path(@deployment.id),
+              :class => @deployment.in_progress? ? %w(btn btn-default disabled) : %w(btn btn-default) %>
 <% end %>
 
 <div class="col-md-12">
@@ -59,7 +60,7 @@
           <% else %>
             <p><%= _("No configuration needed for this service.") %></p>
           <% end %>
-          <% # render "puppetclasses/classes_parameters", { :obj => service.hostgroups.first }  %>
+          <% # render "puppetclasses/classes_parameters", { :obj => service.hostgroups.first }   %>
         </div>
       <% end %>
     </div>

data/app/views/staypuft/steps/_neutron_ha.html.erb

@@ -0,0 +1,28 @@
+<!--Neutron HA-->
+<div class="clearfix">
+  <div class="panel panel-default service-box">
+    <div class="panel-heading"><strong><%= _("Controller") %></strong></div>
+    <div class="panel-body">
+      <ul>
+        <li>Horizon</li>
+        <li>Keystone</li>
+        <li>Glance</li>
+        <li>Cinder</li>
+        <li>Neutron</li>
+        <li>Database with Galera</li>
+        <li>Messaging</li>
+        <li>Pacemaker Cluster</li>
+        <li>HAProxy Load Balancer</li>
+      </ul>
+     </div>
+  </div>
+  <div class="panel panel-default service-box">
+    <div class="panel-heading"><strong><%= _("Compute") %></strong></div>
+    <div class="panel-body">
+      <ul>
+        <li>Nova-Compute</li>
+        <li>Open vSwitch Agent</li>
+      </ul>
+     </div>
+  </div>
+</div>

data/app/views/staypuft/steps/_neutron_non_ha.html.erb

@@ -0,0 +1,41 @@
+<!--Neutron Non-HA-->
+<div class="clearfix">
+  <div class="panel panel-default service-box">
+    <div class="panel-heading"><strong><%= _("Controller") %></strong></div>
+    <div class="panel-body">
+      <ul>
+        <li>Horizon</li>
+        <li>Keystone</li>
+        <li>Glance</li>
+        <li>Cinder</li>
+        <li>Nova</li>
+        <li>Neutron Server</li>
+        <li>Database</li>
+        <li>Messaging</li>
+        <li>Heat</li>
+        <li>Ceilometer</li>
+      </ul>
+     </div>
+  </div>
+  <div class="panel panel-default service-box">
+    <div class="panel-heading"><strong><%= _("Compute") %></strong></div>
+    <div class="panel-body">
+      <ul>
+        <li>Nova-Compute</li>
+        <li>Open vSwitch Agent</li>
+        <li>Ceilometer Agent</li>
+      </ul>
+     </div>
+  </div>
+  <div class="panel panel-default service-box">
+    <div class="panel-heading"><strong><%= _("Neutron Network Node") %></strong></div>
+    <div class="panel-body">
+      <ul>
+        <li>L3 Agent</li>
+        <li>Open vSwitch Agent</li>
+        <li>DHCP Agent</li>
+        <li>Metadata Agent</li>
+      </ul>
+     </div>
+  </div>
+</div>

data/app/views/staypuft/steps/_nova_ha.html.erb

@@ -0,0 +1,29 @@
+<!--Nova-Network HA-->
+<div class="clearfix">
+  <div class="panel panel-default service-box">
+    <div class="panel-heading"><strong><%= _("Controller") %></strong></div>
+    <div class="panel-body">
+      <ul>
+        <li>Horizon</li>
+        <li>Keystone</li>
+        <li>Glance</li>
+        <li>Cinder</li>
+        <li>Nova</li>
+        <li>Heat</li>
+        <li>Database with Galera</li>
+        <li>Messaging</li>
+        <li>Pacemaker Cluster</li>
+        <li>HAProxy Load Balancer</li>
+      </ul>
+     </div>
+  </div>
+  <div class="panel panel-default service-box">
+    <div class="panel-heading"><strong><%= _("Compute") %></strong></div>
+    <div class="panel-body">
+      <ul>
+        <li>Nova Compute</li>
+        <li>Nova Network</li>
+      </ul>
+     </div>
+  </div>
+</div>

data/app/views/staypuft/steps/_nova_non_ha.html.erb

@@ -0,0 +1,29 @@
+<!--Nova-Network Non-HA-->
+<div class="clearfix">
+  <div class="panel panel-default service-box">
+    <div class="panel-heading"><strong><%= _("Controller") %></strong></div>
+    <div class="panel-body">
+      <ul>
+        <li>Horizon</li>
+        <li>Keystone</li>
+        <li>Glance</li>
+        <li>Cinder</li>
+        <li>Nova</li>
+        <li>Database</li>
+        <li>Messaging</li>
+        <li>Heat</li>
+        <li>Ceilometer</li>
+      </ul>
+     </div>
+  </div>
+  <div class="panel panel-default service-box">
+    <div class="panel-heading"><strong><%= _("Compute") %></strong></div>
+    <div class="panel-body">
+      <ul>
+        <li>Nova Compute</li>
+        <li>Nova Network</li>
+        <li>Ceilometer Agent</li>
+      </ul>
+     </div>
+  </div>
+</div>

data/app/views/staypuft/steps/_wizard_form_buttons.html.erb

@@ -0,0 +1,33 @@
+<!-- Render Wizard Form Cancel/Back/Submit Buttons -->
+<div class="form_actions right" style="text-align: right">
+
+  <!-- Render Cancel Button -->
+  <% if is_new && step == Staypuft::Deployment::STEP_SETTINGS %>
+    <%= link_to _("Cancel"), deployment_path(@deployment),
+                :method  => :delete,
+                :confirm => _("This will clear whole deployment configuration. Are you sure?"),
+                :class   => "btn btn-danger" %>
+  <% else %>
+      <%= link_to _("Cancel"), deployment_path(@deployment),
+                  :class => "btn btn-danger" %>
+  <% end %>
+
+  <!-- Render Back Button -->
+  <% unless step == Staypuft::Deployment::STEP_SETTINGS %>
+    <a class="btn btn-default" href="<%= previous_wizard_path %>">
+      <span class="glyphicon glyphicon-chevron-left"></span>
+      <%= _("Back") %>
+    </a>
+  <% end %>
+
+  <!-- Render Next/Submit Button -->
+  <%= button_tag(:type => 'submit', :class => "btn btn-primary") do %>
+    <% if step == Staypuft::Deployment::STEP_CONFIGURATION %>
+      <%= _("Submit") %>
+    <% else %>
+      <%= _("Next") %>
+      <span class="glyphicon glyphicon-chevron-right"></span>
+    <% end %>
+  <% end %>
+
+</div>

data/app/views/staypuft/steps/deployment_settings.html.erb

@@ -1,71 +1,61 @@
 <%= render :layout => 'title' do %>
   <%= alert_if_deployed %>
 
-  <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
-    <%= base_errors_for @deployment %>
-
-    <div class="wizard-container">
-      <%= deployment_wizard 1 %>
-    </div>
-
-    <%= text_f f, :name %>
-    <%= textarea_f f, :description, :rows => 3 %>
-
-    <% { layout_name:   Staypuft::Deployment::LayoutName,
-         networking:    Staypuft::Deployment::Networking,
-         amqp_provider: Staypuft::Deployment::AmqpProvider,
-         platform:      Staypuft::Deployment::Platform }.
-           each do |attr, constants| %>
-
-      <%= field(f, attr, :label => _(constants::HUMAN)) do
-        constants::LABELS.map do |value, label|
-          radio_button_f_non_inline(f, attr,
-                                    :checked => value == @deployment.send(attr),
-                                    :value   => value,
-                                    :text    => _(label))
-        end.join
-      end %>
-    <% end %>
-
-    <%= f.fields_for :passwords, @deployment.passwords do |p| %>
-      <%= field(p, :mode, :label => _(Staypuft::Deployment::Passwords::Mode::HUMAN)) do
-        Staypuft::Deployment::Passwords::Mode::LABELS.map do |value, label|
-          radio_button_f_non_inline(p, :mode,
-                                    :checked => @deployment.passwords.mode == value,
-                                    :value   => value,
-                                    :text    => label)
-        end.join
-      end %>
-
-      <div class="single_password col-md-offset-0 hide">
-        <%= password_f p, :single_password,
-                       :label       => _("Password"),
-                       :class       => "single_password",
-                       :help_inline => _("Password should be 6 characters or more"),
-                       :placeholder => '' %>
-        <%= password_f p, :single_password_confirmation,
-                       :label       => _("Confirm"),
-                       :class       => "single_password",
-                       :placeholder => '' %>
+  <div class="deployment-wizard">
+    <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
+      <%= base_errors_for @deployment %>
+  
+      <div class="wizard-container">
+        <%= deployment_wizard 1 %>
       </div>
-    <% end %>
-
-
-
-    <div class="form_actions">
-      <% if !is_new %>
-        <%= link_to _("Cancel"), deployment_path(@deployment),
-                    :class => "btn btn-danger" %>
-      <% else %>
-        <%= link_to _("Cancel"), deployment_path(@deployment),
-                    :method  => :delete,
-                    :confirm => _("This will clear whole deployment configuration. Are you sure?"),
-                    :class   => "btn btn-danger" %>
+  
+      <%= text_f f, :name %>
+      <%= textarea_f f, :description, :rows => 3 %>
+  
+      <% { layout_name:   Staypuft::Deployment::LayoutName,
+           networking:    Staypuft::Deployment::Networking,
+           amqp_provider: Staypuft::Deployment::AmqpProvider,
+           platform:      Staypuft::Deployment::Platform }.
+             each do |attr, constants| %>
+  
+        <%= field(f, attr, :label => _(constants::HUMAN)) do
+          constants::LABELS.map do |value, label|
+            radio_button_f_non_inline(f, attr,
+                                      :checked => value == @deployment.send(attr),
+                                      :value   => value,
+                                      :text    => _(label))
+          end.join
+        end %>
       <% end %>
-      <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
-        <%= _("Next") %>
-        <span class="glyphicon glyphicon-chevron-right"></span>
+  
+      <%= f.fields_for :passwords, @deployment.passwords do |p| %>
+        <%= field(p, :mode, :label => _(Staypuft::Deployment::Passwords::Mode::HUMAN)) do
+          Staypuft::Deployment::Passwords::Mode::LABELS.map do |value, label|
+            radio_button_f_non_inline(p, :mode,
+                                      :checked => @deployment.passwords.mode == value,
+                                      :value   => value,
+                                      :text    => label)
+          end.join
+        end %>
+  
+        <div class="single_password col-md-offset-0 hide">
+          <%= password_f p, :single_password,
+                         :label       => _("Password"),
+                         :class       => "single_password",
+                         :help_inline => _("Password should be 6 characters or more"),
+                         :placeholder => '' %>
+          <%= password_f p, :single_password_confirmation,
+                         :label       => _("Confirm"),
+                         :class       => "single_password",
+                         :placeholder => '' %>
+        </div>
+  
+        <%= render :partial => "wizard_form_buttons", 
+                   :locals => { :deployment => @deployment,
+                                :step => Staypuft::Deployment::STEP_SETTINGS } %>
+  
       <% end %>
-    </div>
-  <% end %>
+    <% end %>
+  </div>
+
 <% end %>

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

@@ -1,50 +1,44 @@
 <%= render :layout => 'title' do %>
   <%= alert_if_deployed %>
 
-  <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
-    <%= base_errors_for @deployment %>
-
-    <%= deployment_wizard 3 %>
-    <div class="form-group tabbed_side_nav_form row">
-      <ul class="nav nav-pills nav-stacked col-md-3 configuration" data-tabs="pills">
-        <h3><%= _("Services") %></h3>
-        <% @services_map.each_with_index do |service_name, i| %>
-          <% service = @deployment.send(service_name)
-             if service.active?
-          %>
-            <li class="">
-              <a href="#<%= service_name  %>" data-toggle="tab">
-                <%= service_name.capitalize %>
-              </a>
-            </li>
-            <% end %>
-        <% end %>
-      </ul>
-
-      <div class="tab-content col-md-9">
-        <% @services_map.each_with_index do |service_name, i| %>
-          <% service = @deployment.send(service_name)
-             if service.active?
-          %>
-            <div class="tab-pane" id="<%= service_name %>">
-              <h3><%= _("%s Service Configuration") % service_name.to_s.capitalize %></h3>
-              <%= render partial: service_name.to_s, locals: {f: f}%>
-            </div>
-            <% end %>
-        <% end %>
+  <div class="deployment-wizard">
+    <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
+      <%= base_errors_for @deployment %>
+  
+      <%= deployment_wizard 3 %>
+      <div class="form-group tabbed_side_nav_form row">
+        <ul class="nav nav-pills nav-stacked col-md-3 configuration" data-tabs="pills">
+          <h3><%= _("Services") %></h3>
+          <% @services_map.each_with_index do |service_name, i| %>
+            <% service = @deployment.send(service_name)
+               if service.active?
+            %>
+              <li class="">
+                <a href="#<%= service_name  %>" data-toggle="tab">
+                  <%= service_name.capitalize %>
+                </a>
+              </li>
+              <% end %>
+          <% end %>
+        </ul>
+  
+        <div class="tab-content col-md-9">
+          <% @services_map.each_with_index do |service_name, i| %>
+            <% service = @deployment.send(service_name)
+               if service.active?
+            %>
+              <div class="tab-pane" id="<%= service_name %>">
+                <h3><%= _("%s Service Configuration") % service_name.to_s.capitalize %></h3>
+                <%= render partial: service_name.to_s, locals: {f: f}%>
+              </div>
+              <% end %>
+          <% end %>
+        </div>
       </div>
-    </div>
-
-    <div class="form_actions">
-      <a class="btn btn-default" href="<%= previous_wizard_path %>">
-        <span class="glyphicon glyphicon-chevron-left"></span>
-        <%= _("Back") %>
-      </a>
-      <%= link_to _("Cancel"), deployment_path(@deployment),
-                  :class => "btn btn-danger" %>
-      <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
-        <%= _("Submit") %>
-      <% end %>
-    </div>
-  <% end %>
+  
+      <%= render :partial => "wizard_form_buttons", 
+                 :locals => { :deployment => @deployment,
+                              :step => Staypuft::Deployment::STEP_CONFIGURATION } %>
+    <% end %>
+  </div>
 <% end %>

data/app/views/staypuft/steps/services_overview.html.erb

@@ -1,6 +1,7 @@
 <%= render :layout => 'title' do %>
   <%= alert_if_deployed %>
 
+  <div class="deployment-wizard">
   <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
     <%= base_errors_for @deployment %>
 
@@ -8,37 +9,13 @@
     <h3><%= _("Deployment Roles & Available Services") %></h3>
     <h4><%= "#{@deployment.layout.name} - #{@deployment.layout.networking.capitalize} " + _("Networking") %></h4>
 
-    <div class="clearfix">
-        <% @deployment.roles_ordered.each do |role| %>
-          <div class="panel panel-default service-box">
-            <div class="panel-heading"><strong><%= role.name %></strong></div>
-            <div class="panel-body">
-              <ul>
-              <% role.services.each do |service| %>
-                <li>
-                <%= f.label service.name.parameterize.underscore.to_sym, service.name, :class=> "inline"  do %>
-                  <%= f.check_box(service.name.parameterize.underscore.to_sym, :checked => true, :disabled => "disabled", :hidden=> true) %>
-                  <%= service.name %>
-                <% end %>
-                </li>
-              <% end %>
-              </ul>
-             </div>
-          </div>
-        <% end %>
-    </div>
+    <%= render partial: @deployment.networking +
+        (@deployment.ha? ? "_ha" : "_non_ha")%>
 
-    <div class="form_actions">
-      <a class="btn btn-default" href="<%= previous_wizard_path %>">
-        <span class="glyphicon glyphicon-chevron-left"></span>
-        <%= _("Back") %>
-      </a>
-      <%= link_to _("Cancel"), deployment_path(@deployment),
-                  :class => "btn btn-danger" %>
-      <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
-        <%= _("Next") %>
-        <span class="glyphicon glyphicon-chevron-right"></span>
-      <% end %>
-    </div>
+    <%= render :partial => "wizard_form_buttons", 
+               :locals => { :deployment => @deployment,
+                            :step => Staypuft::Deployment::STEP_OVERVIEW } %>
   <% end %>
+  </div>
+
 <% end %>

data/config/routes.rb

@@ -5,9 +5,6 @@ Rails.application.routes.draw do
         get 'auto_complete_search'
       end
       member do
-        match '/hostgroup/:hostgroup_id',
-              :to => 'deployments#show',
-              :as => :show_with_hostgroup_selected, :method => :get
         post 'deploy'
         get 'populate'
         get 'summary'

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.1.17'
+  VERSION = '0.1.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -66,7 +66,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0.rc1
-description: OpenStack Foreman Installer
+description: OpenStack Foreman Installer Plugin
 email:
 - foreman-dev+staypuft@googlegroups.com
 executables: []
@@ -99,6 +99,7 @@ files:
 - app/models/staypuft/role.rb
 - app/models/staypuft/deployment/passwords.rb
 - app/models/staypuft/deployment/glance_service.rb
+- app/models/staypuft/deployment/vlan_range_values_validator.rb
 - app/models/staypuft/deployment/attribute_param_storage.rb
 - app/models/staypuft/deployment/abstract_param_scope.rb
 - app/models/staypuft/deployment/cinder_service.rb
@@ -133,20 +134,24 @@ files:
 - app/views/staypuft/deployments/_deployment_progress_bar.html.erb
 - app/views/staypuft/deployments/show.html.erb
 - app/views/staypuft/deployments/edit.html.erb
-- app/views/staypuft/deployments/show.js.erb
 - app/views/staypuft/deployments/_deployed_hosts_table.html.erb
 - app/views/staypuft/deployments/_import_form.html.erb
 - app/views/staypuft/deployments/_free_hosts_table.html.erb
 - app/views/staypuft/deployments/summary.html.erb
 - app/views/staypuft/layouts/staypuft.html.erb
 - app/views/staypuft/layouts/application.html.erb
+- app/views/staypuft/steps/_nova_ha.html.erb
 - app/views/staypuft/steps/services_overview.html.erb
 - app/views/staypuft/steps/_neutron.html.erb
+- app/views/staypuft/steps/_wizard_form_buttons.html.erb
 - app/views/staypuft/steps/deployment_settings.html.erb
+- app/views/staypuft/steps/_neutron_ha.html.erb
+- app/views/staypuft/steps/_neutron_non_ha.html.erb
 - app/views/staypuft/steps/_nova.html.erb
 - app/views/staypuft/steps/_title.html.erb
 - app/views/staypuft/steps/_glance.html.erb
 - app/views/staypuft/steps/services_configuration.html.erb
+- app/views/staypuft/steps/_nova_non_ha.html.erb
 - app/views/staypuft/steps/_cinder.html.erb
 - config/staypuft.local.rb
 - config/routes.rb
@@ -183,7 +188,8 @@ files:
 - test/factories/staypuft_factories.rb
 - test/test_plugin_helper.rb
 homepage: https://github.com/theforeman/staypuft
-licenses: []
+licenses:
+- GPL-3.0+
 metadata: {}
 post_install_message: 
 rdoc_options: []

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

@@ -1 +0,0 @@
-$('#deployment_progress_bar').html("<%= escape_javascript(render :partial => 'deployment_progress_bar', :locals => { :deployment => @deployment }) %>");