staypuft 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjllNGYyYjkzYTQwOTFhMDBiYmVmMzdiN2E4ZjlhY2EyZDRmN2VjNw==
+    MWFkYzZlNjIwZjcxOWRjNTM0NmU4ZDVmYzFiNGZiZTY5OGRmN2ZlYQ==
   data.tar.gz: !binary |-
-    MzNiNDViNTcwZWJmNTg3N2VlNzAxZDM2MWIzNTVlNDEyZWUyZmQ5Nw==
+    NjlkODZkMGY2OTNmZGJkMWQ3Y2E1MmIzODg2ZDc0ODczZTRiZGJkNA==
 SHA512:
   metadata.gz: !binary |-
-    NzUzNDAwZTNlMzQxYzdkNDY5YzM2MWNiNTRjMzgyMjNlNDNjMDhlOTQ2OGIz
-    MmE3NTQxMjgyNGNhZTA1ODM4YjJlODY2YzdlNzRlYjMzOThmNmJlZjI2Mjkx
-    YmM1NDE3MTcwNWIzMDc5OWQxODgwYTFhZjBkNjkzOWUzNGQ4OTE=
+    NDAyY2U4YjBlYTkyNDc3ZTNhN2JiNTk1ZGVmZDkxZmJlOTllODI2ODkxYzJk
+    MWY0ZTMyZGY1NTBkOGUyYjczYmI5M2I2M2FkNDEzNmZiNDY3NzYxOGU4MmRk
+    MGNiMTI5Y2U5MDM0MTliNTE3OTVmMzhkNDg5NWE0ZmE4ZWEwZjQ=
   data.tar.gz: !binary |-
-    MjYyMTg1ODk3NTc2MmQzZmI4YjEzZTRlYzU1NTFiYjhkZmY2YmJmZjk1M2E1
-    MGE3MDU5Y2M3MDQ5Y2RhNDE2NjljYzU1ZWU0MzI4NjViNTFlOTczMzc2ZjM0
-    MGFjZGQyZTI4NGUyMGRmMmNlMmY0ZDNjYzEzZTVlYWM3MzQzNzI=
+    MjQ2YzU1MmYzYmRhMGRjZDQxNWFlYTk5MWYzOTU2ODUzNTlhMGQ2YzllMWIy
+    Y2JkYTc0ZGUzYjE3NzAzMGM2MjY1ODk3YzhhYTg5ZDY3ZWRjMGNmYmEzMjRj
+    MGE1M2NkOWI5YWQ2MTg2NzA5YTMyZGIzNzU3YmVmYjkzNDUwNmE=

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

@@ -14,7 +14,7 @@
 
 $(function () {
   // Check all checkboxes in table
-  $('#check_all').on('change', function (e) {
+  $('.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);

data/app/controllers/staypuft/deployments_controller.rb

@@ -24,7 +24,23 @@ 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 update
+      if params[:staypuft_deployment]
+        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
+        end
+      end
+
+      redirect_to summary_deployment_path(params[:id])
+    end
+
     def edit
       @deployment            = Deployment.find(params[:id])
       @service_hostgroup_map = @deployment.services_hostgroup_map
@@ -55,7 +71,7 @@ module Staypuft
       hostgroup              = ::Hostgroup.find params[:hostgroup_id]
       deployment_in_progress = ForemanTasks::Lock.locked?(deployment, nil)
 
-      hosts_to_assign  = ::Host::Base.find Array(params[:host_ids])
+      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
@@ -80,7 +96,7 @@ module Staypuft
       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 = ::Host::Base.find Array(params[:host_ids])
 
       hosts_to_unassign.each do |host|
         unless host.open_stack_deployed? && deployment_in_progress

data/app/lib/staypuft/seeder.rb

@@ -179,19 +179,20 @@ module Staypuft
       network_create_networks     = true
 
       # Neutron
-      ovs_vlan_ranges             = '<%= "physnet-tenants:#{@host.deployment.neutron.tenant_vlan_ranges}" %>'
-      ml2_network_vlan_ranges     = [ovs_vlan_ranges]
-      ml2_tenant_network_types    = '<%= @host.deployment.neutron.network_segmentation_list %>'
+      ovs_vlan_ranges             = '<%= @host.deployment.neutron.networker_vlan_ranges %>'
+      compute_ovs_vlan_ranges     = '<%= @host.deployment.neutron.compute_vlan_ranges %>'
+      ml2_network_vlan_ranges     = ovs_vlan_ranges
+      ml2_tenant_network_types    = ['<%= @host.deployment.neutron.network_segmentation %>']
       ml2_tunnel_id_ranges        = ['10:100000']
       ml2_vni_ranges              = ['10:100000']
       ovs_tunnel_types            = ['vxlan', 'gre']
-      ovs_tunnel_iface            = '<%= @host.deployment.neutron.networker_tenant_interface %>'
-      ovs_bridge_mappings         = '<%= @host.deployment.neutron.controller_ovs_bridge_mappings %>'
-      ovs_bridge_uplinks          = '<%= @host.deployment.neutron.controller_ovs_bridge_uplinks %>'
-      compute_ovs_tunnel_iface    = '<%= @host.deployment.neutron.compute_tenant_interface %>'
+      ovs_tunnel_iface            = '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.networker_tenant_interface : "" %>'
+      ovs_bridge_mappings         = '<%= @host.deployment.neutron.networker_ovs_bridge_mappings %>'
+      ovs_bridge_uplinks          = '<%= @host.deployment.neutron.networker_ovs_bridge_uplinks %>'
+      compute_ovs_tunnel_iface    = '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.compute_tenant_interface : "" %>'
       compute_ovs_bridge_mappings = '<%= @host.deployment.neutron.compute_ovs_bridge_mappings %>'
       compute_ovs_bridge_uplinks  = '<%= @host.deployment.neutron.compute_ovs_bridge_uplinks %>'
-      enable_tunneling            = 'true'
+      enable_tunneling            = '<%= @host.deployment.neutron.enable_tunneling?.to_s %>'
 
       # Glance
       backend                     = 'file'
@@ -445,7 +446,7 @@ module Staypuft
               'swift_public_vip'              => vip_format % :swift,
               'lb_backend_server_addrs'       => '<%= @host.deployment.ips.controller_ips %>',
               'lb_backend_server_names'       => '<%= @host.deployment.ips.controller_fqdns %>' },
-          'quickstack::pacemaker::common'          => { # TODO is this correct puppetclass?
+          'quickstack::pacemaker::common'          => {
               'pacemaker_cluster_members' => '<%= @host.deployment.ips.controller_ips.join(" ") %>' },
           'quickstack::pacemaker::neutron'         => {
               'ml2_network_vlan_ranges'  => ml2_network_vlan_ranges,
@@ -554,7 +555,7 @@ module Staypuft
               'ovs_bridge_uplinks'         => compute_ovs_bridge_uplinks,
               'ovs_tunnel_iface'           => compute_ovs_tunnel_iface,
               'ovs_tunnel_types'           => ovs_tunnel_types,
-              'ovs_vlan_ranges'            => ovs_vlan_ranges,
+              'ovs_vlan_ranges'            => compute_ovs_vlan_ranges,
               'admin_password'             => admin_pw,
               'ceilometer_user_password'   => ceilometer_user_pw,
               'neutron_db_password'        => neutron_db_pw,
@@ -651,10 +652,7 @@ module Staypuft
           param = puppetclass.class_params.find_by_key(param_key)
           unless param
             Rails.logger.error "missing param #{param_key} in #{puppetclass_name} trying to set default_value: #{default_value.inspect} found in puppetclasses: " +
-                                   LookupKey.
-                                       smart_class_parameters.
-                                       search_for("key = #{param_key}").
-                                       map { |lk| lk.param_class.name }.inspect
+                                   LookupKey.search_for(param_key).map { |lk| (c = (lk.param_class || lk.puppetclass)).nil? ? "class not found" : c.name }.inspect
             next
           end
           unless param.update_attributes default_value: default_value

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

@@ -51,7 +51,6 @@ module Staypuft::Concerns::LookupKeyExtensions
           type       = lookup_key.key_type
         end
 
-        p string
         value = if Setting[:safemode_render]
                   box = Safemode::Box.new self, @allowed_methods
                   box.eval(ERB.new(string, nil, '-').src, @allowed_vars)

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

@@ -5,6 +5,9 @@ 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)')
+
 
     param_attr :network_segmentation, :tenant_vlan_ranges, :networker_tenant_interface,
                :use_external_interface, :external_interface_name, :compute_tenant_interface,
@@ -27,7 +30,7 @@ module Staypuft
 
     module TenantVlanRanges
       HUMAN       = N_('Tenant (VM data) VLAN Ranges')
-      HUMAN_AFTER = '[1-4094] (i.e. 10:100)'
+      HUMAN_AFTER = VLAN_HELP
     end
 
     validates :tenant_vlan_ranges,
@@ -37,7 +40,7 @@ module Staypuft
 
     module NetworkerTenantInterface
       HUMAN       = N_('Which interface to use for tenant networks:')
-      HUMAN_AFTER = N_('(i.e. eth0, em1, etc.)')
+      HUMAN_AFTER = INTERFACE_HELP
     end
 
     validates :networker_tenant_interface,
@@ -52,7 +55,7 @@ module Staypuft
 
     module ExternalInterfaceName
       HUMAN       = N_('External interface connected to')
-      HUMAN_AFTER = N_('(interface) (i.e. eth1)')
+      HUMAN_AFTER = INTERFACE_HELP
     end
 
     validates :external_interface_name,
@@ -68,7 +71,7 @@ module Staypuft
 
     module VlanRangesForExternalNetwork
       HUMAN       = N_('VLAN Range for external network')
-      HUMAN_AFTER = N_('i.e. physnet1:1000:2999')
+      HUMAN_AFTER = N_('i.e. 1000:2999')
     end
 
     validates :vlan_ranges_for_external_network,
@@ -78,7 +81,7 @@ module Staypuft
 
     module ComputeTenantInterface
       HUMAN       = N_('Which interface to use for tenant networks:')
-      HUMAN_AFTER = N_('(i.e. eth0, em1, etc.)')
+      HUMAN_AFTER = INTERFACE_HELP
     end
 
     validates :compute_tenant_interface,
@@ -86,7 +89,7 @@ module Staypuft
     # TODO: interface name format validation
 
     def set_defaults
-      self.network_segmentation = NetworkSegmentation::VXLAN
+      self.network_segmentation   = NetworkSegmentation::VXLAN
       self.use_external_interface = 'false'
     end
 
@@ -110,26 +113,19 @@ module Staypuft
       [self.network_segmentation, *(SEGMENTATION_LIST - [self.network_segmentation])]
     end
 
-    def controller_ovs_bridge_mappings
-      if self.vlan_segmentation?
-        ["physnet-tenants:br-#{self.networker_tenant_interface}",
-         ('physnet-external:br-ex' if self.use_external_interface?)].compact
-      else
-        []
-      end
+    def networker_ovs_bridge_mappings
+      [("physnet-tenants:br-#{self.networker_tenant_interface}"  unless self.enable_tunneling?),
+       ('physnet-external:br-ex' if self.use_external_interface?)].compact
     end
 
-    def controller_ovs_bridge_uplinks
-      if self.vlan_segmentation?
-        ["br-#{self.networker_tenant_interface}:#{self.networker_tenant_interface}",
-         ("br-ex:#{self.external_interface_name}" if self.use_external_interface?)]
-      else
-        []
-      end
+    def networker_ovs_bridge_uplinks
+      [("br-#{self.networker_tenant_interface}:#{self.networker_tenant_interface}" unless self.enable_tunneling?),
+       ("br-ex:#{self.external_interface_name}" if self.use_external_interface?)
+      ].compact
     end
 
     def compute_ovs_bridge_mappings
-      if self.vlan_segmentation?
+      if !self.enable_tunneling?
         ["physnet-tenants:br-#{self.compute_tenant_interface}"]
       else
         []
@@ -137,22 +133,26 @@ module Staypuft
     end
 
     def compute_ovs_bridge_uplinks
-      if self.vlan_segmentation?
+      if !self.enable_tunneling?
         ["br-#{self.compute_tenant_interface}:#{self.compute_tenant_interface}"]
       else
         []
       end
     end
 
-    # FIXME: mapping is off here -- both external and tenant vlan ranges map to the same back end
-    # params: fix this with morazi in the AM
-    def ml2_network_vlan_ranges
-      if self.external_network_vlan?
-        [self.vlan_ranges_for_external_network]
+    def compute_vlan_ranges
+      if self.vlan_segmentation?
+        ["physnet-tenants:#{self.tenant_vlan_ranges}"]
       else
         []
       end
     end
+
+    def networker_vlan_ranges
+      [("physnet-tenants:#{self.tenant_vlan_ranges}" if self.vlan_segmentation?),
+       ("physnet-external:#{self.vlan_ranges_for_external_network}" if self.external_network_vlan?)].compact
+    end
+
     def vlan_segmentation?
       self.network_segmentation == NetworkSegmentation::VLAN
     end
@@ -161,5 +161,9 @@ module Staypuft
       self.use_external_interface? && self.use_vlan_for_external_network?
     end
 
+    def enable_tunneling?
+      [NetworkSegmentation::VXLAN, NetworkSegmentation::GRE].include?(network_segmentation)
+    end
+
   end
 end

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

@@ -4,6 +4,9 @@ module Staypuft
       'nova'
     end
 
+    INTERFACE_HELP    = Deployment::NeutronService::INTERFACE_HELP
+    VLAN_HELP         = Deployment::NeutronService::VLAN_HELP
+
     param_attr :network_manager, :vlan_range, :external_interface_name, :public_floating_range,
                :compute_tenant_interface, :private_fixed_range
 
@@ -20,7 +23,7 @@ module Staypuft
 
     module VlanRange
       HUMAN       = N_('VLAN Range')
-      HUMAN_AFTER = '[1-4094] (i.e. 10:100)'
+      HUMAN_AFTER = VLAN_HELP
     end
 
     validates :vlan_range,
@@ -31,7 +34,7 @@ module Staypuft
 
     module ExternalInterfaceName
       HUMAN       = N_('Which interface to use for external networks:')
-      HUMAN_AFTER = N_('(interface) (i.e. eth1)')
+      HUMAN_AFTER = INTERFACE_HELP
     end
 
     validates :external_interface_name, presence: true
@@ -47,7 +50,7 @@ module Staypuft
 
     module ComputeTenantInterface
       HUMAN       = N_('Which interface to use for tenant networks:')
-      HUMAN_AFTER = N_('(i.e. eth0, em1, etc.)')
+      HUMAN_AFTER = INTERFACE_HELP
     end
 
     validates :compute_tenant_interface,
@@ -56,7 +59,7 @@ module Staypuft
 
     module PrivateFixedRange
       HUMAN       = N_('Private IP range for tenant networks:')
-      HUMAN_AFTER = N_('("10.0.0.0/24", for example)')
+      HUMAN_AFTER = PublicFloatingRange::HUMAN_AFTER
     end
 
     validates :private_fixed_range, presence: true

data/app/models/staypuft/deployment.rb

@@ -212,7 +212,6 @@ module Staypuft
                                          Operatingsystem.where(name: 'RedHat', major: '6', minor: '5').first
                                        when Platform::RHEL7
                                          Operatingsystem.where(name: 'RedHat', major: '7', minor: '0').first
-                                         Operatingsystem.where(name: 'RedHat', major: '6', minor: '5').first
                                        end or
           raise 'missing Operatingsystem'
       self.hostgroup.save!

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

@@ -10,7 +10,7 @@
         <thead>
           <tr>
             <th class="ca">
-              <%= check_box_tag :check_all %>
+              <%= tag :input, type: 'checkbox', class: 'check_all' %>
             </th>
             <th><%= sort :name, :as => _('Name') %></th>
             <th class="hidden-s hidden-xs"><%= _('Deploying?') %></th>

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

@@ -14,7 +14,7 @@
         <thead>
           <tr>
             <th class="ca">
-              <%= check_box_tag :check_all %>
+              <%= tag :input, type: 'checkbox', class: 'check_all' %>
             </th>
             <th><%= sort :name, :as => _('Name') %></th>
             <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>

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

@@ -10,7 +10,7 @@
         <thead>
           <tr>
             <th class="ca">
-              <%= check_box_tag :check_all %>
+              <%= tag :input, type: 'checkbox', class: 'check_all' %>
             </th>
             <th><%= sort :name, :as => _('Name') %></th>
             <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>

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

@@ -1,50 +1,66 @@
-<% title _("%s Deployment - Advanced Configuration") % @deployment.name %>
+<% title _("Edit - %s Configuration Parameters") % @deployment.name %>
 <% content_for(:title_actions) do %>
-  <%= link_to _("Back to Summary"), summary_deployment_path(@deployment.id)%>
+  <%= link_to _("Back to Deployment"), deployment_path(@deployment.id) %>
+  <%= link_to _("Apply"), '',
+              class: "btn btn-primary",
+              id:    'edit_staypuft_deployment_submit' %>
+  <%= link_to _("Cancel"), summary_deployment_path(@deployment.id), :class => "btn btn-danger" %>
 <% end %>
 
+<script>
+  $('#edit_staypuft_deployment_submit').click(function (e) {
+    $('#edit_staypuft_deployment').submit();
+    e.preventDefault();
+  });
+</script>
 
-<div class="col-md-12">
-  <div class="form-group tabbed_side_nav_form row">
-    <ul class="nav nav-pills nav-stacked col-md-3" data-tabs="pills">
-      <h3><%= _("Services") %></h3>
-      <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
-        <li class="<%= 'active' if i == 0 %>">
-          <a href="#<%= service.name.parameterize.underscore %>" data-toggle="tab">
-            <%= service.name %>
-          </a>
-        </li>
-      <% end %>
-    </ul>
+<%= form_for(@deployment,
+             :url  => deployment_path, :method => 'PUT',
+             :html => { :class => "clearfix", id: 'edit_staypuft_deployment' }) do |f| %>
+  <%= base_errors_for @deployment %>
 
-    <div class="tab-content col-md-9">
-      <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
-        <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= service.name.parameterize.underscore %>">
-          <h3><%= "#{service.name} " + _("Service Configuration") %></h3>
-          <% if (params_hash = service.ui_params_for_form(hostgroup)).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 format("staypuft_deployment[hostgroup_params][%s][puppetclass_params][%s][%s]",
-                                            param_hash[:hostgroup].id,
-                                            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 class="col-md-12">
+    <div class="form-group tabbed_side_nav_form row">
+      <ul class="nav nav-pills nav-stacked col-md-3" data-tabs="pills">
+        <h3><%= _("Services") %></h3>
+        <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
+          <li class="<%= 'active' if i == 0 %>">
+            <a href="#<%= service.name.parameterize.underscore %>" data-toggle="tab">
+              <%= service.name %>
+            </a>
+          </li>
+        <% end %>
+      </ul>
+
+      <div class="tab-content col-md-9">
+        <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
+          <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= service.name.parameterize.underscore %>">
+            <h3><%= "#{service.name} " + _("Service Configuration") %></h3>
+            <% if (params_hash = service.ui_params_for_form(hostgroup)).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 format("staypuft_deployment[hostgroup_params][%s][puppetclass_params][%s][%s]",
+                                              param_hash[:hostgroup].id,
+                                              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>
-              </div>
-              <br/>
+                <br/>
+              <% end %>
+            <% else %>
+              <p><%= _("No configuration needed for this service.") %></p>
             <% end %>
-          <% else %>
-            <p><%= _("No configuration needed for this service.") %></p>
-          <% end %>
-          <% # render "puppetclasses/classes_parameters", { :obj => service.hostgroups.first } %>
-        </div>
-      <% end %>
+            <%# render "puppetclasses/classes_parameters", { :obj => service.hostgroups.first } %>
+          </div>
+        <% end %>
+      </div>
     </div>
   </div>
-</div>
+<% end %>

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

@@ -1,36 +1,25 @@
 <% title @deployment.name %>
 
 <% content_for(:title_actions) do %>
-
+  <%= link_to(_("Advanced Configuration"), summary_deployment_path(@deployment.id), :class => '') %>
   <%= 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) %>
-  <div class="btn-group dropdown keep-open">
-    <button type="button" class="btn btn-default dropdown-toggle" role="button" href="#"
-            data-toggle="dropdown" data-target="#">
-      <%= _('Configuration') %>
-      <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu dropdown keep-open" role="menu">
-      <li><%= link_to(_("Summary"), summary_deployment_path(@deployment.id), :class => '') %></li>
-      <li><%= link_to _("Advanced Configuration"), edit_deployment_path(@deployment.id)%></li>
-      <li>
-        <%= link_to(icon_text("cloud-upload", _("Import")),
-                    {},
-                    { :remote => true,
-                      :rel    => 'popover',
-                      :data   => { 'content'        => "#{render partial: 'import_form'}",
-                                   'original-title' => _('Import Config'),
-                                   'placement'      => 'left'} }) %>
-      </li>
-      <li>
-        <%= link_to(icon_text("cloud-download", _("Export")),
-                    export_config_deployment_path(@deployment.id)) %>
-      </li>
-    </ul>
-  </div>
+                                           deployment_step_path(deployment_id: @deployment, id: 'services_configuration')
+                                         else
+                                           deployment_steps_path(deployment_id: @deployment)
+                                         end) %>
+
+  <% if @deployment.in_progress? %>
+    <%= display_link_if_authorized(
+            _('Deploy in progress'),
+            hash_for_foreman_tasks_task_path(id: ForemanTasks::Lock.colliding_locks(@deployment, nil).first.task.id),
+            :class => 'btn-info') %>
+  <% else %>
+    <%= link_to(_("Deploy"),
+                "",
+                :class         => %w(btn btn-primary),
+                :'data-toggle' => "modal",
+                :'data-target' => "#deploy_modal") %>
+  <% end %>
 
   <% if Rails.env.development? %>
     <div class="btn-group">
@@ -52,20 +41,6 @@
     </div>
   <% end %>
 
-  <% if @deployment.in_progress? %>
-    <%= display_link_if_authorized(
-            _('Deploy in progress'),
-            hash_for_foreman_tasks_task_path(id: ForemanTasks::Lock.colliding_locks(@deployment, nil).first.task.id),
-            :class => 'btn-info') %>
-  <% else %>
-    <%= link_to(_("Deploy"),
-                "",
-                :class         => %w(btn btn-primary),
-                :'data-toggle' => "modal",
-                :'data-target' => "#deploy_modal") %>
-  <% end %>
-
-
   <%= help_path %>
 <% end %>
 

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

@@ -1,30 +1,60 @@
-<% title _("%s Summary") % @deployment.name %>
+<% title _("%s Configuration Parameters") % @deployment.name %>
 <% content_for(:title_actions) do %>
-  <%= link_to _("Advanced Configuration"), edit_deployment_path(@deployment.id)%>
-  <%= link_to _("Back to Deployment"), deployment_path(@deployment.id)%>
+  <%= link_to _("Back to Deployment"), deployment_path(@deployment.id) %>
+  <%= link_to(icon_text("cloud-upload", _("Import")),
+              {},
+              { :remote => true,
+                :rel    => 'popover',
+                :data   => { 'content'        => "#{render partial: 'import_form'}",
+                             'original-title' => _('Import Config'),
+                             'placement'      => 'left' } }) %>
+  <%= link_to(icon_text("cloud-download", _("Export")),
+              export_config_deployment_path(@deployment.id)) %>
+  <%= link_to _("Edit"), edit_deployment_path(@deployment.id) %>
 <% end %>
 
 <div class="col-md-12">
-  <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
-    <div class="well <%= 'active' if i == 0 %>" id="<%= service.name.parameterize.underscore %>">
-      <h3><%= "#{service.name} " + _("Service Configuration") %></h3>
-      <% if (params_hash = service.ui_params_for_form(hostgroup)).size > 0 %>
-        <% params_hash.each do |param_hash| %>
-        <div class="row">
-          <div class="col-md-3 text-right">
-            <%= label_tag param_hash[:param_key].key %>
-          </div>
-          <div class="col-md-9">
-            <%= content_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=>"" %>
-          </div>
-        </div>
-        <br/>
-        <% end %>
-      <% else %>
-        <div class="row">
-          <p class="col-md-12"><%= _("No configuration for this service.") %></p>
+  <div class="form-group tabbed_side_nav_form row">
+    <ul class="nav nav-pills nav-stacked col-md-3" data-tabs="pills">
+      <h3><%= _("Services") %></h3>
+      <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
+        <li class="<%= 'active' if i == 0 %>">
+          <a href="#<%= service.name.parameterize.underscore %>" data-toggle="tab">
+            <%= service.name %>
+          </a>
+        </li>
+      <% end %>
+    </ul>
+
+    <div class="tab-content col-md-9">
+      <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
+        <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= service.name.parameterize.underscore %>">
+          <h3><%= "#{service.name} " + _("Service Configuration") %></h3>
+          <% if (params_hash = service.ui_params_for_form(hostgroup)).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-8">
+                  <%= text_field_tag format("staypuft_deployment[hostgroup_params][%s][puppetclass_params][%s][%s]",
+                                            param_hash[:hostgroup].id,
+                                            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",
+                                     disabled: true %>
+                </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>
-  <% end %>
+  </div>
 </div>

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

@@ -11,11 +11,10 @@
     <%= 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
-       }.
+    <% { 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
@@ -40,14 +39,14 @@
 
       <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 => '' %>
+                       :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 => '' %>
+                       :label       => _("Confirm"),
+                       :class       => "single_password",
+                       :placeholder => '' %>
       </div>
     <% end %>
 

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Staypuft team